aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-09-22 10:45:01 -0400
committerArnd Bergmann <arnd@arndb.de>2011-09-22 10:45:01 -0400
commit3a3ad60176fafb027bf2e4fe4793eab99ced5708 (patch)
treed1a791061a9226ed25c0044dce11f194c9977791
parent1bf6d2c1bb23533af6930581cc39b74685bc29de (diff)
parent6111d50c5885f6ba00dc935e44bcbbcd63b3915d (diff)
Merge branch 'tegra/fixes' into next/fixes
-rw-r--r--arch/arm/boot/dts/tegra-harmony.dts1
-rw-r--r--arch/arm/boot/dts/tegra-seaboard.dts4
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts
index e5818668d091..0e225b86b652 100644
--- a/arch/arm/boot/dts/tegra-harmony.dts
+++ b/arch/arm/boot/dts/tegra-harmony.dts
@@ -66,5 +66,6 @@
66 cd-gpios = <&gpio 58 0>; /* gpio PH2 */ 66 cd-gpios = <&gpio 58 0>; /* gpio PH2 */
67 wp-gpios = <&gpio 59 0>; /* gpio PH3 */ 67 wp-gpios = <&gpio 59 0>; /* gpio PH3 */
68 power-gpios = <&gpio 70 0>; /* gpio PI6 */ 68 power-gpios = <&gpio 70 0>; /* gpio PI6 */
69 support-8bit;
69 }; 70 };
70}; 71};
diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts
index 64cedca6fc79..a72299b8e668 100644
--- a/arch/arm/boot/dts/tegra-seaboard.dts
+++ b/arch/arm/boot/dts/tegra-seaboard.dts
@@ -25,4 +25,8 @@
25 wp-gpios = <&gpio 57 0>; /* gpio PH1 */ 25 wp-gpios = <&gpio 57 0>; /* gpio PH1 */
26 power-gpios = <&gpio 70 0>; /* gpio PI6 */ 26 power-gpios = <&gpio 70 0>; /* gpio PI6 */
27 }; 27 };
28
29 sdhci@c8000600 {
30 support-8bit;
31 };
28}; 32};