ARM: dts: qcom: msm8960: split PMIC to separate dtsi files

The PMIC is not a part of the SoC, so move PMIC to a separate file and
include it from the board files.

Suggested-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20230928110309.1212221-17-dmitry.baryshkov@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm/boot/dts/qcom/pm8921.dtsi b/arch/arm/boot/dts/qcom/pm8921.dtsi
new file mode 100644 (file)
index 0000000..414941f
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/pm8921.dtsi
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: GPL-2.0
+
+&ssbi {
+       pm8921: pmic {
+               compatible = "qcom,pm8921";
+               #interrupt-cells = <2>;
+               interrupt-controller;
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               pwrkey@1c {
+                       compatible = "qcom,pm8921-pwrkey";
+                       reg = <0x1c>;
+                       interrupt-parent = <&pm8921>;
+                       interrupts = <50 IRQ_TYPE_EDGE_RISING>,
+                                    <51 IRQ_TYPE_EDGE_RISING>;
+                       debounce = <15625>;
+                       pull-up;
+               };
+
+               pm8921_keypad: keypad@148 {
+                       compatible = "qcom,pm8921-keypad";
+                       reg = <0x148>;
+                       interrupt-parent = <&pm8921>;
+                       interrupts = <74 IRQ_TYPE_EDGE_RISING>,
+                                    <75 IRQ_TYPE_EDGE_RISING>;
+                       debounce = <15>;
+                       scan-delay = <32>;
+                       row-hold = <91500>;
+               };
+
+               rtc@11d {
+                       compatible = "qcom,pm8921-rtc";
+                       interrupt-parent = <&pm8921>;
+                       interrupts = <39 IRQ_TYPE_EDGE_RISING>;
+                       reg = <0x11d>;
+                       allow-set-time;
+               };
+       };
+};

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
index 43149c90c4fc175a29e72516c4756de5fc23aa6d..a5ea4843db43c965aa956e65ca9339a2725606c3 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
@@ -2,6 +2,7 @@
 #include <dt-bindings/input/input.h>
 
 #include "qcom-msm8960.dtsi"
+#include "pm8921.dtsi"
 
 / {
        model = "Qualcomm MSM8960 CDP";

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts b/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts
index 9e203164beb62e0a1a1bcc72e2e1eb647066a389..1a5116336ff0290691a152b14a60676f3d8f9baf 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts
+++ b/arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/reset/qcom,gcc-msm8960.h>
 
 #include "qcom-msm8960.dtsi"
-#include <dt-bindings/reset/qcom,gcc-msm8960.h>
+#include "pm8921.dtsi"
 
 / {
        model = "Samsung Galaxy Express SGH-I437";

diff --git a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
index f1267c83d67ab710192bb92284b619864e137b19..774f507fa25acde540b584859446cfbe0047f71b 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
@@ -259,47 +259,10 @@
                        };
                };
 
-               ssbi@500000 {
+               ssbi: ssbi@500000 {
                        compatible = "qcom,ssbi";
                        reg = <0x500000 0x1000>;
                        qcom,controller-type = "pmic-arbiter";
-
-                       pm8921: pmic {
-                               compatible = "qcom,pm8921";
-                               #interrupt-cells = <2>;
-                               interrupt-controller;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               pwrkey@1c {
-                                       compatible = "qcom,pm8921-pwrkey";
-                                       reg = <0x1c>;
-                                       interrupt-parent = <&pm8921>;
-                                       interrupts = <50 IRQ_TYPE_EDGE_RISING>,
-                                                    <51 IRQ_TYPE_EDGE_RISING>;
-                                       debounce = <15625>;
-                                       pull-up;
-                               };
-
-                               pm8921_keypad: keypad@148 {
-                                       compatible = "qcom,pm8921-keypad";
-                                       reg = <0x148>;
-                                       interrupt-parent = <&pm8921>;
-                                       interrupts = <74 IRQ_TYPE_EDGE_RISING>,
-                                                    <75 IRQ_TYPE_EDGE_RISING>;
-                                       debounce = <15>;
-                                       scan-delay = <32>;
-                                       row-hold = <91500>;
-                               };
-
-                               rtc@11d {
-                                       compatible = "qcom,pm8921-rtc";
-                                       interrupt-parent = <&pm8921>;
-                                       interrupts = <39 IRQ_TYPE_EDGE_RISING>;
-                                       reg = <0x11d>;
-                                       allow-set-time;
-                               };
-                       };
                };
 
                rng@1a500000 {