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

Commit 0c456cfa authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: imx: rename uart and fec device tree nodes 



It has been pointed out by device tree maintainer for several times
that the generic names 'serial' and 'ethernet' should be used for
those devices per ePAPR.  Renames imx uart and fec device tree nodes
to stop them being bad examples.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 4592a965

Documentation/devicetree/bindings/net/fsl-fec.txt

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ Optional properties: 


Example:



fec@83fec000 {

ethernet@83fec000 {

	compatible = "fsl,imx51-fec", "fsl,imx27-fec";

	reg = <0x83fec000 0x4000>;

	interrupts = <87>;

Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ Optional properties: 


Example:



uart@73fbc000 {

serial@73fbc000 {

	compatible = "fsl,imx51-uart", "fsl,imx21-uart";

	reg = <0x73fbc000 0x4000>;

	interrupts = <31>;

arch/arm/boot/dts/imx27-phytec-phycore.dts

+4 −4
Original line number Diff line number Diff line
@@ -27,22 +27,22 @@ 
				status = "okay";

			};



			uart@1000a000 {

			serial@1000a000 {

				fsl,uart-has-rtscts;

				status = "okay";

			};



			uart@1000b000 {

			serial@1000b000 {

				fsl,uart-has-rtscts;

				status = "okay";

			};



			uart@1000c000 {

			serial@1000c000 {

				fsl,uart-has-rtscts;

				status = "okay";

			};



			fec@1002b000 {

			ethernet@1002b000 {

				status = "okay";

			};

arch/arm/boot/dts/imx27.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -59,28 +59,28 @@ 
				status = "disabled";

			};



			uart1: uart@1000a000 {

			uart1: serial@1000a000 {

				compatible = "fsl,imx27-uart", "fsl,imx21-uart";

				reg = <0x1000a000 0x1000>;

				interrupts = <20>;

				status = "disabled";

			};



			uart2: uart@1000b000 {

			uart2: serial@1000b000 {

				compatible = "fsl,imx27-uart", "fsl,imx21-uart";

				reg = <0x1000b000 0x1000>;

				interrupts = <19>;

				status = "disabled";

			};



			uart3: uart@1000c000 {

			uart3: serial@1000c000 {

				compatible = "fsl,imx27-uart", "fsl,imx21-uart";

				reg = <0x1000c000 0x1000>;

				interrupts = <18>;

				status = "disabled";

			};



			uart4: uart@1000d000 {

			uart4: serial@1000d000 {

				compatible = "fsl,imx27-uart", "fsl,imx21-uart";

				reg = <0x1000d000 0x1000>;

				interrupts = <17>;
@@ -183,14 +183,14 @@ 
				status = "disabled";

			};



			uart5: uart@1001b000 {

			uart5: serial@1001b000 {

				compatible = "fsl,imx27-uart", "fsl,imx21-uart";

				reg = <0x1001b000 0x1000>;

				interrupts = <49>;

				status = "disabled";

			};



			uart6: uart@1001c000 {

			uart6: serial@1001c000 {

				compatible = "fsl,imx27-uart", "fsl,imx21-uart";

				reg = <0x1001c000 0x1000>;

				interrupts = <48>;
@@ -206,7 +206,7 @@ 
				status = "disabled";

			};



			fec: fec@1002b000 {

			fec: ethernet@1002b000 {

				compatible = "fsl,imx27-fec";

				reg = <0x1002b000 0x4000>;

				interrupts = <50>;

arch/arm/boot/dts/imx51-babbage.dts

+4 −4
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
					status = "okay";

				};



				uart3: uart@7000c000 {

				uart3: serial@7000c000 {

					fsl,uart-has-rtscts;

					status = "okay";

				};
@@ -173,12 +173,12 @@ 
				reg = <0x73fa8000 0x4000>;

			};



			uart1: uart@73fbc000 {

			uart1: serial@73fbc000 {

				fsl,uart-has-rtscts;

				status = "okay";

			};



			uart2: uart@73fc0000 {

			uart2: serial@73fc0000 {

				status = "okay";

			};

		};
@@ -197,7 +197,7 @@ 
				};

			};



			fec@83fec000 {

			ethernet@83fec000 {

				phy-mode = "mii";

				status = "okay";

			};