Commit db4d6d9d authored by Joel Stanley's avatar Joel Stanley

ARM: dts: aspeed: Correctly order UART nodes

Order them all by address.
Reviewed-by: default avatarAndrew Jeffery <andrew@aj.id.au>
Signed-off-by: default avatarJoel Stanley <joel@jms.id.au>
parent 0bae3904
...@@ -183,6 +183,27 @@ timer: timer@1e782000 { ...@@ -183,6 +183,27 @@ timer: timer@1e782000 {
clock-names = "PCLK"; 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 { wdt1: wdt@1e785000 {
compatible = "aspeed,ast2400-wdt"; compatible = "aspeed,ast2400-wdt";
reg = <0x1e785000 0x1c>; reg = <0x1e785000 0x1c>;
...@@ -197,11 +218,11 @@ wdt2: wdt@1e785020 { ...@@ -197,11 +218,11 @@ wdt2: wdt@1e785020 {
status = "disabled"; status = "disabled";
}; };
uart1: serial@1e783000 { uart6: serial@1e787000 {
compatible = "ns16550a"; compatible = "ns16550a";
reg = <0x1e783000 0x1000>; reg = <0x1e787000 0x1000>;
reg-shift = <2>; reg-shift = <2>;
interrupts = <9>; interrupts = <10>;
clocks = <&clk_uart>; clocks = <&clk_uart>;
no-loopback-test; no-loopback-test;
status = "disabled"; status = "disabled";
...@@ -237,27 +258,6 @@ uart4: serial@1e78f000 { ...@@ -237,27 +258,6 @@ uart4: serial@1e78f000 {
status = "disabled"; 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 { i2c: i2c@1e78a000 {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
......
...@@ -227,6 +227,26 @@ timer: timer@1e782000 { ...@@ -227,6 +227,26 @@ timer: timer@1e782000 {
clock-names = "PCLK"; 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 { wdt1: wdt@1e785000 {
compatible = "aspeed,ast2500-wdt"; compatible = "aspeed,ast2500-wdt";
...@@ -247,16 +267,6 @@ wdt3: wdt@1e785040 { ...@@ -247,16 +267,6 @@ wdt3: wdt@1e785040 {
status = "disabled"; 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 { lpc: lpc@1e789000 {
compatible = "aspeed,ast2500-lpc", "simple-mfd"; compatible = "aspeed,ast2500-lpc", "simple-mfd";
reg = <0x1e789000 0x1000>; reg = <0x1e789000 0x1000>;
...@@ -287,6 +297,16 @@ lhc: lhc@20 { ...@@ -287,6 +297,16 @@ lhc: lhc@20 {
}; };
}; };
uart6: serial@1e787000 {
compatible = "ns16550a";
reg = <0x1e787000 0x1000>;
reg-shift = <2>;
interrupts = <10>;
clocks = <&clk_uart>;
no-loopback-test;
status = "disabled";
};
uart2: serial@1e78d000 { uart2: serial@1e78d000 {
compatible = "ns16550a"; compatible = "ns16550a";
reg = <0x1e78d000 0x1000>; reg = <0x1e78d000 0x1000>;
...@@ -317,27 +337,6 @@ uart4: serial@1e78f000 { ...@@ -317,27 +337,6 @@ uart4: serial@1e78f000 {
status = "disabled"; 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 { i2c: i2c@1e78a000 {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment