ARM: dts: aspeed: everest: Move common devices up

Other systems have the SoC devices listed before the FSI description.
Move them up in order to make them similar.

Link: https://lore.kernel.org/r/20230809074921.116987-6-joel@jms.id.au
Signed-off-by: Joel Stanley <joel@jms.id.au>

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
index 632e4219a853a32498b182f751f5047247fdc787..1f59ab28d29b06ba8a041f0326e35948843c3aae 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
@@ -2431,6 +2431,76 @@
        clk-phase-mmc-hs200 = <210>, <228>;
 };
 
+&ibt {
+       status = "okay";
+};
+
+&uart2 {
+       status = "okay";
+};
+
+&vuart1 {
+       status = "okay";
+};
+
+&vuart2 {
+       status = "okay";
+};
+
+&lpc_ctrl {
+       status = "okay";
+       memory-region = <&flash_memory>;
+};
+
+&mac2 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_rmii3_default>;
+       clocks = <&syscon ASPEED_CLK_GATE_MAC3CLK>,
+                <&syscon ASPEED_CLK_MAC3RCLK>;
+       clock-names = "MACCLK", "RCLK";
+       use-ncsi;
+};
+
+&mac3 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_rmii4_default>;
+       clocks = <&syscon ASPEED_CLK_GATE_MAC4CLK>,
+                <&syscon ASPEED_CLK_MAC4RCLK>;
+       clock-names = "MACCLK", "RCLK";
+       use-ncsi;
+};
+
+&wdt1 {
+       aspeed,reset-type = "none";
+       aspeed,external-signal;
+       aspeed,ext-push-pull;
+       aspeed,ext-active-high;
+
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_wdtrst1_default>;
+};
+
+&wdt2 {
+       status = "okay";
+};
+
+&xdma {
+       status = "okay";
+       memory-region = <&vga_memory>;
+};
+
+&kcs2 {
+       status = "okay";
+       aspeed,lpc-io-reg = <0xca8 0xcac>;
+};
+
+&kcs3 {
+       status = "okay";
+       aspeed,lpc-io-reg = <0xca2>;
+       aspeed,lpc-interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
+};
 
 #include "ibm-power10-quad.dtsi"
 
@@ -3944,74 +4014,3 @@
 &fsi_occ7 {
        reg = <8>;
 };
-
-&ibt {
-       status = "okay";
-};
-
-&uart2 {
-       status = "okay";
-};
-
-&vuart1 {
-       status = "okay";
-};
-
-&vuart2 {
-       status = "okay";
-};
-
-&lpc_ctrl {
-       status = "okay";
-       memory-region = <&flash_memory>;
-};
-
-&mac2 {
-       status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_rmii3_default>;
-       clocks = <&syscon ASPEED_CLK_GATE_MAC3CLK>,
-                <&syscon ASPEED_CLK_MAC3RCLK>;
-       clock-names = "MACCLK", "RCLK";
-       use-ncsi;
-};
-
-&mac3 {
-       status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_rmii4_default>;
-       clocks = <&syscon ASPEED_CLK_GATE_MAC4CLK>,
-                <&syscon ASPEED_CLK_MAC4RCLK>;
-       clock-names = "MACCLK", "RCLK";
-       use-ncsi;
-};
-
-&wdt1 {
-       aspeed,reset-type = "none";
-       aspeed,external-signal;
-       aspeed,ext-push-pull;
-       aspeed,ext-active-high;
-
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_wdtrst1_default>;
-};
-
-&wdt2 {
-       status = "okay";
-};
-
-&xdma {
-       status = "okay";
-       memory-region = <&vga_memory>;
-};
-
-&kcs2 {
-       status = "okay";
-       aspeed,lpc-io-reg = <0xca8 0xcac>;
-};
-
-&kcs3 {
-       status = "okay";
-       aspeed,lpc-io-reg = <0xca2>;
-       aspeed,lpc-interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
-};