ARM: dts: ast2500: Update SDHCI nodes

Match the description used by the Linux kernel, except use scu instead
of syscon as the phandle.

Signed-off-by: Joel Stanley <joel@jms.id.au>

diff --git a/arch/arm/dts/ast2500-evb.dts b/arch/arm/dts/ast2500-evb.dts
index 874e042..cc57776 100644 (file)
--- a/arch/arm/dts/ast2500-evb.dts
+++ b/arch/arm/dts/ast2500-evb.dts
@@ -60,6 +60,10 @@
        pinctrl-0 = <&pinctrl_mac2link_default &pinctrl_mdio2_default>;
 };
 
+&sdmmc {
+       status = "okay";
+};
+
 &sdhci0 {
        status = "okay";
 

diff --git a/arch/arm/dts/ast2500-u-boot.dtsi b/arch/arm/dts/ast2500-u-boot.dtsi
index ea60e4c..057390f 100644 (file)
--- a/arch/arm/dts/ast2500-u-boot.dtsi
+++ b/arch/arm/dts/ast2500-u-boot.dtsi
@@ -28,31 +28,6 @@
                clocks = <&scu ASPEED_CLK_MPLL>;
                resets = <&rst ASPEED_RESET_SDRAM>;
        };
-
-       ahb {
-               u-boot,dm-pre-reloc;
-
-               apb {
-                       u-boot,dm-pre-reloc;
-
-                       sdhci0: sdhci@1e740100 {
-                               compatible = "aspeed,ast2500-sdhci";
-                               reg = <0x1e740100>;
-                               #reset-cells = <1>;
-                               clocks = <&scu ASPEED_CLK_SDIO>;
-                               resets = <&rst ASPEED_RESET_SDIO>;
-                       };
-
-                       sdhci1: sdhci@1e740200 {
-                               compatible = "aspeed,ast2500-sdhci";
-                               reg = <0x1e740200>;
-                               #reset-cells = <1>;
-                               clocks = <&scu ASPEED_CLK_SDIO>;
-                               resets = <&rst ASPEED_RESET_SDIO>;
-                       };
-               };
-
-       };
 };
 
 &uart1 {

diff --git a/arch/arm/dts/ast2500.dtsi b/arch/arm/dts/ast2500.dtsi
index ee66ef6..cea08e6 100644 (file)
--- a/arch/arm/dts/ast2500.dtsi
+++ b/arch/arm/dts/ast2500.dtsi
@@ -207,6 +207,34 @@
                                reg = <0x1e720000 0x9000>;      // 36K
                        };
 
+                       sdmmc: sd-controller@1e740000 {
+                               compatible = "aspeed,ast2500-sd-controller";
+                               reg = <0x1e740000 0x100>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+                               ranges = <0 0x1e740000 0x10000>;
+                               clocks = <&scu ASPEED_CLK_GATE_SDCLK>;
+                               status = "disabled";
+
+                               sdhci0: sdhci@100 {
+                                       compatible = "aspeed,ast2500-sdhci";
+                                       reg = <0x100 0x100>;
+                                       interrupts = <26>;
+                                       sdhci,auto-cmd12;
+                                       clocks = <&scu ASPEED_CLK_SDIO>;
+                                       status = "disabled";
+                               };
+
+                               sdhci1: sdhci@200 {
+                                       compatible = "aspeed,ast2500-sdhci";
+                                       reg = <0x200 0x100>;
+                                       interrupts = <26>;
+                                       sdhci,auto-cmd12;
+                                       clocks = <&scu ASPEED_CLK_SDIO>;
+                                       status = "disabled";
+                               };
+                       };
+
                        gpio: gpio@1e780000 {
                                #gpio-cells = <2>;
                                gpio-controller;