diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 22:35:04 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-15 13:44:11 +0200 |
commit | deb88cc3c69975cbd9875ed9fac259b351f6b64d (patch) | |
tree | ece2ffba5c3e585cf649d73e4ea1784037335468 /arch/arm/boot/dts/tegra-paz00.dts | |
parent | ecf1b318347f6c250293ee8a9f2597373b00e0c3 (diff) | |
parent | 7f217794ffa72f208a250b79ab0b7ea3de19677f (diff) |
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/tegra-paz00.dts')
-rw-r--r-- | arch/arm/boot/dts/tegra-paz00.dts | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts index cb366f0c6ff..bfeb117d5ae 100644 --- a/arch/arm/boot/dts/tegra-paz00.dts +++ b/arch/arm/boot/dts/tegra-paz00.dts @@ -296,11 +296,13 @@ cd-gpios = <&gpio 173 0>; /* gpio PV5 */ wp-gpios = <&gpio 57 0>; /* gpio PH1 */ power-gpios = <&gpio 169 0>; /* gpio PV1 */ + bus-width = <4>; }; sdhci@c8000600 { status = "okay"; support-8bit; + bus-width = <8>; }; gpio-keys { |