arm: socfpga: Make the DT mmc node consistent

The socfpga_cyclone5.dtsi has an mmc0 node, socrates has mmc node.
This makes aliases not very usable, so make everything into mmc0.
Moreover, zap the useless mmc alias while at this.

Signed-off-by: Marek Vasut <marex@denx.de>

diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi
index e17e9f4a3ca8807fa401d18613244465e260ae17..ded3093a6be35ab70fb02244ad0d6fab3fb664aa 100644 (file)
--- a/arch/arm/dts/socfpga.dtsi
+++ b/arch/arm/dts/socfpga.dtsi
@@ -23,7 +23,6 @@
                spi0 = &qspi;
                spi1 = &spi0;
                spi2 = &spi1;
-               mmc = &mmc;
        };
 
        cpus {
@@ -621,7 +620,7 @@
                        arm,data-latency = <2 1 1>;
                };
 
-               mmc: dwmmc0@ff704000 {
+               mmc0: dwmmc0@ff704000 {
                        compatible = "altr,socfpga-dw-mshc";
                        reg = <0xff704000 0x1000>;
                        interrupts = <0 139 4>;

diff --git a/arch/arm/dts/socfpga_cyclone5_socrates.dts b/arch/arm/dts/socfpga_cyclone5_socrates.dts
index 00b1830485a098dcfd583a7af6ed63dea112899d..3c985584d13b67d901780642d401e5959a456720 100644 (file)
--- a/arch/arm/dts/socfpga_cyclone5_socrates.dts
+++ b/arch/arm/dts/socfpga_cyclone5_socrates.dts
@@ -34,7 +34,7 @@
        };
 };
 
-&mmc {
+&mmc0 {
        status = "okay";
 };