Thread (26 messages) 26 messages, 3 authors, 2017-10-04

[PATCH 7/8] ARM: dts: aspeed: Add aliases for UARTs

From: Andrew Jeffery <hidden>
Date: 2017-10-04 05:13:30
Also in: linux-aspeed, linux-devicetree, lkml

On Thu, 2017-09-28 at 17:21 +0930, Joel Stanley wrote:
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.
?
Signed-off-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Andrew Jeffery <redacted>
quoted hunk ↗ jump to hunk
---
?arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 4 ----
?arch/arm/boot/dts/aspeed-g4.dtsi??????????????| 5 +++++
?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 f8611d5a6465..191c33d18122 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 de127370131d..251fc9f4637e 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 {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: This is a digitally signed message part
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20171004/3a522091/attachment-0001.sig>
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help