Merge tag 'mvebu-fixes-4.18-1' of git://git.infradead.org/linux-mvebu…

… into fixes mvebu fixes for 4.18 (part 1) Use the new thermal binding on Armada 38x allowing to use a driver fix which is already part of the kernel. * tag 'mvebu-fixes-4.18-1' of git://git.infradead.org/linux-mvebu: ARM: dts: armada-38x: use the new thermal binding Signed-off-by: Olof Johansson <[email protected]>
ambv · Jul 14, 2018 · d4f72a7 · d4f72a7
2 parents 4dbd2b4 + 568cc2f
commit d4f72a7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
@@ -547,7 +547,7 @@
 
 			thermal: thermal@e8078 {
 				compatible = "marvell,armada380-thermal";
-				reg = <0xe4078 0x4>, <0xe4074 0x4>;
+				reg = <0xe4078 0x4>, <0xe4070 0x8>;
 				status = "okay";
 			};