Commit 1bf42507 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Olof Johansson
Browse files

ARM: dts: UniPhier: add on-chip UART device nodes 



The UniPhier on-chip UART driver was merged into the mainline by
commit 1a8d2903 ("serial: 8250_uniphier: add UniPhier serial
driver").

Add device nodes to make it really available.

We no longer have to depend on the on-board UART device (16550A),
so let's change the chosen and aliases to point to the on-chip ones.
Also, turn on the on-board Ethernet device.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 475c3eef

arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts

+18 −3
Original line number Diff line number Diff line
@@ -57,11 +57,14 @@ 


	chosen {

		bootargs = "console=ttyS0,115200";

		stdout-path = &serialsc;

		stdout-path = &serial0;

	};



	aliases {

		serial0 = &serialsc;

		serial0 = &serial0;

		serial1 = &serial1;

		serial2 = &serial2;

		serial3 = &serial3;

	};

};
@@ -74,6 +77,18 @@ 
	ranges = <0x00000000 1 0x03f00000 0x00100000>;

};



&serialsc {

&ethsc {

	interrupts = <0 49 4>;

};



&serial0 {

	status = "okay";

};



&serial2 {

	status = "okay";

};



&serial3 {

	status = "okay";

};

arch/arm/boot/dts/uniphier-ph1-ld4.dtsi

+42 −0
Original line number Diff line number Diff line
@@ -64,6 +64,12 @@ 
			compatible = "fixed-clock";

			clock-frequency = <50000000>;

		};



		uart_clk: uart_clk {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <36864000>;

		};

	};



	soc {
@@ -79,6 +85,42 @@ 
			#size-cells = <1>;

		};



		serial0: serial@54006800 {

			compatible = "socionext,uniphier-uart";

			status = "disabled";

			reg = <0x54006800 0x40>;

			interrupts = <0 33 4>;

			clocks = <&uart_clk>;

			fifo-size = <64>;

		};



		serial1: serial@54006900 {

			compatible = "socionext,uniphier-uart";

			status = "disabled";

			reg = <0x54006900 0x40>;

			interrupts = <0 35 4>;

			clocks = <&uart_clk>;

			fifo-size = <64>;

		};



		serial2: serial@54006a00 {

			compatible = "socionext,uniphier-uart";

			status = "disabled";

			reg = <0x54006a00 0x40>;

			interrupts = <0 37 4>;

			clocks = <&uart_clk>;

			fifo-size = <64>;

		};



		serial3: serial@54006b00 {

			compatible = "socionext,uniphier-uart";

			status = "disabled";

			reg = <0x54006b00 0x40>;

			interrupts = <0 29 4>;

			clocks = <&uart_clk>;

			fifo-size = <64>;

		};



		system-bus-controller-misc@59800000 {

			compatible = "socionext,uniphier-system-bus-controller-misc",

				     "syscon";

arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts

+18 −3
Original line number Diff line number Diff line
@@ -57,11 +57,14 @@ 


	chosen {

		bootargs = "console=ttyS0,115200";

		stdout-path = &serialsc;

		stdout-path = &serial0;

	};



	aliases {

		serial0 = &serialsc;

		serial0 = &serial0;

		serial1 = &serial1;

		serial2 = &serial2;

		serial3 = &serial3;

	};

};
@@ -74,6 +77,18 @@ 
	ranges = <0x00000000 1 0x03f00000 0x00100000>;

};



&serialsc {

&ethsc {

	interrupts = <0 50 4>;

};



&serial0 {

	status = "okay";

};



&serial1 {

	status = "okay";

};



&serial2 {

	status = "okay";

};

arch/arm/boot/dts/uniphier-ph1-pro4.dtsi

+42 −0
Original line number Diff line number Diff line
@@ -71,6 +71,12 @@ 
			compatible = "fixed-clock";

			clock-frequency = <50000000>;

		};



		uart_clk: uart_clk {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <73728000>;

		};

	};



	soc {
@@ -86,6 +92,42 @@ 
			#size-cells = <1>;

		};



		serial0: serial@54006800 {

			compatible = "socionext,uniphier-uart";

			status = "disabled";

			reg = <0x54006800 0x40>;

			interrupts = <0 33 4>;

			clocks = <&uart_clk>;

			fifo-size = <64>;

		};



		serial1: serial@54006900 {

			compatible = "socionext,uniphier-uart";

			status = "disabled";

			reg = <0x54006900 0x40>;

			interrupts = <0 35 4>;

			clocks = <&uart_clk>;

			fifo-size = <64>;

		};



		serial2: serial@54006a00 {

			compatible = "socionext,uniphier-uart";

			status = "disabled";

			reg = <0x54006a00 0x40>;

			interrupts = <0 37 4>;

			clocks = <&uart_clk>;

			fifo-size = <64>;

		};



		serial3: serial@54006b00 {

			compatible = "socionext,uniphier-uart";

			status = "disabled";

			reg = <0x54006b00 0x40>;

			interrupts = <0 29 4>;

			clocks = <&uart_clk>;

			fifo-size = <64>;

		};



		system-bus-controller-misc@59800000 {

			compatible = "socionext,uniphier-system-bus-controller-misc",

				     "syscon";

arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts

+17 −3
Original line number Diff line number Diff line
@@ -58,11 +58,13 @@ 


	chosen {

		bootargs = "console=ttyS0,115200";

		stdout-path = &serialsc;

		stdout-path = &serial0;

	};



	aliases {

		serial0 = &serialsc;

		serial0 = &serial0;

		serial1 = &serial1;

		serial2 = &serial2;

	};

};
@@ -75,6 +77,18 @@ 
	ranges = <0x00000000 1 0x03f00000 0x00100000>;

};



&serialsc {

&ethsc {

	interrupts = <0 49 4>;

};



&serial0 {

	status = "okay";

};



&serial1 {

	status = "okay";

};



&serial2 {

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE