ARM: dts: imx6: add thermal sensor and cooling cells

BugLink: https://bugs.launchpad.net/bugs/1840437
This allows a board to specify a custom thermal zone configuration
involving the SoC internal sensor, CPU and GPU nodes without having
to change those nodes.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
(backported from commit 4951c2da1a3a8b56d4ef0659d80938942307a8a3)
Signed-off-by: Shrirang Bagul <shrirang.bagul@canonical.com>
Acked-by: Paolo Pisati <paolo.pisati@canonical.com>
Acked-by: Hui Wang <hui.wang@canonical.com>
Acked-by: Wen-chien Jesse Sung <jesse.sung@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index b049794467f80973eb2a7a850993f3b8c0e7e93b..6073d203989426d51abf15b73c1ad0ce6ec77e23 100644 (file)
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -208,6 +208,7 @@
                                 <&clks IMX6QDL_CLK_GPU2D_CORE>;
                        clock-names = "bus", "core";
                        power-domains = <&pd_pu>;
+                       #cooling-cells = <2>;
                };
 
                ipu2: ipu@2800000 {

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 3372308974bfec35e9290b1d4ccd7f8f1aab248f..f85d7c2d87a65c439afb08046fcc6b4f8e38ae04 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -157,6 +157,7 @@
                                 <&clks IMX6QDL_CLK_GPU3D_SHADER>;
                        clock-names = "bus", "core", "shader";
                        power-domains = <&pd_pu>;
+                       #cooling-cells = <2>;
                };
 
                gpu_2d: gpu@134000 {
@@ -167,6 +168,7 @@
                                 <&clks IMX6QDL_CLK_GPU2D_CORE>;
                        clock-names = "bus", "core";
                        power-domains = <&pd_pu>;
+                       #cooling-cells = <2>;
                };
 
                timer@a00600 {
@@ -735,6 +737,7 @@
                                fsl,tempmon = <&anatop>;
                                fsl,tempmon-data = <&ocotp>;
                                clocks = <&clks IMX6QDL_CLK_PLL3_USB_OTG>;
+                               #thermal-sensor-cells = <0>;
                        };
 
                        usbphy1: usbphy@20c9000 {