diff options
| author | Joel Stanley <joel@jms.id.au> | 2017-10-04 08:49:15 +0200 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2017-10-05 06:36:30 +0200 |
| commit | 0bae3904144ddc99a902741467d02e2d950c8a63 (patch) | |
| tree | 85af667aa29f20d52ac811ac34c1788fe670cea1 /arch/arm/boot | |
| parent | ARM: dts: aspeed-ast2500: Add I2C devices (diff) | |
| download | linux-0bae3904144ddc99a902741467d02e2d950c8a63.tar.xz linux-0bae3904144ddc99a902741467d02e2d950c8a63.zip | |
ARM: dts: aspeed: Add aliases for UARTs
Existing userspace expects the console (UART5) to be at /dev/ttyS4. To
ensure the UARTs show up where users expect them, we give them fixed
aliases starting at 0.
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/aspeed-g4.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/aspeed-g5.dtsi | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts index e387c80b7f4f..be51be5a5f39 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts @@ -6,10 +6,6 @@ model = "Palmetto BMC"; compatible = "tyan,palmetto-bmc", "aspeed,ast2400"; - aliases { - serial4 = &uart5; - }; - chosen { stdout-path = &uart5; bootargs = "console=ttyS4,115200 earlyprintk"; diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index b6ae7b62fd03..a549413bda3f 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -22,6 +22,11 @@ i2c11 = &i2c11; i2c12 = &i2c12; i2c13 = &i2c13; + serial0 = &uart1; + serial1 = &uart2; + serial2 = &uart3; + serial3 = &uart4; + serial4 = &uart5; }; cpus { diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index 4c829e915c3e..de2dafa71651 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -22,6 +22,11 @@ i2c11 = &i2c11; i2c12 = &i2c12; i2c13 = &i2c13; + serial0 = &uart1; + serial1 = &uart2; + serial2 = &uart3; + serial3 = &uart4; + serial4 = &uart5; }; cpus { |