From: Andrew Jeffery <andrew@aj.id.au>
To: linux-aspeed@lists.ozlabs.org
Subject: [PATCH 8/8] ARM: dts: aspeed: Clean up UART nodes
Date: Wed, 04 Oct 2017 15:58:51 +1030 [thread overview]
Message-ID: <1507094931.5452.20.camel@aj.id.au> (raw)
In-Reply-To: <20170928075149.8154-9-joel@jms.id.au>
On Thu, 2017-09-28 at 17:21 +0930, Joel Stanley wrote:
> - Shorten size of reg property so it covers only the implemented
> registers
>
> - Add VUART compatible
>
> - Move stray uart1 in g5 definition
>
> - Remove outdated current-speed property. Different bootloaders use
> different speeds, so this is no longer helpful
>
> Signed-off-by: Joel Stanley <joel@jms.id.au>
> ---
> arch/arm/boot/dts/aspeed-g4.dtsi | 17 +++++++++--------
> arch/arm/boot/dts/aspeed-g5.dtsi | 36 ++++++++++++++++++------------------
> 2 files changed, 27 insertions(+), 26 deletions(-)
>
> diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
> index 191c33d18122..7a4a53666d70 100644
> --- a/arch/arm/boot/dts/aspeed-g4.dtsi
> +++ b/arch/arm/boot/dts/aspeed-g4.dtsi
> @@ -27,6 +27,7 @@
> serial2 = &uart3;
> serial3 = &uart4;
> serial4 = &uart5;
> + serial5 = &vuart;
> };
>
> cpus {
> @@ -199,7 +200,7 @@
>
> uart1: serial at 1e783000 {
> compatible = "ns16550a";
> - reg = <0x1e783000 0x1000>;
> + reg = <0x1e783000 0x20>;
> reg-shift = <2>;
> interrupts = <9>;
> clocks = <&clk_uart>;
> @@ -209,7 +210,7 @@
>
> uart2: serial at 1e78d000 {
> compatible = "ns16550a";
> - reg = <0x1e78d000 0x1000>;
> + reg = <0x1e78d000 0x20>;
> reg-shift = <2>;
> interrupts = <32>;
> clocks = <&clk_uart>;
> @@ -219,7 +220,7 @@
>
> uart3: serial at 1e78e000 {
> compatible = "ns16550a";
> - reg = <0x1e78e000 0x1000>;
> + reg = <0x1e78e000 0x20>;
> reg-shift = <2>;
> interrupts = <33>;
> clocks = <&clk_uart>;
> @@ -229,7 +230,7 @@
>
> uart4: serial at 1e78f000 {
> compatible = "ns16550a";
> - reg = <0x1e78f000 0x1000>;
> + reg = <0x1e78f000 0x20>;
> reg-shift = <2>;
> interrupts = <34>;
> clocks = <&clk_uart>;
> @@ -239,7 +240,7 @@
>
> uart5: serial at 1e784000 {
> compatible = "ns16550a";
> - reg = <0x1e784000 0x1000>;
> + reg = <0x1e784000 0x20>;
> reg-shift = <2>;
> interrupts = <10>;
> clocks = <&clk_uart>;
> @@ -248,9 +249,9 @@
> status = "disabled";
> };
>
> - uart6: serial at 1e787000 {
> - compatible = "ns16550a";
> - reg = <0x1e787000 0x1000>;
> + vuart: vuart at 1e787000 {
Bit of a nit, but arguably this should be `vuart: serial at ...`?
> + compatible = "aspeed,ast2400-vuart";
> + reg = <0x1e787000 0x40>;
> reg-shift = <2>;
> interrupts = <10>;
> clocks = <&clk_uart>;
> diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
> index 251fc9f4637e..0b793305120a 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 {
> @@ -247,16 +248,6 @@
> status = "disabled";
> };
>
> - uart1: serial at 1e783000 {
> - compatible = "ns16550a";
> - reg = <0x1e783000 0x1000>;
> - reg-shift = <2>;
> - interrupts = <9>;
> - clocks = <&clk_uart>;
> - no-loopback-test;
> - status = "disabled";
> - };
> -
> lpc: lpc at 1e789000 {
> compatible = "aspeed,ast2500-lpc", "simple-mfd";
> reg = <0x1e789000 0x1000>;
> @@ -287,9 +278,19 @@
> };
> };
>
> + uart1: serial at 1e783000 {
Earlier in the series you had a patch moving the ADC node to be in
address-order with respect to the rest of the nodes but this change puts uart1
out of address-order. As it turns out the uarts blocks are sprayed around in
the address-space: uart1 and uart5 are together, the vuart is elsewhere, then
uarts 2-4 are lumped together in another spot. I think it makes sense to
consolidate them, but it is inconsistent. Thoughts?
> + compatible = "ns16550a";
> + reg = <0x1e783000 0x20>;
> + reg-shift = <2>;
> + interrupts = <9>;
> + clocks = <&clk_uart>;
> + no-loopback-test;
> + status = "disabled";
> + };
> +
> uart2: serial at 1e78d000 {
> compatible = "ns16550a";
> - reg = <0x1e78d000 0x1000>;
> + reg = <0x1e78d000 0x20>;
> reg-shift = <2>;
> interrupts = <32>;
> clocks = <&clk_uart>;
> @@ -299,7 +300,7 @@
>
> uart3: serial at 1e78e000 {
> compatible = "ns16550a";
> - reg = <0x1e78e000 0x1000>;
> + reg = <0x1e78e000 0x20>;
> reg-shift = <2>;
> interrupts = <33>;
> clocks = <&clk_uart>;
> @@ -309,7 +310,7 @@
>
> uart4: serial at 1e78f000 {
> compatible = "ns16550a";
> - reg = <0x1e78f000 0x1000>;
> + reg = <0x1e78f000 0x20>;
> reg-shift = <2>;
> interrupts = <34>;
> clocks = <&clk_uart>;
> @@ -319,18 +320,17 @@
>
> uart5: serial at 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";
> };
>
> - uart6: serial at 1e787000 {
> - compatible = "ns16550a";
> - reg = <0x1e787000 0x1000>;
> + vuart: vuart at 1e787000 {
See serial@ comment above.
Cheers,
Andrew
> + compatible = "aspeed,ast2500-vuart";
> + reg = <0x1e787000 0x40>;
> reg-shift = <2>;
> interrupts = <10>;
> clocks = <&clk_uart>;
-------------- 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/febfa80f/attachment.sig>
next prev parent reply other threads:[~2017-10-04 5:28 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
2017-09-28 7:51 ` [PATCH 8/8] ARM: dts: aspeed: Clean up UART nodes Joel Stanley
2017-10-04 5:28 ` Andrew Jeffery [this message]
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=1507094931.5452.20.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