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>

diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts
index ac179a05cfe329718b41dcd964457faa35e939b8..80afa1b70b80d6ed448692a5434014fa36e910f8 100644 (file)
--- a/arch/arm/boot/dts/tegra-harmony.dts
+++ b/arch/arm/boot/dts/tegra-harmony.dts
@@ -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 */

diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts
index cbb2f085ac23d62b5b7cb3e1da24e4a10d492b93..f552bcc0441279856dab4f36a403002a936eb217 100644 (file)
--- a/arch/arm/boot/dts/tegra-seaboard.dts
+++ b/arch/arm/boot/dts/tegra-seaboard.dts
@@ -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 */

diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts
index 6060ce0ae77cd81a02619a6c707503c021ab4376..3b3ee7db99f3f6893b9113915b016954aa6a3cb9 100644 (file)
--- a/arch/arm/boot/dts/tegra-trimslice.dts
+++ b/arch/arm/boot/dts/tegra-trimslice.dts
@@ -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>;

diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts
index 5ac0aa300fe033206f6edc6cf9221c2761255352..c7d3b87f29dfe0458f047cf64e1dc4f23d5758f9 100644 (file)
--- a/arch/arm/boot/dts/tegra-ventana.dts
+++ b/arch/arm/boot/dts/tegra-ventana.dts
@@ -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 */