aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.9/031-v4.10-0008-ARM-bcm2835-dts-add-thermal-node-to-device-tree-of-b.patch
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2017-03-22 23:35:39 +0100
committerRafał Miłecki <rafal@milecki.pl>2017-03-24 19:52:00 +0100
commit313197d7079ae5046740909133b1cd89f81e2533 (patch)
treeaad922b97b671381ef38291c41abd07b3f3d9311 /target/linux/brcm2708/patches-4.9/031-v4.10-0008-ARM-bcm2835-dts-add-thermal-node-to-device-tree-of-b.patch
parent322a7226d32222e19b2a633c05f56fa0f06da435 (diff)
downloadupstream-313197d7079ae5046740909133b1cd89f81e2533.tar.gz
upstream-313197d7079ae5046740909133b1cd89f81e2533.tar.bz2
upstream-313197d7079ae5046740909133b1cd89f81e2533.zip
brcm2708: backport upstream ARM dts commits
This gets us in sync with dts from kernel 4.11. Two patches were already backported earlier. I decided to use 03x prefix as it's kind of similar to the 3xx prefix: 3xx - architecture specific patches It isn't any documented or strict rule though. We don't need to stick to it if we hit any problems. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.9/031-v4.10-0008-ARM-bcm2835-dts-add-thermal-node-to-device-tree-of-b.patch')
-rw-r--r--target/linux/brcm2708/patches-4.9/031-v4.10-0008-ARM-bcm2835-dts-add-thermal-node-to-device-tree-of-b.patch67
1 files changed, 67 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.9/031-v4.10-0008-ARM-bcm2835-dts-add-thermal-node-to-device-tree-of-b.patch b/target/linux/brcm2708/patches-4.9/031-v4.10-0008-ARM-bcm2835-dts-add-thermal-node-to-device-tree-of-b.patch
new file mode 100644
index 0000000000..4c541a7669
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.9/031-v4.10-0008-ARM-bcm2835-dts-add-thermal-node-to-device-tree-of-b.patch
@@ -0,0 +1,67 @@
+From 43bac4133f405b67857e4c985aecc44a57233bfe Mon Sep 17 00:00:00 2001
+From: Martin Sperl <kernel@martin.sperl.org>
+Date: Wed, 2 Nov 2016 10:18:23 +0000
+Subject: [PATCH] ARM: bcm2835: dts: add thermal node to device-tree of bcm283x
+
+Add the node for the thermal sensor of the bcm2835-soc
+to the device tree.
+
+Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
+Reviewed-by: Eric Anholt <eric@anholt.net>
+Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
+
+Changelog:
+V1 -> V5: generic settings is shared in bcm283x.dtsi, but disabled
+ moved the compatible string to the SOC specific dtsi
+ for arm and arm64
+V5 -> V6: fix remove 0x prefix from thermal@0x7e212000
+
+Note: there is no arm/boot/dts/bcm2837.dtsi as of now,
+ so the 32-bit rpi3 dt is not modified.
+Signed-off-by: Eric Anholt <eric@anholt.net>
+---
+ arch/arm/boot/dts/bcm2835.dtsi | 6 ++++++
+ arch/arm/boot/dts/bcm2836.dtsi | 6 ++++++
+ arch/arm/boot/dts/bcm283x.dtsi | 7 +++++++
+ 3 files changed, 19 insertions(+)
+
+--- a/arch/arm/boot/dts/bcm2835.dtsi
++++ b/arch/arm/boot/dts/bcm2835.dtsi
+@@ -23,3 +23,9 @@
+ };
+ };
+ };
++
++/* enable thermal sensor with the correct compatible property set */
++&thermal {
++ compatible = "brcm,bcm2835-thermal";
++ status = "okay";
++};
+--- a/arch/arm/boot/dts/bcm2836.dtsi
++++ b/arch/arm/boot/dts/bcm2836.dtsi
+@@ -76,3 +76,9 @@
+ interrupt-parent = <&local_intc>;
+ interrupts = <8>;
+ };
++
++/* enable thermal sensor with the correct compatible property set */
++&thermal {
++ compatible = "brcm,bcm2836-thermal";
++ status = "okay";
++};
+--- a/arch/arm/boot/dts/bcm283x.dtsi
++++ b/arch/arm/boot/dts/bcm283x.dtsi
+@@ -390,6 +390,13 @@
+ interrupts = <2 14>; /* pwa1 */
+ };
+
++ thermal: thermal@7e212000 {
++ compatible = "brcm,bcm2835-thermal";
++ reg = <0x7e212000 0x8>;
++ clocks = <&clocks BCM2835_CLOCK_TSENS>;
++ status = "disabled";
++ };
++
+ aux: aux@0x7e215000 {
+ compatible = "brcm,bcm2835-aux";
+ #clock-cells = <1>;