diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 20:30:25 +0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 20:30:25 +0400 |
commit | 995a0605a6665858d73f9e80053414909be33f27 (patch) | |
tree | fcc66a6a77acdaae492f77c0c58c0233db74a2b4 /arch/arm/boot/dts/tegra-seaboard.dts | |
parent | a32750c2ca6f697903b19063fc86f4272865e3a1 (diff) | |
parent | 677d3e2f07d1b3d6d2f76fd5552d16a53b9236a0 (diff) | |
download | linux-995a0605a6665858d73f9e80053414909be33f27.tar.xz |
Merge branch 'at91/trng' into next/driver
Diffstat (limited to 'arch/arm/boot/dts/tegra-seaboard.dts')
-rw-r--r-- | arch/arm/boot/dts/tegra-seaboard.dts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts index 1940cae00748..64cedca6fc79 100644 --- a/arch/arm/boot/dts/tegra-seaboard.dts +++ b/arch/arm/boot/dts/tegra-seaboard.dts @@ -21,8 +21,8 @@ }; sdhci@c8000400 { - gpios = <&gpio 69 0>, /* cd, gpio PI5 */ - <&gpio 57 0>, /* wp, gpio PH1 */ - <&gpio 70 0>; /* power, gpio PI6 */ + cd-gpios = <&gpio 69 0>; /* gpio PI5 */ + wp-gpios = <&gpio 57 0>; /* gpio PH1 */ + power-gpios = <&gpio 70 0>; /* gpio PI6 */ }; }; |