Skip to content

Commit

Permalink
arm/dt: tegra: Fix SDHCI nodes to match board files
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stephen Warren authored and Olof Johansson committed Dec 8, 2011
1 parent 31c1ec9 commit 1292c12
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 0 deletions.
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/tegra-harmony.dts
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,20 @@
status = "disable";
};

sdhci@c8000000 {
status = "disable";
};

sdhci@c8000200 {
cd-gpios = <&gpio 69 0>; /* gpio PI5 */
wp-gpios = <&gpio 57 0>; /* gpio PH1 */
power-gpios = <&gpio 155 0>; /* gpio PT3 */
};

sdhci@c8000400 {
status = "disable";
};

sdhci@c8000600 {
cd-gpios = <&gpio 58 0>; /* gpio PH2 */
wp-gpios = <&gpio 59 0>; /* gpio PH3 */
Expand Down
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/tegra-seaboard.dts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,14 @@
status = "disable";
};

sdhci@c8000000 {
status = "disable";
};

sdhci@c8000200 {
status = "disable";
};

sdhci@c8000400 {
cd-gpios = <&gpio 69 0>; /* gpio PI5 */
wp-gpios = <&gpio 57 0>; /* gpio PH1 */
Expand Down
12 changes: 12 additions & 0 deletions arch/arm/boot/dts/tegra-trimslice.dts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,18 @@
status = "disable";
};

sdhci@c8000000 {
status = "disable";
};

sdhci@c8000200 {
status = "disable";
};

sdhci@c8000400 {
status = "disable";
};

sdhci@c8000600 {
cd-gpios = <&gpio 121 0>;
wp-gpios = <&gpio 122 0>;
Expand Down
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/tegra-ventana.dts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,14 @@
status = "disable";
};

sdhci@c8000000 {
status = "disable";
};

sdhci@c8000200 {
status = "disable";
};

sdhci@c8000400 {
cd-gpios = <&gpio 69 0>; /* gpio PI5 */
wp-gpios = <&gpio 57 0>; /* gpio PH1 */
Expand Down

0 comments on commit 1292c12

Please sign in to comment.