arm64: dts: msm8996: thermal: Initialise via DT and add second controller

We also split up the regmap address space into two, for the TM and SROT
registers. This was required to deal with different address offsets for the
TM and SROT registers across different SoC families.

8996 has two TSENS IP blocks, initialise the second one too.

Since tsens-common.c/init_common() currently only registers one address
space, the order is important (TM before SROT). This is OK since the code
doesn't really use the SROT functionality yet.

Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Tested-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 8c7f9ca25b5340f51be48abca6e435f5a6293f7e..cd3865e7a270b97e1913c779fa7ad3448d3e5660 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -377,6 +377,22 @@
                        reg = <0x740000 0x20000>;
                };
 
+               tsens0: thermal-sensor@4a9000 {
+                       compatible = "qcom,msm8996-tsens";
+                       reg = <0x4a9000 0x1000>, /* TM */
+                             <0x4a8000 0x1000>; /* SROT */
+                       #qcom,sensors = <13>;
+                       #thermal-sensor-cells = <1>;
+               };
+
+               tsens1: thermal-sensor@4ad000 {
+                       compatible = "qcom,msm8996-tsens";
+                       reg = <0x4ad000 0x1000>, /* TM */
+                             <0x4ac000 0x1000>; /* SROT */
+                       #qcom,sensors = <8>;
+                       #thermal-sensor-cells = <1>;
+               };
+
                tcsr: syscon@7a0000 {
                        compatible = "qcom,tcsr-msm8996", "syscon";
                        reg = <0x7a0000 0x18000>;
@@ -459,12 +475,6 @@
                        status = "disabled";
                };
 
-               tsens0: thermal-sensor@4a8000 {
-                       compatible = "qcom,msm8996-tsens";
-                       reg = <0x4a8000 0x2000>;
-                       #thermal-sensor-cells = <1>;
-               };
-
                blsp2_uart1: serial@75b0000 {
                        compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
                        reg = <0x75b0000 0x1000>;