From 7e1acc8b92a3b67db1e5255adae2851d58d74434 Mon Sep 17 00:00:00 2001 From: Stephan Gerhold Date: Thu, 15 Jun 2023 18:50:44 +0200 Subject: [PATCH] arm64: dts: qcom: Add rpm-proc node for GLINK gplatforms Rather than having the RPM GLINK channels as the only child of a dummy top-level rpm-glink node, switch to representing the RPM as remoteproc like all the other remoteprocs (modem DSP, ...). This allows assigning additional subdevices to it like the MPM interrupt-controller or rpm-master-stats. Tested-by: Konrad Dybcio # SM6375 Signed-off-by: Stephan Gerhold Link: https://lore.kernel.org/r/20230531-rpm-rproc-v3-11-a07dcdefd918@gerhold.net Signed-off-by: Bjorn Andersson --- arch/arm64/boot/dts/qcom/ipq6018.dtsi | 48 ++++---- arch/arm64/boot/dts/qcom/ipq9574.dtsi | 28 +++-- arch/arm64/boot/dts/qcom/msm8996.dtsi | 113 +++++++++---------- arch/arm64/boot/dts/qcom/msm8998.dtsi | 102 ++++++++--------- arch/arm64/boot/dts/qcom/qcm2290.dtsi | 126 ++++++++++----------- arch/arm64/boot/dts/qcom/qcs404.dtsi | 152 +++++++++++++------------- arch/arm64/boot/dts/qcom/sdm630.dtsi | 132 +++++++++++----------- arch/arm64/boot/dts/qcom/sm6115.dtsi | 128 +++++++++++----------- arch/arm64/boot/dts/qcom/sm6125.dtsi | 140 ++++++++++++------------ arch/arm64/boot/dts/qcom/sm6375.dtsi | 126 ++++++++++----------- 10 files changed, 566 insertions(+), 529 deletions(-) --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi @@ -145,6 +145,32 @@ method = "smc"; }; + rpm: remoteproc { + compatible = "qcom,ipq6018-rpm-proc", "qcom,rpm-proc"; + + glink-edge { + compatible = "qcom,glink-rpm"; + interrupts = ; + qcom,rpm-msg-ram = <&rpm_msg_ram>; + mboxes = <&apcs_glb 0>; + + rpm_requests: rpm-requests { + compatible = "qcom,rpm-ipq6018"; + qcom,glink-channels = "rpm_requests"; + + regulators { + compatible = "qcom,rpm-mp5496-regulators"; + + ipq6018_s2: s2 { + regulator-min-microvolt = <725000>; + regulator-max-microvolt = <1062500>; + regulator-always-on; + }; + }; + }; + }; + }; + reserved-memory { #address-cells = <2>; #size-cells = <2>; @@ -181,28 +207,6 @@ }; }; - rpm-glink { - compatible = "qcom,glink-rpm"; - interrupts = ; - qcom,rpm-msg-ram = <&rpm_msg_ram>; - mboxes = <&apcs_glb 0>; - - rpm_requests: rpm-requests { - compatible = "qcom,rpm-ipq6018"; - qcom,glink-channels = "rpm_requests"; - - regulators { - compatible = "qcom,rpm-mp5496-regulators"; - - ipq6018_s2: s2 { - regulator-min-microvolt = <725000>; - regulator-max-microvolt = <1062500>; - regulator-always-on; - }; - }; - }; - }; - smem { compatible = "qcom,smem"; memory-region = <&smem_region>;