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

Commit dffff02a authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge remote-tracking branch 'agust/next' into next 

<<
Please pull mpc5xxx patches for v3.9. The bestcomm driver is
moved to drivers/dma (so it will be usable for ColdFire).
mpc5121 now provides common dtsi file and existing mpc5121 device
trees use it. There are some minor clock init and sparse fixes
and updates for various 5200 device tree files from Grant. Some
fixes for bugs in the mpc5121 DIU driver are also included here
(Andrew Morton suggested to push them via my mpc5xxx tree).
>>
parents 877d6685 fa59f178

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/lite5200b.dts

+19 −4
Original line number Diff line number Diff line
@@ -12,19 +12,34 @@ 


/include/ "mpc5200b.dtsi"



&gpt0 { fsl,has-wdt; };

&gpt2 { gpio-controller; };

&gpt3 { gpio-controller; };



/ {

	model = "fsl,lite5200b";

	compatible = "fsl,lite5200b";



	leds {

		compatible = "gpio-leds";

		tmr2 {

			gpios = <&gpt2 0 1>;

		};

		tmr3 {

			gpios = <&gpt3 0 1>;

			linux,default-trigger = "heartbeat";

		};

		led1 { gpios = <&gpio_wkup 2 1>; };

		led2 { gpios = <&gpio_simple 3 1>; };

		led3 { gpios = <&gpio_wkup 3 1>; };

		led4 { gpios = <&gpio_simple 2 1>; };

	};



	memory {

		reg = <0x00000000 0x10000000>;	// 256MB

	};



	soc5200@f0000000 {

		timer@600 {	// General Purpose Timer

			fsl,has-wdt;

		};



		psc@2000 {		// PSC1

			compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";

			cell-index = <0>;