summaryrefslogtreecommitdiff
path: root/arch/arm/dts
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2015-08-02 22:55:24 +0200
committerMarek Vasut <marex@denx.de>2015-08-23 11:56:19 +0200
commitafe139938a75402a4287634c4d46b25e07cf79c0 (patch)
tree9927f492b2373a13ad4e0d1ceddce71151c8241a /arch/arm/dts
parent7e4d2fa2ed2ddf80121372db0282315dc9850a1b (diff)
downloadu-boot-imx-afe139938a75402a4287634c4d46b25e07cf79c0.zip
u-boot-imx-afe139938a75402a4287634c4d46b25e07cf79c0.tar.gz
u-boot-imx-afe139938a75402a4287634c4d46b25e07cf79c0.tar.bz2
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>
Diffstat (limited to 'arch/arm/dts')
-rw-r--r--arch/arm/dts/socfpga.dtsi3
-rw-r--r--arch/arm/dts/socfpga_cyclone5_socrates.dts2
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi
index e17e9f4..ded3093 100644
--- 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 00b1830..3c98558 100644
--- a/arch/arm/dts/socfpga_cyclone5_socrates.dts
+++ b/arch/arm/dts/socfpga_cyclone5_socrates.dts
@@ -34,7 +34,7 @@
};
};
-&mmc {
+&mmc0 {
status = "okay";
};