lkml.org 
[lkml]   [2017]   [Oct]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH v2 8/9] ARM: dts: aspeed: Correctly order UART nodes
From
Date
On Wed, 2017-10-04 at 17:19 +1030, Joel Stanley wrote:
> Order them all by address.
>
> Signed-off-by: Joel Stanley <joel@jms.id.au>

Reviewed-by: Andrew Jeffery <andrew@aj.id.au>

> ---
>  arch/arm/boot/dts/aspeed-g4.dtsi | 48 +++++++++++++++---------------
> -
>  arch/arm/boot/dts/aspeed-g5.dtsi | 61 ++++++++++++++++++++--------
> ------------
>  2 files changed, 54 insertions(+), 55 deletions(-)
>
> diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi
> b/arch/arm/boot/dts/aspeed-g4.dtsi
> index a549413bda3f..4125e07f22f9 100644
> --- a/arch/arm/boot/dts/aspeed-g4.dtsi
> +++ b/arch/arm/boot/dts/aspeed-g4.dtsi
> @@ -183,6 +183,27 @@
>   clock-names = "PCLK";
>   };
>  
> + uart1: serial@1e783000 {
> + compatible = "ns16550a";
> + reg = <0x1e783000 0x1000>;
> + reg-shift = <2>;
> + interrupts = <9>;
> + clocks = <&clk_uart>;
> + no-loopback-test;
> + status = "disabled";
> + };
> +
> + uart5: serial@1e784000 {
> + compatible = "ns16550a";
> + reg = <0x1e784000 0x1000>;
> + reg-shift = <2>;
> + interrupts = <10>;
> + clocks = <&clk_uart>;
> + current-speed = <38400>;
> + no-loopback-test;
> + status = "disabled";
> + };
> +
>   wdt1: wdt@1e785000 {
>   compatible = "aspeed,ast2400-wdt";
>   reg = <0x1e785000 0x1c>;
> @@ -197,11 +218,11 @@
>   status = "disabled";
>   };
>  
> - uart1: serial@1e783000 {
> + uart6: serial@1e787000 {
>   compatible = "ns16550a";
> - reg = <0x1e783000 0x1000>;
> + reg = <0x1e787000 0x1000>;
>   reg-shift = <2>;
> - interrupts = <9>;
> + interrupts = <10>;
>   clocks = <&clk_uart>;
>   no-loopback-test;
>   status = "disabled";
> @@ -237,27 +258,6 @@
>   status = "disabled";
>   };
>  
> - uart5: serial@1e784000 {
> - compatible = "ns16550a";
> - reg = <0x1e784000 0x1000>;
> - reg-shift = <2>;
> - interrupts = <10>;
> - clocks = <&clk_uart>;
> - current-speed = <38400>;
> - no-loopback-test;
> - status = "disabled";
> - };
> -
> - uart6: serial@1e787000 {
> - compatible = "ns16550a";
> - reg = <0x1e787000 0x1000>;
> - reg-shift = <2>;
> - interrupts = <10>;
> - clocks = <&clk_uart>;
> - no-loopback-test;
> - status = "disabled";
> - };
> -
>   i2c: i2c@1e78a000 {
>   compatible = "simple-bus";
>   #address-cells = <1>;
> diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi
> b/arch/arm/boot/dts/aspeed-g5.dtsi
> index de2dafa71651..61cc2d25143a 100644
> --- a/arch/arm/boot/dts/aspeed-g5.dtsi
> +++ b/arch/arm/boot/dts/aspeed-g5.dtsi
> @@ -227,6 +227,26 @@
>   clock-names = "PCLK";
>   };
>  
> + uart1: serial@1e783000 {
> + compatible = "ns16550a";
> + reg = <0x1e783000 0x1000>;
> + reg-shift = <2>;
> + interrupts = <9>;
> + clocks = <&clk_uart>;
> + no-loopback-test;
> + status = "disabled";
> + };
> +
> + uart5: serial@1e784000 {
> + compatible = "ns16550a";
> + reg = <0x1e784000 0x1000>;
> + reg-shift = <2>;
> + interrupts = <10>;
> + clocks = <&clk_uart>;
> + current-speed = <38400>;
> + no-loopback-test;
> + status = "disabled";
> + };
>  
>   wdt1: wdt@1e785000 {
>   compatible = "aspeed,ast2500-wdt";
> @@ -247,16 +267,6 @@
>   status = "disabled";
>   };
>  
> - uart1: serial@1e783000 {
> - compatible = "ns16550a";
> - reg = <0x1e783000 0x1000>;
> - reg-shift = <2>;
> - interrupts = <9>;
> - clocks = <&clk_uart>;
> - no-loopback-test;
> - status = "disabled";
> - };
> -
>   lpc: lpc@1e789000 {
>   compatible = "aspeed,ast2500-lpc",
> "simple-mfd";
>   reg = <0x1e789000 0x1000>;
> @@ -287,6 +297,16 @@
>   };
>   };
>  
> + uart6: serial@1e787000 {
> + compatible = "ns16550a";
> + reg = <0x1e787000 0x1000>;
> + reg-shift = <2>;
> + interrupts = <10>;
> + clocks = <&clk_uart>;
> + no-loopback-test;
> + status = "disabled";
> + };
> +
>   uart2: serial@1e78d000 {
>   compatible = "ns16550a";
>   reg = <0x1e78d000 0x1000>;
> @@ -317,27 +337,6 @@
>   status = "disabled";
>   };
>  
> - uart5: serial@1e784000 {
> - compatible = "ns16550a";
> - reg = <0x1e784000 0x1000>;
> - reg-shift = <2>;
> - interrupts = <10>;
> - clocks = <&clk_uart>;
> - current-speed = <38400>;
> - no-loopback-test;
> - status = "disabled";
> - };
> -
> - uart6: serial@1e787000 {
> - compatible = "ns16550a";
> - reg = <0x1e787000 0x1000>;
> - reg-shift = <2>;
> - interrupts = <10>;
> - clocks = <&clk_uart>;
> - no-loopback-test;
> - status = "disabled";
> - };
> -
>   i2c: i2c@1e78a000 {
>   compatible = "simple-bus";
>   #address-cells = <1>;[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2017-10-05 01:38    [W:0.157 / U:0.316 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site