Because the omap34xx, omap36xx and am3517 SoC's have the same thermal junction limits, there is no need to duplicate the entry multiple times. This patch removes the thermal references from omap36xx and omap34xx and pushes it into the common omap3.dtsi file with the added benefit of enabling the thermal info on the AM3517. Signed-off-by: Adam Ford <aford173@xxxxxxxxx> diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index 4043ecb38016..db9cafddbe69 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi @@ -44,6 +44,10 @@ }; }; + thermal_zones: thermal-zones { + #include "omap3-cpu-thermal.dtsi" + }; + pmu@54000000 { compatible = "arm,cortex-a8-pmu"; reg = <0x54000000 0x800000>; diff --git a/arch/arm/boot/dts/omap34xx.dtsi b/arch/arm/boot/dts/omap34xx.dtsi index f572a477f74c..b80378d6e5c1 100644 --- a/arch/arm/boot/dts/omap34xx.dtsi +++ b/arch/arm/boot/dts/omap34xx.dtsi @@ -101,10 +101,6 @@ }; }; }; - - thermal_zones: thermal-zones { - #include "omap3-cpu-thermal.dtsi" - }; }; &ssi { diff --git a/arch/arm/boot/dts/omap36xx.dtsi b/arch/arm/boot/dts/omap36xx.dtsi index 6fb23ada1f64..ff2dca63a04e 100644 --- a/arch/arm/boot/dts/omap36xx.dtsi +++ b/arch/arm/boot/dts/omap36xx.dtsi @@ -140,10 +140,6 @@ }; }; }; - - thermal_zones: thermal-zones { - #include "omap3-cpu-thermal.dtsi" - }; }; /* OMAP3630 needs dss_96m_fck for VENC */ -- 2.17.1