Merge tag 'v4.6-next-dts64' of https://github.com/mbgg/linux-mediatek into next/dt64

Merge "ARM: mediatek: dts64 updates for v4.7" from Matthias Brugger:

- add thermal and auxadc device nodes to mt8173
- add thermal zone nodes to mt8173

* tag 'v4.6-next-dts64' of https://github.com/mbgg/linux-mediatek:
  arm64: dts: mt8173: Add thermal zone node.
  ARM64: dts: mt8173: Add thermal/auxadc device nodes

1 files changed, 60 insertions, 0 deletions

diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
index eab7efc2302d..05f89c4a5413 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
@@ -125,6 +125,49 @@
                 clock-output-names = "cpum_ck";
         };
 
+        thermal-zones {
+                cpu_thermal: cpu_thermal {
+                        polling-delay-passive = <1000>; /* milliseconds */
+                        polling-delay = <1000>; /* milliseconds */
+
+                        thermal-sensors = <&thermal>;
+                        sustainable-power = <1500>; /* milliwatts */
+
+                        trips {
+                                threshold: trip-point@0 {
+                                        temperature = <68000>;
+                                        hysteresis = <2000>;
+                                        type = "passive";
+                                };
+
+                                target: trip-point@1 {
+                                        temperature = <85000>;
+                                        hysteresis = <2000>;
+                                        type = "passive";
+                                };
+
+                                cpu_crit: cpu_crit@0 {
+                                        temperature = <115000>;
+                                        hysteresis = <2000>;
+                                        type = "critical";
+                                };
+                        };
+
+                        cooling-maps {
+                                map@0 {
+                                        trip = <&target>;
+                                        cooling-device = <&cpu0 0 0>;
+                                        contribution = <1024>;
+                                };
+                                map@1 {
+                                        trip = <&target>;
+                                        cooling-device = <&cpu2 0 0>;
+                                        contribution = <2048>;
+                                };
+                        };
+                };
+        };
+
         timer {
                 compatible = "arm,armv8-timer";
                 interrupt-parent = <&gic>;
@@ -313,6 +356,11 @@
                                 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
                 };
 
+                auxadc: auxadc@11001000 {
+                        compatible = "mediatek,mt8173-auxadc";
+                        reg = <0 0x11001000 0 0x1000>;
+                };
+
                 uart0: serial@11002000 {
                         compatible = "mediatek,mt8173-uart",
                                      "mediatek,mt6577-uart";
@@ -414,6 +462,18 @@
                         status = "disabled";
                 };
 
+                thermal: thermal@1100b000 {
+                        #thermal-sensor-cells = <0>;
+                        compatible = "mediatek,mt8173-thermal";
+                        reg = <0 0x1100b000 0 0x1000>;
+                        interrupts = <0 70 IRQ_TYPE_LEVEL_LOW>;
+                        clocks = <&pericfg CLK_PERI_THERM>, <&pericfg CLK_PERI_AUXADC>;
+                        clock-names = "therm", "auxadc";
+                        resets = <&pericfg MT8173_PERI_THERM_SW_RST>;
+                        mediatek,auxadc = <&auxadc>;
+                        mediatek,apmixedsys = <&apmixedsys>;
+                };
+
                 nor_flash: spi@1100d000 {
                         compatible = "mediatek,mt8173-nor";
                         reg = <0 0x1100d000 0 0xe0>;