arm64: dts: qcom: sc8280xp-crd: Add PMIC die-temp vadc channels

The die-temp vadc channels are not defined for the CRD, but describing
them directly would directly duplicate the definition from the Lenovo
Thinkpad X13s DeviceTree.

The sc8280xp-pmics file describes the common configuration of PMK8280,
two PMC8280, PMC8280C, and PMR735a. As such, even though these vadc
channels makes references across PMICs, it's suitable to define them in
the shared file.

Do this, and enable the pmk8280 vadc for the CRD.

Signed-off-by: Bjorn Andersson <quic_bjorande@quicinc.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20240210-sc8280xp-pmic-thermal-v1-1-a1c215a17d10@quicinc.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
index ffc4406422ae2f82c9636e0fb521f34a1d28c1eb..22f10813aa3cfc25f51b79d7f0b623f5c93d1385 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
@@ -604,6 +604,10 @@
        };
 };
 
+&pmk8280_vadc {
+       status = "okay";
+};
+
 &qup0 {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
index def3976bd5bb154d27228831de14e9463239bdf8..ce2564a6c26e10ce1dec4f60cd8c330db4304154 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -6,10 +6,8 @@
 
 /dts-v1/;
 
-#include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/iio/qcom,spmi-adc7-pm8350.h>
-#include <dt-bindings/iio/qcom,spmi-adc7-pmk8350.h>
-#include <dt-bindings/iio/qcom,spmi-adc7-pmr735a.h>
+#include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/gpio-keys.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
@@ -855,25 +853,6 @@
 &pmk8280_vadc {
        status = "okay";
 
-       channel@3 {
-               reg = <PMK8350_ADC7_DIE_TEMP>;
-               qcom,pre-scaling = <1 1>;
-               label = "pmk8350_die_temp";
-       };
-
-       channel@44 {
-               reg = <PMK8350_ADC7_AMUX_THM1_100K_PU>;
-               qcom,hw-settle-time = <200>;
-               qcom,ratiometric;
-               label = "pmk8350_xo_therm";
-       };
-
-       channel@103 {
-               reg = <PM8350_ADC7_DIE_TEMP(1)>;
-               qcom,pre-scaling = <1 1>;
-               label = "pmc8280_1_die_temp";
-       };
-
        channel@144 {
                reg = <PM8350_ADC7_AMUX_THM1_100K_PU(1)>;
                qcom,hw-settle-time = <200>;
@@ -902,12 +881,6 @@
                label = "sys_therm4";
        };
 
-       channel@303 {
-               reg = <PM8350_ADC7_DIE_TEMP(3)>;
-               qcom,pre-scaling = <1 1>;
-               label = "pmc8280_2_die_temp";
-       };
-
        channel@344 {
                reg = <PM8350_ADC7_AMUX_THM1_100K_PU(3)>;
                qcom,hw-settle-time = <200>;
@@ -935,12 +908,6 @@
                qcom,ratiometric;
                label = "sys_therm8";
        };
-
-       channel@403 {
-               reg = <PMR735A_ADC7_DIE_TEMP>;
-               qcom,pre-scaling = <1 1>;
-               label = "pmr735a_die_temp";
-       };
 };
 
 &qup0 {

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi
index 80ee12ded4f42da1e511ba5f1f0339c1dbfda963..58fea376f0e2dcd336bab5387d9841868bb17654 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi
@@ -3,6 +3,9 @@
  * Copyright (c) 2022, Linaro Limited
  */
 
+#include <dt-bindings/iio/qcom,spmi-adc7-pm8350.h>
+#include <dt-bindings/iio/qcom,spmi-adc7-pmk8350.h>
+#include <dt-bindings/iio/qcom,spmi-adc7-pmr735a.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/spmi/spmi.h>
@@ -85,6 +88,37 @@
                        #size-cells = <0>;
                        #io-channel-cells = <1>;
                        status = "disabled";
+
+                       channel@3 {
+                               reg = <PMK8350_ADC7_DIE_TEMP>;
+                               qcom,pre-scaling = <1 1>;
+                               label = "pmk8350_die_temp";
+                       };
+
+                       channel@44 {
+                               reg = <PMK8350_ADC7_AMUX_THM1_100K_PU>;
+                               qcom,hw-settle-time = <200>;
+                               qcom,ratiometric;
+                               label = "pmk8350_xo_therm";
+                       };
+
+                       channel@103 {
+                               reg = <PM8350_ADC7_DIE_TEMP(1)>;
+                               qcom,pre-scaling = <1 1>;
+                               label = "pmc8280_1_die_temp";
+                       };
+
+                       channel@303 {
+                               reg = <PM8350_ADC7_DIE_TEMP(3)>;
+                               qcom,pre-scaling = <1 1>;
+                               label = "pmc8280_2_die_temp";
+                       };
+
+                       channel@403 {
+                               reg = <PMR735A_ADC7_DIE_TEMP>;
+                               qcom,pre-scaling = <1 1>;
+                               label = "pmr735a_die_temp";
+                       };
                };
 
                pmk8280_adc_tm: adc-tm@3400 {