From: Andrew Jeffery <andrew@aj.id.au>
To: linux-aspeed@lists.ozlabs.org
Subject: [PATCH 7/8] ARM: dts: aspeed: Add aliases for UARTs
Date: Wed, 04 Oct 2017 15:43:19 +1030 [thread overview]
Message-ID: <1507093999.5452.16.camel@aj.id.au> (raw)
In-Reply-To: <20170928075149.8154-8-joel@jms.id.au>
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 <andrew@aj.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 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.ozlabs.org/pipermail/linux-aspeed/attachments/20171004/3a522091/attachment.sig>
next prev parent reply other threads:[~2017-10-04 5:13 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-28 7:51 [PATCH 0/8] ARM: dts: aspeed: Device tree updates Joel Stanley
2017-09-28 7:51 ` [PATCH 1/8] ARM: dts: aspeed: Move pinctrl subnodes to improve readability Joel Stanley
2017-10-04 3:30 ` Andrew Jeffery
2017-09-28 7:51 ` [PATCH 2/8] ARM: dts: aspeed: Reorder ADC node Joel Stanley
2017-10-04 3:35 ` Andrew Jeffery
2017-10-04 5:13 ` Joel Stanley
2017-10-04 5:21 ` Andrew Jeffery
2017-09-28 7:51 ` [PATCH 3/8] ARM: dts: aspeed: Add I2C buses Joel Stanley
2017-09-28 18:35 ` Brendan Higgins
2017-10-04 4:36 ` Andrew Jeffery
2017-10-04 4:41 ` Andrew Jeffery
2017-09-28 7:51 ` [PATCH 4/8] ARM: dts: aspeed-romulus: Add I2C devices Joel Stanley
2017-09-28 18:36 ` Brendan Higgins
2017-10-04 5:02 ` Andrew Jeffery
2017-10-04 5:24 ` Joel Stanley
2017-09-28 7:51 ` [PATCH 5/8] ARM: dts: aspeed-palmetto: " Joel Stanley
2017-09-28 18:36 ` Brendan Higgins
2017-10-04 5:08 ` Andrew Jeffery
2017-09-28 7:51 ` [PATCH 6/8] ARM: dts: aspeed-ast2500: " Joel Stanley
2017-09-28 18:37 ` Brendan Higgins
2017-10-04 5:12 ` Andrew Jeffery
2017-09-28 7:51 ` [PATCH 7/8] ARM: dts: aspeed: Add aliases for UARTs Joel Stanley
2017-10-04 5:13 ` Andrew Jeffery [this message]
2017-09-28 7:51 ` [PATCH 8/8] ARM: dts: aspeed: Clean up UART nodes Joel Stanley
2017-10-04 5:28 ` Andrew Jeffery
2017-10-04 6:00 ` Joel Stanley
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=1507093999.5452.16.camel@aj.id.au \
--to=andrew@aj.id.au \
--cc=linux-aspeed@lists.ozlabs.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox