[PATCH u-boot v2019.04-aspeed-openbmc 2/3] dts: ast2600: Consolidate A0 device tree

[Joel Stanley]

The AST2600A0 EVB device tree is the same as the AST2600, except for the
removal of MAC0 which is broken on this revision.

To reduce the maintenance required, include the AST2600 EVB device tree
and modify the nodes as appropriate.

Signed-off-by: Joel Stanley <joel at jms.id.au>
---
 arch/arm/dts/ast2600a0-evb.dts | 264 +--------------------------------
 1 file changed, 5 insertions(+), 259 deletions(-)

diff --git a/arch/arm/dts/ast2600a0-evb.dts b/arch/arm/dts/ast2600a0-evb.dts
index 49fd4f29df1a..b940d26087dd 100644
--- a/arch/arm/dts/ast2600a0-evb.dts
+++ b/arch/arm/dts/ast2600a0-evb.dts
@@ -1,271 +1,17 @@
 /dts-v1/;
 
-#include "ast2600-u-boot.dtsi"
+#include "ast2600-evb.dts"
 
 / {
-	model = "AST2600 EVB";
-	compatible = "aspeed,ast2600-evb", "aspeed,ast2600";
-
-	memory {
-		device_type = "memory";
-		reg = <0x80000000 0x40000000>;
-	};
-
-	chosen {
-		stdout-path = &uart5;
-	};
+	model = "AST2600A0 EVB";
 
 	aliases {
-		mmc0 = &emmc_slot0;
-		mmc1 = &sdhci_slot0;
-		mmc2 = &sdhci_slot1;
-		spi0 = &fmc;
-		spi1 = &spi1;
-		spi2 = &spi2;
-
 		ethernet0 = &mac1;
 		ethernet1 = &mac2;
 		ethernet2 = &mac3;
+		/delete-property/ethernet3;
 	};
-
-	cpus {
-		cpu at 0 {
-			clock-frequency = <800000000>;
-		};
-		cpu at 1 {
-			clock-frequency = <800000000>;
-		};
-	};
-};
-
-&uart5 {
-	u-boot,dm-pre-reloc;
-	status = "okay";
-};
-
-&sdrammc {
-	clock-frequency = <400000000>;
-};
-
-&wdt1 {
-	u-boot,dm-pre-reloc;
-	status = "okay";
-};
-
-&wdt2 {
-	u-boot,dm-pre-reloc;
-	status = "okay";
-};
-
-&wdt3 {
-	u-boot,dm-pre-reloc;
-	status = "okay";
-};
-
-&mdio {
-	status = "okay";
-	#address-cells = <1>;
-	#size-cells = <0>;
-	ethphy1: ethernet-phy at 1 {
-		reg = <0>;
-	};
-
-	ethphy2: ethernet-phy at 2 {
-		reg = <0>;
-	};
-
-	ethphy3: ethernet-phy at 3 {
-		reg = <0>;
-	};
-
-	ethphy4: ethernet-phy at 4 {
-		reg = <0>;
-	};
-};
-
-
-&mac1 {
-	status = "okay";
-	phy-mode = "rgmii";
-	phy-handle = <&ethphy2>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mac2link_default &pinctrl_mdio2_default>;
-};
-
-&mac2 {
-	status = "okay";
-	phy-mode = "rgmii";
-	phy-handle = <&ethphy3>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_rgmii3_default &pinctrl_mac3link_default &pinctrl_mdio3_default>;	
-};
-
-&mac3 {
-	status = "okay";
-	phy-mode = "rgmii";
-	phy-handle = <&ethphy4>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_rgmii4_default &pinctrl_mac4link_default &pinctrl_mdio4_default>;	
-};
-
-&fmc {
-	status = "okay";
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_fmcquad_default>;
-
-	flash at 0 {
-		status = "okay";
-		spi-max-frequency = <50000000>;
-		spi-tx-bus-width = <4>;
-		spi-rx-bus-width = <4>;
-	};
-
-	flash at 1 {
-		status = "okay";
-		spi-max-frequency = <50000000>;
-		spi-tx-bus-width = <4>;
-		spi-rx-bus-width = <4>;
-	};
-
-	flash at 2 {
-		status = "disabled";
-		spi-max-frequency = <50000000>;
-		spi-tx-bus-width = <4>;
-		spi-rx-bus-width = <4>;
-	};
-};
-
-&spi1 {
-	status = "okay";
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_spi1_default &pinctrl_spi1abr_default
-			&pinctrl_spi1cs1_default &pinctrl_spi1wp_default
-			&pinctrl_spi1wp_default &pinctrl_spi1quad_default>;
-
-	flash at 0 {
-		status = "okay";
-		spi-max-frequency = <50000000>;
-		spi-tx-bus-width = <4>;
-		spi-rx-bus-width = <4>;
-	};
-
-	flash at 1 {
-		status = "disabled";
-		spi-max-frequency = <50000000>;
-		spi-tx-bus-width = <4>;
-		spi-rx-bus-width = <4>;
-	};
-};
-
-&spi2 {
-	status = "okay";
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_spi2_default &pinctrl_spi2cs1_default
-			&pinctrl_spi2cs2_default &pinctrl_spi2quad_default>;
-
-	flash at 0 {
-		status = "okay";
-		spi-max-frequency = <50000000>;
-		spi-tx-bus-width = <4>;
-		spi-rx-bus-width = <4>;
-	};
-
-	flash at 1 {
-		status = "disabled";
-		spi-max-frequency = <50000000>;
-		spi-tx-bus-width = <4>;
-		spi-rx-bus-width = <4>;
-	};
-
-	flash at 2 {
-		status = "disabled";
-		spi-max-frequency = <50000000>;
-		spi-tx-bus-width = <4>;
-		spi-rx-bus-width = <4>;
-	};
-};
-
-&emmc_slot0 {
-	status = "okay";
-
-#if 1
-	bus-width = <4>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_emmc_default>;
-#else
-	bus-width = <8>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_emmcg8_default>;
-#endif
-};
-
-&sdhci_slot0 {
-	status = "okay";
-	bus-width = <4>;
-	pwr-gpios = <&gpio0 ASPEED_GPIO(V, 0) GPIO_ACTIVE_HIGH>;
-	pwr-sw-gpios = <&gpio0 ASPEED_GPIO(V, 1) GPIO_ACTIVE_HIGH>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_sd1_default>;
-};
-
-&sdhci_slot1 {
-	status = "okay";
-	bus-width = <4>;
-	pwr-gpios = <&gpio0 ASPEED_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
-	pwr-sw-gpios = <&gpio0 ASPEED_GPIO(V, 3) GPIO_ACTIVE_HIGH>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_sd2_default>;
 };
 
-&i2c4 {
-	status = "okay";
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_i2c5_default>;
-};
-
-&i2c5 {
-	status = "okay";
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_i2c6_default>;
-};
-
-&i2c6 {
-	status = "okay";
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_i2c7_default>;
-};
-
-&i2c7 {
-	status = "okay";
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_i2c8_default>;
-};
-
-&i2c8 {
-	status = "okay";
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_i2c9_default>;
-};
-
-
-#if 0
-&fsim0 {
-	status = "okay";
-};
-
-&fsim1 {
-	status = "okay";
-};
-#endif
-
-&ehci1 {
-	status = "okay";
-};
+/* MAC0 is broken on A1 */
+/delete-node/&mac0;
-- 
2.35.1