ARM: dts: qcom: mdm9615: 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>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Acked-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20230928110309.1212221-19-dmitry.baryshkov@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm/boot/dts/qcom/pm8018.dtsi b/arch/arm/boot/dts/qcom/pm8018.dtsi
new file mode 100644 (file)
index 0000000..c602544
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/pm8018.dtsi
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
+/*
+ * Device Tree Source for Qualcomm PM8018
+ *
+ * Copyright (C) 2016 BayLibre, SAS.
+ * Author : Neil Armstrong <narmstrong@baylibre.com>
+ */
+
+&ssbi {
+       pm8018: pmic {
+               compatible = "qcom,pm8018", "qcom,pm8921";
+               #interrupt-cells = <2>;
+               interrupt-controller;
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               pwrkey@1c {
+                       compatible = "qcom,pm8018-pwrkey",
+                                    "qcom,pm8921-pwrkey";
+                       reg = <0x1c>;
+                       interrupt-parent = <&pm8018>;
+                       interrupts = <50 IRQ_TYPE_EDGE_RISING>,
+                                    <51 IRQ_TYPE_EDGE_RISING>;
+                       debounce = <15625>;
+                       pull-up;
+               };
+
+               pm8018_mpps: mpps@50 {
+                       compatible = "qcom,pm8018-mpp", "qcom,ssbi-mpp";
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+                       reg = <0x50>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio-ranges = <&pm8018_mpps 0 0 6>;
+               };
+
+               rtc@11d {
+                       compatible = "qcom,pm8018-rtc", "qcom,pm8921-rtc";
+                       interrupt-parent = <&pm8018>;
+                       interrupts = <39 IRQ_TYPE_EDGE_RISING>;
+                       reg = <0x11d>;
+                       allow-set-time;
+               };
+
+               pm8018_gpio: gpio@150 {
+                       compatible = "qcom,pm8058-gpio",
+                                    "qcom,ssbi-gpio";
+                       reg = <0x150>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+                       gpio-controller;
+                       gpio-ranges = <&pm8018_gpio 0 0 6>;
+                       #gpio-cells = <2>;
+               };
+       };
+};

diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi
index b782ff0d16cd9e94f1ea10d56e640eac324b88a4..27c3d92d94527e9bd5df6c6f8019d0f4b03fde08 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi
@@ -7,6 +7,7 @@
  */
 
 #include "qcom-mdm9615.dtsi"
+#include "pm8018.dtsi"
 
 / {
        model = "Sierra Wireless WP8548 Module";

diff --git a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi
index 0b88ed3189b5db985c00895fe9ee430e33e7f399..e0950e02a796ff47eed1c598eca4d2c85b8db1d2 100644 (file)
--- a/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi
@@ -256,56 +256,10 @@
                        };
                };
 
-               qcom,ssbi@500000 {
+               ssbi: qcom,ssbi@500000 {
                        compatible = "qcom,ssbi";
                        reg = <0x500000 0x1000>;
                        qcom,controller-type = "pmic-arbiter";
-
-                       pm8018: pmic {
-                               compatible = "qcom,pm8018", "qcom,pm8921";
-                               #interrupt-cells = <2>;
-                               interrupt-controller;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               pwrkey@1c {
-                                       compatible = "qcom,pm8018-pwrkey", "qcom,pm8921-pwrkey";
-                                       reg = <0x1c>;
-                                       interrupt-parent = <&pm8018>;
-                                       interrupts = <50 IRQ_TYPE_EDGE_RISING>,
-                                                    <51 IRQ_TYPE_EDGE_RISING>;
-                                       debounce = <15625>;
-                                       pull-up;
-                               };
-
-                               pm8018_mpps: mpps@50 {
-                                       compatible = "qcom,pm8018-mpp", "qcom,ssbi-mpp";
-                                       interrupt-controller;
-                                       #interrupt-cells = <2>;
-                                       reg = <0x50>;
-                                       gpio-controller;
-                                       #gpio-cells = <2>;
-                                       gpio-ranges = <&pm8018_mpps 0 0 6>;
-                               };
-
-                               rtc@11d {
-                                       compatible = "qcom,pm8018-rtc", "qcom,pm8921-rtc";
-                                       interrupt-parent = <&pm8018>;
-                                       interrupts = <39 IRQ_TYPE_EDGE_RISING>;
-                                       reg = <0x11d>;
-                                       allow-set-time;
-                               };
-
-                               pm8018_gpio: gpio@150 {
-                                       compatible = "qcom,pm8018-gpio", "qcom,ssbi-gpio";
-                                       reg = <0x150>;
-                                       interrupt-controller;
-                                       #interrupt-cells = <2>;
-                                       gpio-controller;
-                                       gpio-ranges = <&pm8018_gpio 0 0 6>;
-                                       #gpio-cells = <2>;
-                               };
-                       };
                };
 
                sdcc1bam: dma-controller@12182000 {