summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/tegra20-trimslice.dts
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-04-09 18:31:43 +0400
committerArnd Bergmann <arnd@arndb.de>2013-04-09 18:31:43 +0400
commit3be1812ea3b7193ee1a3993cadf9a7985121cf16 (patch)
tree4aed605da38588bae8544dccdf6f81004d02ee0b /arch/arm/boot/dts/tegra20-trimslice.dts
parent759417ac74fedf74af9c1c1510a9e4e15b951239 (diff)
parent6affb4826405dc1f53bae0e5c302a18f734a44ca (diff)
downloadlinux-3be1812ea3b7193ee1a3993cadf9a7985121cf16.tar.xz
Merge branch 'tegra/cleanup' into next/soc
This is a dependency for the tegra/soc branch. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/tegra20-trimslice.dts')
-rw-r--r--arch/arm/boot/dts/tegra20-trimslice.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
index 5d79e4fc49a6..98f3e44f2a51 100644
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -325,7 +325,7 @@
sdhci@c8000600 {
status = "okay";
- cd-gpios = <&gpio 121 0>; /* gpio PP1 */
+ cd-gpios = <&gpio 121 1>; /* gpio PP1 */
wp-gpios = <&gpio 122 0>; /* gpio PP2 */
bus-width = <4>;
};