diff options
author | Stephen Warren <swarren@nvidia.com> | 2011-11-21 16:44:11 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2011-12-07 23:48:06 -0500 |
commit | 1292c129597ce42a75d9e97cd312c3242e10a6f3 (patch) | |
tree | 17e2ed2d820d138d48441edbb94dfaf3f7a18d3b /arch/arm/boot | |
parent | 31c1ec9282d28f4eecb5f2e431f67accdf420ac2 (diff) |
arm/dt: tegra: Fix SDHCI nodes to match board files
Mark any SDHCI controllers that aren't registered by the board files as
disabled in the device-tree files.
In practice, these controllers:
* Have nothing hooked up to them at all, or
* For ports intended for SDIO usage, the drivers for anything that might
be attached are not in the device-tree yet. If/when drivers appear, the
SD/MMC port can be re-enabled.
The only possible exception is TrimSlice's mico SD slot, but that wasn't
enabled in the board files before anyway, and doesn't work when all the
SDHCI controllers are enabled anyway.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/tegra-harmony.dts | 8 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra-seaboard.dts | 8 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra-trimslice.dts | 12 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra-ventana.dts | 8 |
4 files changed, 36 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts index ac179a05cfe3..80afa1b70b80 100644 --- a/arch/arm/boot/dts/tegra-harmony.dts +++ b/arch/arm/boot/dts/tegra-harmony.dts | |||
@@ -67,12 +67,20 @@ | |||
67 | status = "disable"; | 67 | status = "disable"; |
68 | }; | 68 | }; |
69 | 69 | ||
70 | sdhci@c8000000 { | ||
71 | status = "disable"; | ||
72 | }; | ||
73 | |||
70 | sdhci@c8000200 { | 74 | sdhci@c8000200 { |
71 | cd-gpios = <&gpio 69 0>; /* gpio PI5 */ | 75 | cd-gpios = <&gpio 69 0>; /* gpio PI5 */ |
72 | wp-gpios = <&gpio 57 0>; /* gpio PH1 */ | 76 | wp-gpios = <&gpio 57 0>; /* gpio PH1 */ |
73 | power-gpios = <&gpio 155 0>; /* gpio PT3 */ | 77 | power-gpios = <&gpio 155 0>; /* gpio PT3 */ |
74 | }; | 78 | }; |
75 | 79 | ||
80 | sdhci@c8000400 { | ||
81 | status = "disable"; | ||
82 | }; | ||
83 | |||
76 | sdhci@c8000600 { | 84 | sdhci@c8000600 { |
77 | cd-gpios = <&gpio 58 0>; /* gpio PH2 */ | 85 | cd-gpios = <&gpio 58 0>; /* gpio PH2 */ |
78 | wp-gpios = <&gpio 59 0>; /* gpio PH3 */ | 86 | wp-gpios = <&gpio 59 0>; /* gpio PH3 */ |
diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts index cbb2f085ac23..f552bcc04412 100644 --- a/arch/arm/boot/dts/tegra-seaboard.dts +++ b/arch/arm/boot/dts/tegra-seaboard.dts | |||
@@ -47,6 +47,14 @@ | |||
47 | status = "disable"; | 47 | status = "disable"; |
48 | }; | 48 | }; |
49 | 49 | ||
50 | sdhci@c8000000 { | ||
51 | status = "disable"; | ||
52 | }; | ||
53 | |||
54 | sdhci@c8000200 { | ||
55 | status = "disable"; | ||
56 | }; | ||
57 | |||
50 | sdhci@c8000400 { | 58 | sdhci@c8000400 { |
51 | cd-gpios = <&gpio 69 0>; /* gpio PI5 */ | 59 | cd-gpios = <&gpio 69 0>; /* gpio PI5 */ |
52 | wp-gpios = <&gpio 57 0>; /* gpio PH1 */ | 60 | wp-gpios = <&gpio 57 0>; /* gpio PH1 */ |
diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts index 6060ce0ae77c..3b3ee7db99f3 100644 --- a/arch/arm/boot/dts/tegra-trimslice.dts +++ b/arch/arm/boot/dts/tegra-trimslice.dts | |||
@@ -46,6 +46,18 @@ | |||
46 | status = "disable"; | 46 | status = "disable"; |
47 | }; | 47 | }; |
48 | 48 | ||
49 | sdhci@c8000000 { | ||
50 | status = "disable"; | ||
51 | }; | ||
52 | |||
53 | sdhci@c8000200 { | ||
54 | status = "disable"; | ||
55 | }; | ||
56 | |||
57 | sdhci@c8000400 { | ||
58 | status = "disable"; | ||
59 | }; | ||
60 | |||
49 | sdhci@c8000600 { | 61 | sdhci@c8000600 { |
50 | cd-gpios = <&gpio 121 0>; | 62 | cd-gpios = <&gpio 121 0>; |
51 | wp-gpios = <&gpio 122 0>; | 63 | wp-gpios = <&gpio 122 0>; |
diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts index 5ac0aa300fe0..c7d3b87f29df 100644 --- a/arch/arm/boot/dts/tegra-ventana.dts +++ b/arch/arm/boot/dts/tegra-ventana.dts | |||
@@ -46,6 +46,14 @@ | |||
46 | status = "disable"; | 46 | status = "disable"; |
47 | }; | 47 | }; |
48 | 48 | ||
49 | sdhci@c8000000 { | ||
50 | status = "disable"; | ||
51 | }; | ||
52 | |||
53 | sdhci@c8000200 { | ||
54 | status = "disable"; | ||
55 | }; | ||
56 | |||
49 | sdhci@c8000400 { | 57 | sdhci@c8000400 { |
50 | cd-gpios = <&gpio 69 0>; /* gpio PI5 */ | 58 | cd-gpios = <&gpio 69 0>; /* gpio PI5 */ |
51 | wp-gpios = <&gpio 57 0>; /* gpio PH1 */ | 59 | wp-gpios = <&gpio 57 0>; /* gpio PH1 */ |