aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/boot
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-05-14 21:48:45 +0200
committerArnd Bergmann <arnd@arndb.de>2012-05-15 13:31:11 +0200
commitc49314fa6c7d2c130d850b30980cffab53a40592 (patch)
tree9c7597ad98a42ef8ba1e18e897106c2cb29e52e6 /arch/powerpc/boot
parent21b7f153dd0d7366197c37e7a630c7585db0b8ea (diff)
parent7f217794ffa72f208a250b79ab0b7ea3de19677f (diff)
downloadlinaro-lsk-c49314fa6c7d2c130d850b30980cffab53a40592.tar.gz
Merge branch 'drivers/mmc' into next/drivers
* drivers/mmc: mmc: dt: Consolidate DT bindings Also pulls in the omap/dt-missed-3.4 branch as a dependency. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r--arch/powerpc/boot/dts/mpc8569mds.dts1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/boot/dts/mpc8569mds.dts b/arch/powerpc/boot/dts/mpc8569mds.dts
index 7e283c891b7..fe0d60935e9 100644
--- a/arch/powerpc/boot/dts/mpc8569mds.dts
+++ b/arch/powerpc/boot/dts/mpc8569mds.dts
@@ -119,6 +119,7 @@
sdhc@2e000 {
status = "disabled";
sdhci,1-bit-only;
+ bus-width = <1>;
};
par_io@e0100 {