diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2011-09-22 14:45:01 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-09-22 14:45:01 +0000 |
| commit | 3a3ad60176fafb027bf2e4fe4793eab99ced5708 (patch) | |
| tree | d1a791061a9226ed25c0044dce11f194c9977791 | |
| parent | ARM: mach-ux500: unlock I&D l2x0 caches before init (diff) | |
| parent | arm/dt: Tegra: Add support-8bit to SDHCI nodes (diff) | |
| download | wireguard-linux-3a3ad60176fafb027bf2e4fe4793eab99ced5708.tar.xz wireguard-linux-3a3ad60176fafb027bf2e4fe4793eab99ced5708.zip | |
Merge branch 'tegra/fixes' into next/fixes
| -rw-r--r-- | arch/arm/boot/dts/tegra-harmony.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra-seaboard.dts | 4 |
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 @@ cd-gpios = <&gpio 58 0>; /* gpio PH2 */ wp-gpios = <&gpio 59 0>; /* gpio PH3 */ power-gpios = <&gpio 70 0>; /* gpio PI6 */ + support-8bit; }; }; 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 @@ wp-gpios = <&gpio 57 0>; /* gpio PH1 */ power-gpios = <&gpio 70 0>; /* gpio PI6 */ }; + + sdhci@c8000600 { + support-8bit; + }; }; |