public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
The UniPhier on-chip UART driver was merged into the mainline by
commit 1a8d2903cb ("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: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Masahiro Yamada 2015-07-10 13:53:59 +09:00 • committed by Olof Johansson
parent 475c3eeff5
commit 1bf4250702
8 changed files with 230 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts
View file

@ -57,11 +57,14 @@
chosen { chosen {
bootargs = "console=ttyS0,115200"; bootargs = "console=ttyS0,115200";
stdout-path = &serialsc; stdout-path = &serial0;
}; };
aliases { aliases {
serial0 = &serialsc; serial0 = &serial0;
serial1 = &serial1;
serial2 = &serial2;
serial3 = &serial3;
}; };
}; };
@ -74,6 +77,18 @@
ranges = <0x00000000 1 0x03f00000 0x00100000>; ranges = <0x00000000 1 0x03f00000 0x00100000>;
}; };
&serialsc { &ethsc {
interrupts = <0 49 4>; interrupts = <0 49 4>;
}; };
&serial0 {
status = "okay";
};
&serial2 {
status = "okay";
};
&serial3 {
status = "okay";
};

42
arch/arm/boot/dts/uniphier-ph1-ld4.dtsi
View file

@ -64,6 +64,12 @@
compatible = "fixed-clock"; compatible = "fixed-clock";
clock-frequency = <50000000>; clock-frequency = <50000000>;
}; };
uart_clk: uart_clk {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <36864000>;
};
}; };
soc { soc {
@ -79,6 +85,42 @@
#size-cells = <1>; #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 { system-bus-controller-misc@59800000 {
compatible = "socionext,uniphier-system-bus-controller-misc", compatible = "socionext,uniphier-system-bus-controller-misc",
"syscon"; "syscon";

21
arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts
View file

@ -57,11 +57,14 @@
chosen { chosen {
bootargs = "console=ttyS0,115200"; bootargs = "console=ttyS0,115200";
stdout-path = &serialsc; stdout-path = &serial0;
}; };
aliases { aliases {
serial0 = &serialsc; serial0 = &serial0;
serial1 = &serial1;
serial2 = &serial2;
serial3 = &serial3;
}; };
}; };
@ -74,6 +77,18 @@
ranges = <0x00000000 1 0x03f00000 0x00100000>; ranges = <0x00000000 1 0x03f00000 0x00100000>;
}; };
&serialsc { &ethsc {
interrupts = <0 50 4>; interrupts = <0 50 4>;
}; };
&serial0 {
status = "okay";
};
&serial1 {
status = "okay";
};
&serial2 {
status = "okay";
};

42
arch/arm/boot/dts/uniphier-ph1-pro4.dtsi
View file

@ -71,6 +71,12 @@
compatible = "fixed-clock"; compatible = "fixed-clock";
clock-frequency = <50000000>; clock-frequency = <50000000>;
}; };
uart_clk: uart_clk {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <73728000>;
};
}; };
soc { soc {
@ -86,6 +92,42 @@
#size-cells = <1>; #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 { system-bus-controller-misc@59800000 {
compatible = "socionext,uniphier-system-bus-controller-misc", compatible = "socionext,uniphier-system-bus-controller-misc",
"syscon"; "syscon";

20
arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts
View file

@ -58,11 +58,13 @@
chosen { chosen {
bootargs = "console=ttyS0,115200"; bootargs = "console=ttyS0,115200";
stdout-path = &serialsc; stdout-path = &serial0;
}; };
aliases { aliases {
serial0 = &serialsc; serial0 = &serial0;
serial1 = &serial1;
serial2 = &serial2;
}; };
}; };
@ -75,6 +77,18 @@
ranges = <0x00000000 1 0x03f00000 0x00100000>; ranges = <0x00000000 1 0x03f00000 0x00100000>;
}; };
&serialsc { &ethsc {
interrupts = <0 49 4>; interrupts = <0 49 4>;
}; };
&serial0 {
status = "okay";
};
&serial1 {
status = "okay";
};
&serial2 {
status = "okay";
};

33
arch/arm/boot/dts/uniphier-ph1-sld3.dtsi
View file

@ -71,6 +71,12 @@
compatible = "fixed-clock"; compatible = "fixed-clock";
clock-frequency = <50000000>; clock-frequency = <50000000>;
}; };
uart_clk: uart_clk {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <36864000>;
};
}; };
soc { soc {
@ -108,6 +114,33 @@
<0x20000100 0x100>; <0x20000100 0x100>;
}; };
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>;
};
system-bus-controller-misc@59800000 { system-bus-controller-misc@59800000 {
compatible = "socionext,uniphier-system-bus-controller-misc", compatible = "socionext,uniphier-system-bus-controller-misc",
"syscon"; "syscon";

21
arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts
View file

@ -57,11 +57,14 @@
chosen { chosen {
bootargs = "console=ttyS0,115200"; bootargs = "console=ttyS0,115200";
stdout-path = &serialsc; stdout-path = &serial0;
}; };
aliases { aliases {
serial0 = &serialsc; serial0 = &serial0;
serial1 = &serial1;
serial2 = &serial2;
serial3 = &serial3;
}; };
}; };
@ -74,6 +77,18 @@
ranges = <0x00000000 1 0x03f00000 0x00100000>; ranges = <0x00000000 1 0x03f00000 0x00100000>;
}; };
&serialsc { &ethsc {
interrupts = <0 48 4>; interrupts = <0 48 4>;
}; };
&serial0 {
status = "okay";
};
&serial2 {
status = "okay";
};
&serial3 {
status = "okay";
};

42
arch/arm/boot/dts/uniphier-ph1-sld8.dtsi
View file

@ -64,6 +64,12 @@
compatible = "fixed-clock"; compatible = "fixed-clock";
clock-frequency = <50000000>; clock-frequency = <50000000>;
}; };
uart_clk: uart_clk {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <80000000>;
};
}; };
soc { soc {
@ -79,6 +85,42 @@
#size-cells = <1>; #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 { system-bus-controller-misc@59800000 {
compatible = "socionext,uniphier-system-bus-controller-misc", compatible = "socionext,uniphier-system-bus-controller-misc",
"syscon"; "syscon";