arm64: dts: qcom: pm7250b: make SID configurable

Like other Qualcomm PMICs the PM7250B can be used on different addresses
on the SPMI bus. Use similar defines like the PMK8350 to make this
possible but skip the ifndef based on maintainer feedback.

Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20230919-fp5-initial-v2-3-14bb7cedadf5@fairphone.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/pm7250b.dtsi b/arch/arm64/boot/dts/qcom/pm7250b.dtsi
index e8540c36bd99dfb63eabf99aa2209484a71bc001..df0afe82f250e5b61f1cc3e29acca5dba206021f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm7250b.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm7250b.dtsi
@@ -39,16 +39,16 @@
 };
 
 &spmi_bus {
-       pmic@2 {
+       pmic@PM7250B_SID {
                compatible = "qcom,pm7250b", "qcom,spmi-pmic";
-               reg = <0x2 SPMI_USID>;
+               reg = <PM7250B_SID SPMI_USID>;
                #address-cells = <1>;
                #size-cells = <0>;
 
                pm7250b_temp: temp-alarm@2400 {
                        compatible = "qcom,spmi-temp-alarm";
                        reg = <0x2400>;
-                       interrupts = <0x2 0x24 0x0 IRQ_TYPE_EDGE_BOTH>;
+                       interrupts = <PM7250B_SID 0x24 0x0 IRQ_TYPE_EDGE_BOTH>;
                        io-channels = <&pm7250b_adc ADC5_DIE_TEMP>;
                        io-channel-names = "thermal";
                        #thermal-sensor-cells = <0>;
@@ -60,7 +60,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                        #io-channel-cells = <1>;
-                       interrupts = <0x2 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
+                       interrupts = <PM7250B_SID 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
 
                        channel@0 {
                                reg = <ADC5_REF_GND>;
@@ -141,7 +141,7 @@
                pm7250b_adc_tm: adc-tm@3500 {
                        compatible = "qcom,spmi-adc-tm5";
                        reg = <0x3500>;
-                       interrupts = <0x2 0x35 0x0 IRQ_TYPE_EDGE_RISING>;
+                       interrupts = <PM7250B_SID 0x35 0x0 IRQ_TYPE_EDGE_RISING>;
                        #thermal-sensor-cells = <1>;
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -159,9 +159,9 @@
                };
        };
 
-       pmic@3 {
+       pmic@PM7250B_SID1 {
                compatible = "qcom,pm7250b", "qcom,spmi-pmic";
-               reg = <0x3 SPMI_USID>;
+               reg = <PM7250B_SID1 SPMI_USID>;
                #address-cells = <1>;
                #size-cells = <0>;
        };

diff --git a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
index da9e60c71304c766112e17b4428b1f52c002b342..ade619805519e86c8a67454a94c47b058c445ec9 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
+++ b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts
@@ -5,6 +5,10 @@
 
 /dts-v1/;
 
+/* PM7250B is configured to use SID2/3 */
+#define PM7250B_SID 2
+#define PM7250B_SID1 3
+
 /* PMK8350 (in reality a PMK8003) is configured to use SID6 instead of 0 */
 #define PMK8350_SID 6