Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c1d25b0 authored by Lee Jones's avatar Lee Jones Committed by Linus Walleij
Browse files

ARM: ux500: Move Snowball's thermal DT node into existing PRCMU one 



When the thermal DT node was inserted a new PRCMU node was created;
however, one already exists in the Snowball DTS file. Here we
amalgamate the two into a single consolidated node.

Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent e4aa937e

arch/arm/boot/dts/snowball.dts

+25 −27
Original line number Diff line number Diff line
@@ -99,33 +99,6 @@ 
			status = "okay";

		};



		prcmu@80157000 {

			thermal@801573c0 {

				num-trips = <4>;



				trip0-temp = <70000>;

				trip0-type = "active";

				trip0-cdev-num = <1>;

				trip0-cdev-name0 = "thermal-cpufreq-0";



				trip1-temp = <75000>;

				trip1-type = "active";

				trip1-cdev-num = <1>;

				trip1-cdev-name0 = "thermal-cpufreq-0";



				trip2-temp = <80000>;

				trip2-type = "active";

				trip2-cdev-num = <1>;

				trip2-cdev-name0 = "thermal-cpufreq-0";



				trip3-temp = <85000>;

				trip3-type = "critical";

				trip3-cdev-num = <0>;



				status = "okay";

			 };

		};



		external-bus@50000000 {

			status = "okay";
@@ -298,6 +271,31 @@ 
				};

			};



			thermal@801573c0 {

				num-trips = <4>;



				trip0-temp = <70000>;

				trip0-type = "active";

				trip0-cdev-num = <1>;

				trip0-cdev-name0 = "thermal-cpufreq-0";



				trip1-temp = <75000>;

				trip1-type = "active";

				trip1-cdev-num = <1>;

				trip1-cdev-name0 = "thermal-cpufreq-0";



				trip2-temp = <80000>;

				trip2-type = "active";

				trip2-cdev-num = <1>;

				trip2-cdev-name0 = "thermal-cpufreq-0";



				trip3-temp = <85000>;

				trip3-type = "critical";

				trip3-cdev-num = <0>;



				status = "okay";

			};



			ab8500 {

				ab8500-gpio {

					compatible = "stericsson,ab8500-gpio";