From: Joel Stanley <joel@jms.id.au>
To: Joel Stanley <joel@jms.id.au>, Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>
Cc: "Russell King" <linux@armlinux.org.uk>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, "Andrew Jeffery" <andrew@aj.id.au>,
"Rick Altherr" <raltherr@google.com>,
"Brendan Higgins" <brendanhiggins@google.com>,
"Cédric Le Goater" <clg@kaod.org>,
linux-aspeed@lists.ozlabs.org
Subject: [PATCH v2 7/9] ARM: dts: aspeed: Add aliases for UARTs
Date: Wed, 4 Oct 2017 17:19:15 +1030 [thread overview]
Message-ID: <20171004064917.2498-8-joel@jms.id.au> (raw)
In-Reply-To: <20171004064917.2498-1-joel@jms.id.au>
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>
---
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 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 {
--
2.14.1
WARNING: multiple messages have this Message-ID (diff)
From: joel@jms.id.au (Joel Stanley)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 7/9] ARM: dts: aspeed: Add aliases for UARTs
Date: Wed, 4 Oct 2017 17:19:15 +1030 [thread overview]
Message-ID: <20171004064917.2498-8-joel@jms.id.au> (raw)
In-Reply-To: <20171004064917.2498-1-joel@jms.id.au>
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>
---
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 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 {
--
2.14.1
next prev parent reply other threads:[~2017-10-04 6:50 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-04 6:49 [PATCH v2 0/9] ARM: dts: aspeed: Device tree updates Joel Stanley
2017-10-04 6:49 ` Joel Stanley
2017-10-04 6:49 ` Joel Stanley
2017-10-04 6:49 ` [PATCH v2 1/9] ARM: dts: aspeed: Move pinctrl subnodes to improve readability Joel Stanley
2017-10-04 6:49 ` Joel Stanley
2017-10-04 6:49 ` [PATCH v2 2/9] ARM: dts: aspeed: Reorder ADC node Joel Stanley
2017-10-04 6:49 ` Joel Stanley
2017-10-04 23:31 ` Andrew Jeffery
2017-10-04 23:31 ` Andrew Jeffery
2017-10-04 6:49 ` [PATCH v2 3/9] ARM: dts: aspeed: Add I2C buses Joel Stanley
2017-10-04 6:49 ` Joel Stanley
2017-10-04 6:49 ` [PATCH v2 4/9] ARM: dts: aspeed-romulus: Add I2C devices Joel Stanley
2017-10-04 6:49 ` Joel Stanley
2017-10-04 23:35 ` Andrew Jeffery
2017-10-04 23:35 ` Andrew Jeffery
2017-10-04 23:35 ` Andrew Jeffery
2017-10-04 6:49 ` [PATCH v2 5/9] ARM: dts: aspeed-palmetto: " Joel Stanley
2017-10-04 6:49 ` Joel Stanley
2017-10-04 6:49 ` [PATCH v2 6/9] ARM: dts: aspeed-ast2500: " Joel Stanley
2017-10-04 6:49 ` Joel Stanley
2017-10-04 6:49 ` Joel Stanley
2017-10-04 6:49 ` Joel Stanley [this message]
2017-10-04 6:49 ` [PATCH v2 7/9] ARM: dts: aspeed: Add aliases for UARTs Joel Stanley
2017-10-04 6:49 ` [PATCH v2 8/9] ARM: dts: aspeed: Correctly order UART nodes Joel Stanley
2017-10-04 6:49 ` Joel Stanley
2017-10-04 6:49 ` Joel Stanley
2017-10-04 23:37 ` Andrew Jeffery
2017-10-04 23:37 ` Andrew Jeffery
2017-10-04 23:37 ` Andrew Jeffery
2017-10-04 6:49 ` [PATCH v2 9/9] ARM: dts: aspeed: Clean up " Joel Stanley
2017-10-04 6:49 ` Joel Stanley
2017-10-04 6:52 ` Joel Stanley
2017-10-04 6:52 ` Joel Stanley
2017-10-04 6:52 ` Joel Stanley
2017-10-04 23:39 ` Andrew Jeffery
2017-10-04 23:39 ` Andrew Jeffery
2017-10-04 23:39 ` Andrew Jeffery
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171004064917.2498-8-joel@jms.id.au \
--to=joel@jms.id.au \
--cc=andrew@aj.id.au \
--cc=brendanhiggins@google.com \
--cc=clg@kaod.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mark.rutland@arm.com \
--cc=raltherr@google.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.