aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx53-smd.dts
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-05-14 22:35:04 +0200
committerArnd Bergmann <arnd@arndb.de>2012-05-15 13:44:11 +0200
commitdeb88cc3c69975cbd9875ed9fac259b351f6b64d (patch)
treeece2ffba5c3e585cf649d73e4ea1784037335468 /arch/arm/boot/dts/imx53-smd.dts
parentecf1b318347f6c250293ee8a9f2597373b00e0c3 (diff)
parent7f217794ffa72f208a250b79ab0b7ea3de19677f (diff)
downloadlinux-linaro-stable-deb88cc3c69975cbd9875ed9fac259b351f6b64d.tar.gz
Merge branch 'drivers/mmc' into next/dt2
Changes in the dt2 branch move stuff around that gets changed in the drivers/mmc branch. I chose a non-obvious resolution by adding the new bus-width property into all the tegra sdhci device nodes. Conflicts: arch/arm/boot/dts/tegra-cardhu.dts arch/arm/boot/dts/tegra-harmony.dts arch/arm/boot/dts/tegra-ventana.dts Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/imx53-smd.dts')
-rw-r--r--arch/arm/boot/dts/imx53-smd.dts4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx53-smd.dts b/arch/arm/boot/dts/imx53-smd.dts
index a3529afc4d20..08091029168e 100644
--- a/arch/arm/boot/dts/imx53-smd.dts
+++ b/arch/arm/boot/dts/imx53-smd.dts
@@ -31,7 +31,7 @@
};
esdhc@50008000 { /* ESDHC2 */
- fsl,card-wired;
+ non-removable;
status = "okay";
};
@@ -72,7 +72,7 @@
};
esdhc@50020000 { /* ESDHC3 */
- fsl,card-wired;
+ non-removable;
status = "okay";
};
};