Re: [PATCH v2 8/9] ARM: dts: aspeed: Correctly order UART nodes

[Andrew Jeffery]

On Wed, 2017-10-04 at 17:19 +1030, Joel Stanley wrote:
> Order them all by address.
> 
> Signed-off-by: Joel Stanley <joel@xxxxxxxxx>

Reviewed-by: Andrew Jeffery <andrew@xxxxxxxx>

> ---
> Â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>;

Attachment: signature.asc
Description: This is a digitally signed message part