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

Commit fa59f178 authored by Grant Likely's avatar Grant Likely Committed by Anatolij Gustschin
Browse files

powerpc/5200: Use the gpt* labels to simplify mpc5200 dts files 



The DTC labels feature allows a dts file to reference a node without
having to reproduce the entire node hierarchy above it. We can use this
to simplify the MPC5200 board dts files by referencing the gpt nodes by
label.

Cc: Anatolij Gustschin <agust@denx.de>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
[agust: fixed gpt7 phandle in the csi node of o2d.dtsi]
Signed-off-by: default avatarAnatolij Gustschin <agust@denx.de>
parent 4fd0a213

arch/powerpc/boot/dts/a3m071.dts

+2 −4
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 


/include/ "mpc5200b.dtsi"



&gpt0 { fsl,has-wdt; };



/ {

	model = "anonymous,a3m071";

	compatible = "anonymous,a3m071";
@@ -30,10 +32,6 @@ 
		bus-frequency = <0>; /* From boot loader */

		system-frequency = <0>; /* From boot loader */



		timer@600 {

			fsl,has-wdt;

		};



		spi@f00 {

			status = "disabled";

		};

arch/powerpc/boot/dts/a4m072.dts

+5 −22
Original line number Diff line number Diff line
@@ -15,6 +15,11 @@ 


/include/ "mpc5200b.dtsi"



&gpt0 { fsl,has-wdt; };

&gpt3 { gpio-controller; };

&gpt4 { gpio-controller; };

&gpt5 { gpio-controller; };



/ {

	model = "anonymous,a4m072";

	compatible = "anonymous,a4m072";
@@ -34,28 +39,6 @@ 
			fsl,init-fd-counters = <0x3333>;

		};



		timer@600 {

			fsl,has-wdt;

		};



		gpt3: timer@630 { /* General Purpose Timer in GPIO mode */

			compatible = "fsl,mpc5200b-gpt-gpio","fsl,mpc5200-gpt-gpio";

			gpio-controller;

			#gpio-cells = <2>;

		};



		gpt4: timer@640 { /* General Purpose Timer in GPIO mode */

			compatible = "fsl,mpc5200b-gpt-gpio","fsl,mpc5200-gpt-gpio";

			gpio-controller;

			#gpio-cells = <2>;

		};



		gpt5: timer@650 { /* General Purpose Timer in GPIO mode */

			compatible = "fsl,mpc5200b-gpt-gpio","fsl,mpc5200-gpt-gpio";

			gpio-controller;

			#gpio-cells = <2>;

		};



		spi@f00 {

			status = "disabled";

		};

arch/powerpc/boot/dts/cm5200.dts

+2 −4
Original line number Diff line number Diff line
@@ -12,15 +12,13 @@ 


/include/ "mpc5200b.dtsi"



&gpt0 { fsl,has-wdt; };



/ {

	model = "schindler,cm5200";

	compatible = "schindler,cm5200";



	soc5200@f0000000 {

		timer@600 {	// General Purpose Timer

			fsl,has-wdt;

		};



		can@900 {

			status = "disabled";

		};

arch/powerpc/boot/dts/digsy_mtc.dts

+3 −11
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ 


/include/ "mpc5200b.dtsi"



&gpt0 { gpio-controller; fsl,has-wdt; };

&gpt1 { gpio-controller; };



/ {

	model = "intercontrol,digsy-mtc";

	compatible = "intercontrol,digsy-mtc";
@@ -22,17 +25,6 @@ 
	};



	soc5200@f0000000 {

		timer@600 {	// General Purpose Timer

			#gpio-cells = <2>;

			fsl,has-wdt;

			gpio-controller;

		};



		timer@610 {

			#gpio-cells = <2>;

			gpio-controller;

		};



		rtc@800 {

			status = "disabled";

		};

arch/powerpc/boot/dts/media5200.dts

+2 −4
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 


/include/ "mpc5200b.dtsi"



&gpt0 { fsl,has-wdt; };



/ {

	model = "fsl,media5200";

	compatible = "fsl,media5200";
@@ -41,10 +43,6 @@ 
	soc5200@f0000000 {

		bus-frequency = <132000000>;// 132 MHz



		timer@600 {	// General Purpose Timer

			fsl,has-wdt;

		};



		psc@2000 {	// PSC1

			status = "disabled";

		};