Commit a98182af authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-fixes-for-5.9-2' of...

Merge tag 'sunxi-fixes-for-5.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes

One fix for an unreasonable thermal trip point on the A10

* tag 'sunxi-fixes-for-5.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  ARM: dts: sun4i-a10: fix cpu_alert temperature

Link: https://lore.kernel.org/r/3c95a95f-c6fa-4b34-823b-ddaa7660d274.lettre@localhost


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3a69e4e6 dea252fa
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@
			trips {
				cpu_alert0: cpu-alert0 {
					/* milliCelsius */
					temperature = <850000>;
					temperature = <85000>;
					hysteresis = <2000>;
					type = "passive";
				};