arm64: dts: qcom: split pmr735d into 2

The second PMR735D PMIC is not always presend on SM8550 based devices,
split the pmr735d.dtsi file in two so boards files can only include the
ones present on the platform.

Suggested-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20230831-topic-sm8550-upstream-pmr735d-split-v1-1-98e632636415@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/pmr735d.dtsi b/arch/arm64/boot/dts/qcom/pmr735d.dtsi
deleted file mode 100644 (file)
index 41fb664..0000000
--- a/arch/arm64/boot/dts/qcom/pmr735d.dtsi
+++ /dev/null
@@ -1,104 +0,0 @@
-// SPDX-License-Identifier: BSD-3-Clause
-/*
- * Copyright (c) 2022, Linaro Limited
- */
-
-#include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/spmi/spmi.h>
-
-/ {
-       thermal-zones {
-               pmr735d-k-thermal {
-                       polling-delay-passive = <100>;
-                       polling-delay = <0>;
-
-                       thermal-sensors = <&pmr735d_k_temp_alarm>;
-
-                       trips {
-                               trip0 {
-                                       temperature = <95000>;
-                                       hysteresis = <0>;
-                                       type = "passive";
-                               };
-
-                               trip1 {
-                                       temperature = <115000>;
-                                       hysteresis = <0>;
-                                       type = "hot";
-                               };
-                       };
-               };
-
-               pmr735d-l-thermal {
-                       polling-delay-passive = <100>;
-                       polling-delay = <0>;
-
-                       thermal-sensors = <&pmr735d_l_temp_alarm>;
-
-                       trips {
-                               trip0 {
-                                       temperature = <95000>;
-                                       hysteresis = <0>;
-                                       type = "passive";
-                               };
-
-                               trip1 {
-                                       temperature = <115000>;
-                                       hysteresis = <0>;
-                                       type = "hot";
-                               };
-                       };
-               };
-       };
-};
-
-
-&spmi_bus {
-       pmr735d_k: pmic@a {
-               compatible = "qcom,pmr735d", "qcom,spmi-pmic";
-               reg = <0xa SPMI_USID>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               pmr735d_k_temp_alarm: temp-alarm@a00 {
-                       compatible = "qcom,spmi-temp-alarm";
-                       reg = <0xa00>;
-                       interrupts = <0xa 0xa 0x0 IRQ_TYPE_EDGE_BOTH>;
-                       #thermal-sensor-cells = <0>;
-               };
-
-               pmr735d_k_gpios: gpio@8800 {
-                       compatible = "qcom,pmr735d-gpio", "qcom,spmi-gpio";
-                       reg = <0x8800>;
-                       gpio-controller;
-                       gpio-ranges = <&pmr735d_k_gpios 0 0 2>;
-                       #gpio-cells = <2>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-               };
-       };
-
-       pmr735d_l: pmic@b {
-               compatible = "qcom,pmr735d", "qcom,spmi-pmic";
-               reg = <0xb SPMI_USID>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               pmr735d_l_temp_alarm: temp-alarm@a00 {
-                       compatible = "qcom,spmi-temp-alarm";
-                       reg = <0xa00>;
-                       interrupts = <0xb 0xa 0x0 IRQ_TYPE_EDGE_BOTH>;
-                       #thermal-sensor-cells = <0>;
-               };
-
-               pmr735d_l_gpios: gpio@8800 {
-                       compatible = "qcom,pmr735d-gpio", "qcom,spmi-gpio";
-                       reg = <0x8800>;
-                       gpio-controller;
-                       gpio-ranges = <&pmr735d_l_gpios 0 0 2>;
-                       #gpio-cells = <2>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-               };
-       };
-};

diff --git a/arch/arm64/boot/dts/qcom/pmr735d_a.dtsi b/arch/arm64/boot/dts/qcom/pmr735d_a.dtsi
new file mode 100644 (file)
index 0000000..37daaef
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/pmr735d_a.dtsi
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2022, Linaro Limited
+ */
+
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/spmi/spmi.h>
+
+/ {
+       thermal-zones {
+               pmr735d-k-thermal {
+                       polling-delay-passive = <100>;
+                       polling-delay = <0>;
+
+                       thermal-sensors = <&pmr735d_k_temp_alarm>;
+
+                       trips {
+                               trip0 {
+                                       temperature = <95000>;
+                                       hysteresis = <0>;
+                                       type = "passive";
+                               };
+
+                               trip1 {
+                                       temperature = <115000>;
+                                       hysteresis = <0>;
+                                       type = "hot";
+                               };
+                       };
+               };
+       };
+};
+
+
+&spmi_bus {
+       pmr735d_k: pmic@a {
+               compatible = "qcom,pmr735d", "qcom,spmi-pmic";
+               reg = <0xa SPMI_USID>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               pmr735d_k_temp_alarm: temp-alarm@a00 {
+                       compatible = "qcom,spmi-temp-alarm";
+                       reg = <0xa00>;
+                       interrupts = <0xa 0xa 0x0 IRQ_TYPE_EDGE_BOTH>;
+                       #thermal-sensor-cells = <0>;
+               };
+
+               pmr735d_k_gpios: gpio@8800 {
+                       compatible = "qcom,pmr735d-gpio", "qcom,spmi-gpio";
+                       reg = <0x8800>;
+                       gpio-controller;
+                       gpio-ranges = <&pmr735d_k_gpios 0 0 2>;
+                       #gpio-cells = <2>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+       };
+};

diff --git a/arch/arm64/boot/dts/qcom/pmr735d_b.dtsi b/arch/arm64/boot/dts/qcom/pmr735d_b.dtsi
new file mode 100644 (file)
index 0000000..3b470f6
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/pmr735d_b.dtsi
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2022, Linaro Limited
+ */
+
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/spmi/spmi.h>
+
+/ {
+       thermal-zones {
+               pmr735d-l-thermal {
+                       polling-delay-passive = <100>;
+                       polling-delay = <0>;
+
+                       thermal-sensors = <&pmr735d_l_temp_alarm>;
+
+                       trips {
+                               trip0 {
+                                       temperature = <95000>;
+                                       hysteresis = <0>;
+                                       type = "passive";
+                               };
+
+                               trip1 {
+                                       temperature = <115000>;
+                                       hysteresis = <0>;
+                                       type = "hot";
+                               };
+                       };
+               };
+       };
+};
+
+
+&spmi_bus {
+       pmr735d_l: pmic@b {
+               compatible = "qcom,pmr735d", "qcom,spmi-pmic";
+               reg = <0xb SPMI_USID>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               pmr735d_l_temp_alarm: temp-alarm@a00 {
+                       compatible = "qcom,spmi-temp-alarm";
+                       reg = <0xa00>;
+                       interrupts = <0xb 0xa 0x0 IRQ_TYPE_EDGE_BOTH>;
+                       #thermal-sensor-cells = <0>;
+               };
+
+               pmr735d_l_gpios: gpio@8800 {
+                       compatible = "qcom,pmr735d-gpio", "qcom,spmi-gpio";
+                       reg = <0x8800>;
+                       gpio-controller;
+                       gpio-ranges = <&pmr735d_l_gpios 0 0 2>;
+                       #gpio-cells = <2>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+       };
+};

diff --git a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
index 91aa37ecb2591214c5b594f111b90662e6eeb6a9..5b3488736fbed2a8a1c5023d3eae16ad6f9e60cf 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
@@ -13,7 +13,8 @@
 #include "pm8550ve.dtsi"
 #include "pm8550vs.dtsi"
 #include "pmk8550.dtsi"
-#include "pmr735d.dtsi"
+#include "pmr735d_a.dtsi"
+#include "pmr735d_b.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SM8550 MTP";

diff --git a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
index 2a0ea20224d68a35a7840a734cc60d3a4bf6d7ff..320662024e8914e6359c6a2c3936df44f281b131 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
@@ -14,7 +14,8 @@
 #include "pm8550ve.dtsi"
 #include "pm8550vs.dtsi"
 #include "pmk8550.dtsi"
-#include "pmr735d.dtsi"
+#include "pmr735d_a.dtsi"
+#include "pmr735d_b.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SM8550 QRD";