Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+60
+60
arch/arm64/boot/dts/mediatek/mt8173.dtsi
··· 125 125 clock-output-names = "cpum_ck"; 126 126 }; 127 127 128 + thermal-zones { 129 + cpu_thermal: cpu_thermal { 130 + polling-delay-passive = <1000>; /* milliseconds */ 131 + polling-delay = <1000>; /* milliseconds */ 132 + 133 + thermal-sensors = <&thermal>; 134 + sustainable-power = <1500>; /* milliwatts */ 135 + 136 + trips { 137 + threshold: trip-point@0 { 138 + temperature = <68000>; 139 + hysteresis = <2000>; 140 + type = "passive"; 141 + }; 142 + 143 + target: trip-point@1 { 144 + temperature = <85000>; 145 + hysteresis = <2000>; 146 + type = "passive"; 147 + }; 148 + 149 + cpu_crit: cpu_crit@0 { 150 + temperature = <115000>; 151 + hysteresis = <2000>; 152 + type = "critical"; 153 + }; 154 + }; 155 + 156 + cooling-maps { 157 + map@0 { 158 + trip = <&target>; 159 + cooling-device = <&cpu0 0 0>; 160 + contribution = <1024>; 161 + }; 162 + map@1 { 163 + trip = <&target>; 164 + cooling-device = <&cpu2 0 0>; 165 + contribution = <2048>; 166 + }; 167 + }; 168 + }; 169 + }; 170 + 128 171 timer { 129 172 compatible = "arm,armv8-timer"; 130 173 interrupt-parent = <&gic>; ··· 356 313 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; 357 314 }; 358 315 316 + auxadc: auxadc@11001000 { 317 + compatible = "mediatek,mt8173-auxadc"; 318 + reg = <0 0x11001000 0 0x1000>; 319 + }; 320 + 359 321 uart0: serial@11002000 { 360 322 compatible = "mediatek,mt8173-uart", 361 323 "mediatek,mt6577-uart"; ··· 460 412 <&pericfg CLK_PERI_SPI0>; 461 413 clock-names = "parent-clk", "sel-clk", "spi-clk"; 462 414 status = "disabled"; 415 + }; 416 + 417 + thermal: thermal@1100b000 { 418 + #thermal-sensor-cells = <0>; 419 + compatible = "mediatek,mt8173-thermal"; 420 + reg = <0 0x1100b000 0 0x1000>; 421 + interrupts = <0 70 IRQ_TYPE_LEVEL_LOW>; 422 + clocks = <&pericfg CLK_PERI_THERM>, <&pericfg CLK_PERI_AUXADC>; 423 + clock-names = "therm", "auxadc"; 424 + resets = <&pericfg MT8173_PERI_THERM_SW_RST>; 425 + mediatek,auxadc = <&auxadc>; 426 + mediatek,apmixedsys = <&apmixedsys>; 463 427 }; 464 428 465 429 nor_flash: spi@1100d000 {