From: Greg Kroah-Hartman Date: Mon, 16 Jul 2018 07:08:07 +0000 (+0200) Subject: 4.17-stable patches X-Git-Tag: v4.4.141~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8cb138ef806c5e195ff823052733f2b12c27f0c7;p=thirdparty%2Fkernel%2Fstable-queue.git 4.17-stable patches added patches: arm-dts-armada-38x-use-the-new-thermal-binding.patch --- diff --git a/queue-4.17/arm-dts-armada-38x-use-the-new-thermal-binding.patch b/queue-4.17/arm-dts-armada-38x-use-the-new-thermal-binding.patch new file mode 100644 index 00000000000..12046fb03ff --- /dev/null +++ b/queue-4.17/arm-dts-armada-38x-use-the-new-thermal-binding.patch @@ -0,0 +1,37 @@ +From 568cc2f07c8ea5f71a0486464bd9703e4671045f Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Tue, 3 Jul 2018 06:24:20 +0300 +Subject: ARM: dts: armada-38x: use the new thermal binding + +From: Baruch Siach + +commit 568cc2f07c8ea5f71a0486464bd9703e4671045f upstream. + +Commit 2f28e4c24b10e (thermal: armada: Clarify control registers +accesses) introduced the new thermal binding. The new binding extends +the second registers field size to 8. Switch to the new binding to fix +thermal reading values. Without this change the fix for errata #132698 +introduced in commit 8c0b888f661 (thermal: armada: Change sensors trim +default value) has no effect. + +Cc: stable@vger.kernel.org # v4.16+ +Reviewed-by: Miquel Raynal +Signed-off-by: Baruch Siach +Signed-off-by: Gregory CLEMENT +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/boot/dts/armada-38x.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- 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"; + }; + diff --git a/queue-4.17/series b/queue-4.17/series index c9aadcd9eb9..b52e12d8848 100644 --- a/queue-4.17/series +++ b/queue-4.17/series @@ -64,3 +64,4 @@ f2fs-give-message-and-set-need_fsck-given-broken-node-id.patch f2fs-avoid-bug_on-on-corrupted-inode.patch f2fs-sanity-check-on-sit-entry.patch f2fs-sanity-check-for-total-valid-node-blocks.patch +arm-dts-armada-38x-use-the-new-thermal-binding.patch