@@ -4,102 +4,10 @@
/ {
model = "AST2600 EVB w/ NCSI";
- compatible = "aspeed,ast2600-evb", "aspeed,ast2600";
-
- memory {
- device_type = "memory";
- reg = <0x80000000 0x40000000>;
- };
-
- chosen {
- stdout-path = &uart5;
- };
-
- aliases {
- mmc0 = &emmc_slot0;
- mmc1 = &sdhci_slot0;
- mmc2 = &sdhci_slot1;
- spi0 = &fmc;
- spi1 = &spi1;
- spi2 = &spi2;
- ethernet0 = &mac0;
- ethernet1 = &mac1;
- ethernet2 = &mac2;
- ethernet3 = &mac3;
- };
-
- cpus {
- cpu@0 {
- clock-frequency = <800000000>;
- };
- cpu@1 {
- clock-frequency = <800000000>;
- };
- };
-};
-
-&uart5 {
- u-boot,dm-pre-reloc;
- status = "okay";
-};
-
-&sdrammc {
- clock-frequency = <400000000>;
-};
-
-&wdt1 {
- status = "okay";
-};
-
-&wdt2 {
- status = "okay";
-};
-
-&wdt3 {
- status = "okay";
-};
-
-#if 0
-&mdio {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = < &pinctrl_mdio1_default &pinctrl_mdio2_default
- &pinctrl_mdio3_default &pinctrl_mdio4_default>;
- #address-cells = <1>;
- #size-cells = <0>;
- ethphy0: ethernet-phy@0 {
- reg = <0>;
- };
-
- ethphy1: ethernet-phy@1 {
- reg = <0>;
- };
-
- ethphy2: ethernet-phy@2 {
- reg = <0>;
- };
-
- ethphy3: ethernet-phy@3 {
- reg = <0>;
- };
-};
-
-&mac0 {
- status = "okay";
- phy-mode = "rgmii-rxid";
- phy-handle = <ðphy0>;
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_rgmii1_default>;
};
-&mac1 {
- status = "okay";
- phy-mode = "rgmii-rxid";
- phy-handle = <ðphy1>;
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_rgmii2_default>;
-};
-#endif
+/delete-node/&mac0;
+/delete-node/&mac1;
&mac2 {
status = "okay";
@@ -107,6 +15,7 @@
use-ncsi;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_rmii3_default>;
+ /delete-property/phy-handle;
};
&mac3 {
@@ -115,200 +24,5 @@
use-ncsi;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_rmii4_default>;
-};
-
-&fmc {
- status = "okay";
-
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_fmcquad_default>;
-
- flash@0 {
- status = "okay";
- spi-max-frequency = <50000000>;
- spi-tx-bus-width = <4>;
- spi-rx-bus-width = <4>;
- };
-
- flash@1 {
- status = "okay";
- spi-max-frequency = <50000000>;
- spi-tx-bus-width = <4>;
- spi-rx-bus-width = <4>;
- };
-
- flash@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@0 {
- status = "okay";
- spi-max-frequency = <50000000>;
- spi-tx-bus-width = <4>;
- spi-rx-bus-width = <4>;
- };
-
- flash@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@0 {
- status = "okay";
- spi-max-frequency = <50000000>;
- spi-tx-bus-width = <4>;
- spi-rx-bus-width = <4>;
- };
-
- flash@1 {
- status = "disabled";
- spi-max-frequency = <50000000>;
- spi-tx-bus-width = <4>;
- spi-rx-bus-width = <4>;
- };
-
- flash@2 {
- status = "disabled";
- spi-max-frequency = <50000000>;
- spi-tx-bus-width = <4>;
- spi-rx-bus-width = <4>;
- };
-};
-
-&emmc {
- u-boot,dm-pre-reloc;
- timing-phase = <0x700ff>;
-};
-
-&emmc_slot0 {
- u-boot,dm-pre-reloc;
- status = "okay";
- bus-width = <4>;
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_emmc_default>;
- sdhci-drive-type = <1>;
-};
-
-&sdhci {
- timing-phase = <0xc6ffff>;
-};
-
-&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-drive-type = <1>;
-};
-
-&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>;
- sdhci-drive-type = <1>;
-};
-
-&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";
-};
-
-&display_port {
- status = "okay";
-};
-
-&scu {
- mac0-clk-delay = <0x10 0x0a
- 0x10 0x10
- 0x10 0x10>;
- mac1-clk-delay = <0x10 0x0a
- 0x10 0x10
- 0x10 0x10>;
- mac2-clk-delay = <0x08 0x04
- 0x08 0x04
- 0x08 0x04>;
- mac3-clk-delay = <0x08 0x04
- 0x08 0x04
- 0x08 0x04>;
-};
-
-&hace {
- u-boot,dm-pre-reloc;
- status = "okay";
-};
-
-&acry {
- u-boot,dm-pre-reloc;
- status = "okay";
+ /delete-property/phy-handle;
};
The AST2600 NCSI EVB device tree is the same as the AST2600, except for the configuration of the network devices. To reduce the maintenance required, include the AST2600 EVB device tree and modify the nodes as appropriate. Signed-off-by: Joel Stanley <joel@jms.id.au> --- arch/arm/dts/ast2600-ncsi.dts | 294 +--------------------------------- 1 file changed, 4 insertions(+), 290 deletions(-)