diff options
| author |   Joel Stanley <joel@jms.id.au> | 2017-10-04 17:19:17 +1030 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2017-10-05 16:30:12 +1030 |
| commit | a19331ca517764d30eb9b6e84561b7142abc3e09 (patch) | |
| tree | 104cd26a515a7cdae3d3c5941c66feb7dadb065a /arch/arm/boot/dts/aspeed-g5.dtsi | |
| parent | ARM: dts: aspeed: Correctly order UART nodes (diff) | |
| download | linux-dev-a19331ca517764d30eb9b6e84561b7142abc3e09.tar.xz linux-dev-a19331ca517764d30eb9b6e84561b7142abc3e09.zip | |
ARM: dts: aspeed: Clean up UART nodes
- Shorten size of reg property so it covers only the implemented
registers
- Add VUART compatible, and change node name to serial@
- Remove outdated current-speed property. Different bootloaders use
different speeds, so this is no longer helpful
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'arch/arm/boot/dts/aspeed-g5.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/aspeed-g5.dtsi | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index 61cc2d25143a..77dded187d5a 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -27,6 +27,7 @@ serial2 = &uart3; serial3 = &uart4; serial4 = &uart5; + serial5 = &vuart; }; cpus { @@ -229,7 +230,7 @@ uart1: serial@1e783000 { compatible = "ns16550a"; - reg = <0x1e783000 0x1000>; + reg = <0x1e783000 0x20>; reg-shift = <2>; interrupts = <9>; clocks = <&clk_uart>; @@ -239,11 +240,10 @@ uart5: serial@1e784000 { compatible = "ns16550a"; - reg = <0x1e784000 0x1000>; + reg = <0x1e784000 0x20>; reg-shift = <2>; interrupts = <10>; clocks = <&clk_uart>; - current-speed = <38400>; no-loopback-test; status = "disabled"; }; @@ -297,9 +297,9 @@ }; }; - uart6: serial@1e787000 { - compatible = "ns16550a"; - reg = <0x1e787000 0x1000>; + vuart: serial@1e787000 { + compatible = "aspeed,ast2500-vuart"; + reg = <0x1e787000 0x40>; reg-shift = <2>; interrupts = <10>; clocks = <&clk_uart>; @@ -309,7 +309,7 @@ uart2: serial@1e78d000 { compatible = "ns16550a"; - reg = <0x1e78d000 0x1000>; + reg = <0x1e78d000 0x20>; reg-shift = <2>; interrupts = <32>; clocks = <&clk_uart>; @@ -319,7 +319,7 @@ uart3: serial@1e78e000 { compatible = "ns16550a"; - reg = <0x1e78e000 0x1000>; + reg = <0x1e78e000 0x20>; reg-shift = <2>; interrupts = <33>; clocks = <&clk_uart>; @@ -329,7 +329,7 @@ uart4: serial@1e78f000 { compatible = "ns16550a"; - reg = <0x1e78f000 0x1000>; + reg = <0x1e78f000 0x20>; reg-shift = <2>; interrupts = <34>; clocks = <&clk_uart>; |