summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/tegra-cardhu.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/tegra-cardhu.dts
parentMerge branch 'for-3.5/dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/s... (diff)
parentmmc: dt: Consolidate DT bindings (diff)
downloadlinux-deb88cc3c69975cbd9875ed9fac259b351f6b64d.tar.xz
linux-deb88cc3c69975cbd9875ed9fac259b351f6b64d.zip
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-cardhu.dts')
-rw-r--r--arch/arm/boot/dts/tegra-cardhu.dts2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/tegra-cardhu.dts b/arch/arm/boot/dts/tegra-cardhu.dts
index e14bb450c328..36321bceec46 100644
--- a/arch/arm/boot/dts/tegra-cardhu.dts
+++ b/arch/arm/boot/dts/tegra-cardhu.dts
@@ -139,11 +139,13 @@
cd-gpios = <&gpio 69 0>; /* gpio PI5 */
wp-gpios = <&gpio 155 0>; /* gpio PT3 */
power-gpios = <&gpio 31 0>; /* gpio PD7 */
+ bus-width = <4>;
};
sdhci@78000600 {
status = "okay";
support-8bit;
+ bus-width = <8>;
};
sound {