ARM: tegra: Rename sdhci nodes to mmc

The new json-schema based validation tools require SD/MMC controller
nodes to be named mmc. Rename all references to them.

Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Cc: Philippe Schenker <philippe.schenker@toradex.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts
index 584db54cd750e882b7793c8af119d7dc2e7c072a..c04162ddec3c27a51cfe46b1979ad800f1287486 100644 (file)
--- a/arch/arm/boot/dts/tegra114-dalmore.dts
+++ b/arch/arm/boot/dts/tegra114-dalmore.dts
@@ -1108,14 +1108,14 @@
                };
        };
 
-       sdhci@78000400 {
+       mmc@78000400 {
                cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
                wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
                status = "okay";
        };
 
-       sdhci@78000600 {
+       mmc@78000600 {
                bus-width = <8>;
                status = "okay";
                non-removable;

diff --git a/arch/arm/boot/dts/tegra114-roth.dts b/arch/arm/boot/dts/tegra114-roth.dts
index 7378b5d6f2fafaae383450785b4194349b064812..07960171fabee5bdb041bc67f5d883bd2f5cd1d8 100644 (file)
--- a/arch/arm/boot/dts/tegra114-roth.dts
+++ b/arch/arm/boot/dts/tegra114-roth.dts
@@ -962,7 +962,7 @@
        };
 
        /* SD card */
-       sdhci@78000400 {
+       mmc@78000400 {
                status = "okay";
                bus-width = <4>;
                vqmmc-supply = <&vddio_sdmmc3>;
@@ -971,7 +971,7 @@
        };
 
        /* eMMC */
-       sdhci@78000600 {
+       mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/boot/dts/tegra114-tn7.dts b/arch/arm/boot/dts/tegra114-tn7.dts
index 0e520ae1109d320659cc61046653e8fce5562601..745d234b105ba3a23fad14c43827ebb2dfa4a924 100644 (file)
--- a/arch/arm/boot/dts/tegra114-tn7.dts
+++ b/arch/arm/boot/dts/tegra114-tn7.dts
@@ -242,7 +242,7 @@
        };
 
        /* eMMC */
-       sdhci@78000600 {
+       mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi
index a06b88b01ef37bc1833d952be5670dd13509c4b1..f511abf3fc81d57715efc8ac3ad1ef54d8cd5819 100644 (file)
--- a/arch/arm/boot/dts/tegra114.dtsi
+++ b/arch/arm/boot/dts/tegra114.dtsi
@@ -646,7 +646,7 @@
                #nvidia,mipi-calibrate-cells = <1>;
        };
 
-       sdhci@78000000 {
+       mmc@78000000 {
                compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
                reg = <0x78000000 0x200>;
                interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
@@ -657,7 +657,7 @@
                status = "disabled";
        };
 
-       sdhci@78000200 {
+       mmc@78000200 {
                compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
                reg = <0x78000200 0x200>;
                interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
@@ -668,7 +668,7 @@
                status = "disabled";
        };
 
-       sdhci@78000400 {
+       mmc@78000400 {
                compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
                reg = <0x78000400 0x200>;
                interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -679,7 +679,7 @@
                status = "disabled";
        };
 
-       sdhci@78000600 {
+       mmc@78000600 {
                compatible = "nvidia,tegra114-sdhci", "nvidia,tegra30-sdhci";
                reg = <0x78000600 0x200>;
                interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm/boot/dts/tegra124-apalis-eval.dts b/arch/arm/boot/dts/tegra124-apalis-eval.dts
index ceb3f6388c7dad3d6bfe8d5493b33c16e0a2d553..28c29b6813a71ae2aa86c82ce5bee00948646ae2 100644 (file)
--- a/arch/arm/boot/dts/tegra124-apalis-eval.dts
+++ b/arch/arm/boot/dts/tegra124-apalis-eval.dts
@@ -130,7 +130,7 @@
        };
 
        /* Apalis MMC1 */
-       sdhci@700b0000 {
+       mmc@700b0000 {
                status = "okay";
                bus-width = <4>;
                /* MMC1_CD# */
@@ -139,7 +139,7 @@
        };
 
        /* Apalis SD1 */
-       sdhci@700b0400 {
+       mmc@700b0400 {
                status = "okay";
                bus-width = <4>;
                /* SD1_CD# */

diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
index 826b776fbe6ff649a945f791fdbef10a17d7f8be..f3afde4106156c68b1de78b55a1329423af1b95b 100644 (file)
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
@@ -132,7 +132,7 @@
        };
 
        /* Apalis MMC1 */
-       sdhci@700b0000 {
+       mmc@700b0000 {
                status = "okay";
                bus-width = <4>;
                /* MMC1_CD# */
@@ -141,7 +141,7 @@
        };
 
        /* Apalis SD1 */
-       sdhci@700b0400 {
+       mmc@700b0400 {
                status = "okay";
                bus-width = <4>;
                /* SD1_CD# */

diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
index de499f736bda379a182a7978d6e16819dfce7eb3..31354c4d773999a7aa28321ef104e710295eca5a 100644 (file)
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
@@ -1916,7 +1916,7 @@
        };
 
        /* eMMC */
-       sdhci@700b0600 {
+       mmc@700b0600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi
index d70a86da4ee4cd63652dbebe820835062b99e470..91f389aa9c7fac98821e885d931363914c3c63ad 100644 (file)
--- a/arch/arm/boot/dts/tegra124-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
@@ -1908,7 +1908,7 @@
        };
 
        /* eMMC */
-       sdhci@700b0600 {
+       mmc@700b0600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
index d2adb510c55859ae7529e225eb4f52953a1644a6..3d0f6cc4b18a3f8ca12028d85b7ea4f81e6ce653 100644 (file)
--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
@@ -1804,7 +1804,7 @@
        };
 
        /* SD card */
-       sdhci@700b0400 {
+       mmc@700b0400 {
                status = "okay";
                cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
                power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
@@ -1814,7 +1814,7 @@
        };
 
        /* eMMC */
-       sdhci@700b0600 {
+       mmc@700b0600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/boot/dts/tegra124-nyan-big.dts b/arch/arm/boot/dts/tegra124-nyan-big.dts
index d97791b989588a493353892542471999b7d8ad85..4d14dec21af6569e9215599adc554f750451600c 100644 (file)
--- a/arch/arm/boot/dts/tegra124-nyan-big.dts
+++ b/arch/arm/boot/dts/tegra124-nyan-big.dts
@@ -20,7 +20,7 @@
                ddc-i2c-bus = <&dpaux>;
        };
 
-       sdhci@700b0400 { /* SD Card on this bus */
+       mmc@700b0400 { /* SD Card on this bus */
                wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_LOW>;
        };
 

diff --git a/arch/arm/boot/dts/tegra124-nyan.dtsi b/arch/arm/boot/dts/tegra124-nyan.dtsi
index cd43863cd98b1750cb7141f5036e9641c25f2676..06e133ad9932a11d945f75a0a6d663488d535d90 100644 (file)
--- a/arch/arm/boot/dts/tegra124-nyan.dtsi
+++ b/arch/arm/boot/dts/tegra124-nyan.dtsi
@@ -495,7 +495,7 @@
                reset-gpios = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_LOW>;
        };
 
-       sdhci@700b0000 { /* WiFi/BT on this bus */
+       mmc@700b0000 { /* WiFi/BT on this bus */
                status = "okay";
                bus-width = <4>;
                no-1-8-v;
@@ -506,7 +506,7 @@
                keep-power-in-suspend;
        };
 
-       sdhci@700b0400 { /* SD Card on this bus */
+       mmc@700b0400 { /* SD Card on this bus */
                status = "okay";
                cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
                power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
@@ -515,7 +515,7 @@
                vqmmc-supply = <&vddio_sdmmc3>;
        };
 
-       sdhci@700b0600 { /* eMMC on this bus */
+       mmc@700b0600 { /* eMMC on this bus */
                status = "okay";
                bus-width = <8>;
                no-1-8-v;

diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts
index a2457c6cc6ee7ce7c457d8c508c5df01df16bf98..56f051b9a538750eedba80bd5e0fd17936647c50 100644 (file)
--- a/arch/arm/boot/dts/tegra124-venice2.dts
+++ b/arch/arm/boot/dts/tegra124-venice2.dts
@@ -1002,7 +1002,7 @@
                };
        };
 
-       sdhci@700b0400 {
+       mmc@700b0400 {
                cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
                power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
                wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_LOW>;
@@ -1011,7 +1011,7 @@
                vqmmc-supply = <&vddio_sdmmc3>;
        };
 
-       sdhci@700b0600 {
+       mmc@700b0600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index 2c992e8e35947877789d4ca319426518ad637fbd..76c1ef9232132639d04681286ee339a1913127d1 100644 (file)
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -833,7 +833,7 @@
                };
        };
 
-       sdhci@700b0000 {
+       mmc@700b0000 {
                compatible = "nvidia,tegra124-sdhci";
                reg = <0x0 0x700b0000 0x0 0x200>;
                interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
@@ -843,7 +843,7 @@
                status = "disabled";
        };
 
-       sdhci@700b0200 {
+       mmc@700b0200 {
                compatible = "nvidia,tegra124-sdhci";
                reg = <0x0 0x700b0200 0x0 0x200>;
                interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
@@ -853,7 +853,7 @@
                status = "disabled";
        };
 
-       sdhci@700b0400 {
+       mmc@700b0400 {
                compatible = "nvidia,tegra124-sdhci";
                reg = <0x0 0x700b0400 0x0 0x200>;
                interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -863,7 +863,7 @@
                status = "disabled";
        };
 
-       sdhci@700b0600 {
+       mmc@700b0600 {
                compatible = "nvidia,tegra124-sdhci";
                reg = <0x0 0x700b0600 0x0 0x200>;
                interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm/boot/dts/tegra20-colibri-eval-v3.dts b/arch/arm/boot/dts/tegra20-colibri-eval-v3.dts
index 37ad508b61d91968cf30b39598cb432e77c449b5..a05fb3853da8ea10bfabdaa98c5c3f34a121740f 100644 (file)
--- a/arch/arm/boot/dts/tegra20-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/tegra20-colibri-eval-v3.dts
@@ -183,7 +183,7 @@
        };
 
        /* SD/MMC */
-       sdhci@c8000600 {
+       mmc@c8000600 {
                status = "okay";
                bus-width = <4>;
                cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; /* MMCD */

diff --git a/arch/arm/boot/dts/tegra20-colibri-iris.dts b/arch/arm/boot/dts/tegra20-colibri-iris.dts
index af474084776965b3d086a3f4853f30ea87de0dfb..425494b9ed541508911c1566ee7efd61c63e0254 100644 (file)
--- a/arch/arm/boot/dts/tegra20-colibri-iris.dts
+++ b/arch/arm/boot/dts/tegra20-colibri-iris.dts
@@ -171,7 +171,7 @@
        };
 
        /* SD/MMC */
-       sdhci@c8000600 {
+       mmc@c8000600 {
                status = "okay";
                bus-width = <4>;
                cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; /* MMCD */

diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
index b051d75d4642f99506496f46f19f636bd9d90959..86494cb4d5a1d93d2d2cfb823eba9abf933d5396 100644 (file)
--- a/arch/arm/boot/dts/tegra20-harmony.dts
+++ b/arch/arm/boot/dts/tegra20-harmony.dts
@@ -613,7 +613,7 @@
                status = "okay";
        };
 
-       sdhci@c8000200 {
+       mmc@c8000200 {
                status = "okay";
                cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
                wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
@@ -621,7 +621,7 @@
                bus-width = <4>;
        };
 
-       sdhci@c8000600 {
+       mmc@c8000600 {
                status = "okay";
                cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>;
                wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts
index 2a0e5754f50f761327d26a258a6b495525a1dec5..91b6bb82e960def97f575e73b22dc1974d15d792 100644 (file)
--- a/arch/arm/boot/dts/tegra20-paz00.dts
+++ b/arch/arm/boot/dts/tegra20-paz00.dts
@@ -543,7 +543,7 @@
                status = "okay";
        };
 
-       sdhci@c8000000 {
+       mmc@c8000000 {
                status = "okay";
                cd-gpios = <&gpio TEGRA_GPIO(V, 5) GPIO_ACTIVE_LOW>;
                wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
@@ -551,7 +551,7 @@
                bus-width = <4>;
        };
 
-       sdhci@c8000600 {
+       mmc@c8000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts
index 9a1ab4bd43e0f526a0a8f0d120e05a2ef0458d49..f1baf16c501089fdfff3cd3841cebbe6fe3d3791 100644 (file)
--- a/arch/arm/boot/dts/tegra20-seaboard.dts
+++ b/arch/arm/boot/dts/tegra20-seaboard.dts
@@ -760,14 +760,14 @@
                status = "okay";
        };
 
-       sdhci@c8000000 {
+       mmc@c8000000 {
                status = "okay";
                power-gpios = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
                keep-power-in-suspend;
        };
 
-       sdhci@c8000400 {
+       mmc@c8000400 {
                status = "okay";
                cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
                wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
@@ -775,7 +775,7 @@
                bus-width = <4>;
        };
 
-       sdhci@c8000600 {
+       mmc@c8000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/boot/dts/tegra20-tamonten.dtsi b/arch/arm/boot/dts/tegra20-tamonten.dtsi
index 9b02b428c497aaa485c0f03a8eb200df73306fa6..95e6bccdb4f6efb872038d566f8e322d9db3761d 100644 (file)
--- a/arch/arm/boot/dts/tegra20-tamonten.dtsi
+++ b/arch/arm/boot/dts/tegra20-tamonten.dtsi
@@ -495,7 +495,7 @@
                status = "okay";
        };
 
-       sdhci@c8000600 {
+       mmc@c8000600 {
                cd-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_LOW>;
                wp-gpios = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;

diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
index 0c65a658be704d280ffeea802380416a608e6d41..4bc87bc0c2a45afd2fe64e5ee97c005eed7f3f85 100644 (file)
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -366,13 +366,13 @@
                status = "okay";
        };
 
-       sdhci@c8000000 {
+       mmc@c8000000 {
                status = "okay";
                broken-cd;
                bus-width = <4>;
        };
 
-       sdhci@c8000600 {
+       mmc@c8000600 {
                status = "okay";
                cd-gpios = <&gpio TEGRA_GPIO(P, 1) GPIO_ACTIVE_LOW>;
                wp-gpios = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/tegra20-ventana.dts b/arch/arm/boot/dts/tegra20-ventana.dts
index ccc24674be030f8940b88ab66a1b8cc76037bbee..b158771ac0b7da018bcd60fe00f9fd0ed8c16dc1 100644 (file)
--- a/arch/arm/boot/dts/tegra20-ventana.dts
+++ b/arch/arm/boot/dts/tegra20-ventana.dts
@@ -554,14 +554,14 @@
                status = "okay";
        };
 
-       sdhci@c8000000 {
+       mmc@c8000000 {
                status = "okay";
                power-gpios = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
                keep-power-in-suspend;
        };
 
-       sdhci@c8000400 {
+       mmc@c8000400 {
                status = "okay";
                cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
                wp-gpios = <&gpio TEGRA_GPIO(H, 1) GPIO_ACTIVE_HIGH>;
@@ -569,7 +569,7 @@
                bus-width = <4>;
        };
 
-       sdhci@c8000600 {
+       mmc@c8000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index f0a172c61b26d3c12bbb06f18b8a09ac411f006c..be8299ce82d069354644558cb27029cadb202a68 100644 (file)
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -807,7 +807,7 @@
                status = "disabled";
        };
 
-       sdhci@c8000000 {
+       mmc@c8000000 {
                compatible = "nvidia,tegra20-sdhci";
                reg = <0xc8000000 0x200>;
                interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
@@ -817,7 +817,7 @@
                status = "disabled";
        };
 
-       sdhci@c8000200 {
+       mmc@c8000200 {
                compatible = "nvidia,tegra20-sdhci";
                reg = <0xc8000200 0x200>;
                interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
@@ -827,7 +827,7 @@
                status = "disabled";
        };
 
-       sdhci@c8000400 {
+       mmc@c8000400 {
                compatible = "nvidia,tegra20-sdhci";
                reg = <0xc8000400 0x200>;
                interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -837,7 +837,7 @@
                status = "disabled";
        };
 
-       sdhci@c8000600 {
+       mmc@c8000600 {
                compatible = "nvidia,tegra20-sdhci";
                reg = <0xc8000600 0x200>;
                interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm/boot/dts/tegra30-apalis-eval.dts b/arch/arm/boot/dts/tegra30-apalis-eval.dts
index b39c26806bf213261b96b742f1bba415d2000866..9f653ef41da44ac575513a6706bcc18b0b3e67c0 100644 (file)
--- a/arch/arm/boot/dts/tegra30-apalis-eval.dts
+++ b/arch/arm/boot/dts/tegra30-apalis-eval.dts
@@ -120,7 +120,7 @@
        };
 
        /* Apalis SD1 */
-       sdhci@78000000 {
+       mmc@78000000 {
                status = "okay";
                bus-width = <4>;
                /* SD1_CD# */
@@ -129,7 +129,7 @@
        };
 
        /* Apalis MMC1 */
-       sdhci@78000400 {
+       mmc@78000400 {
                status = "okay";
                bus-width = <8>;
                /* MMC1_CD# */

diff --git a/arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts b/arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts
index e29dca92ba0a8d4642e3dde454b5e1063d4fc49b..dc633e52982259b8d764e98ca21dddd583706ce1 100644 (file)
--- a/arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts
+++ b/arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts
@@ -121,7 +121,7 @@
        };
 
        /* Apalis SD1 */
-       sdhci@78000000 {
+       mmc@78000000 {
                status = "okay";
                bus-width = <4>;
                /* SD1_CD# */
@@ -130,7 +130,7 @@
        };
 
        /* Apalis MMC1 */
-       sdhci@78000400 {
+       mmc@78000400 {
                status = "okay";
                bus-width = <8>;
                /* MMC1_CD# */

diff --git a/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi b/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi
index 387b17458e228224dc9105cb42d3fbc7ded3f307..9421063cd86cacfc1e59bbd796f647163a9bad90 100644 (file)
--- a/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi
+++ b/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi
@@ -1112,7 +1112,7 @@
        };
 
        /* eMMC */
-       sdhci@78000600 {
+       mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegra30-apalis.dtsi
index 6648506f3aa488ded7bb22078793e1fadc0c663a..d13f6b0c7c0c7f3f226e064c2507da0701563653 100644 (file)
--- a/arch/arm/boot/dts/tegra30-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra30-apalis.dtsi
@@ -1094,7 +1094,7 @@
        };
 
        /* eMMC */
-       sdhci@78000600 {
+       mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts
index 3211c61f956c9c66ab54f68f7d12fab92f5babab..e0624b74fb5030d59691145b028cf54ee2eb7d29 100644 (file)
--- a/arch/arm/boot/dts/tegra30-beaver.dts
+++ b/arch/arm/boot/dts/tegra30-beaver.dts
@@ -1922,7 +1922,7 @@
                };
        };
 
-       sdhci@78000000 {
+       mmc@78000000 {
                status = "okay";
                vqmmc-supply = <&ldo5_reg>;
                cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
@@ -1931,7 +1931,7 @@
                bus-width = <4>;
        };
 
-       sdhci@78000600 {
+       mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/boot/dts/tegra30-cardhu-a02.dts b/arch/arm/boot/dts/tegra30-cardhu-a02.dts
index 09e57c5f698db0271a48b7e777f1ffa2374c525e..4899e05a0d9c4ebd25dbf16e88660007c9ba09ba 100644 (file)
--- a/arch/arm/boot/dts/tegra30-cardhu-a02.dts
+++ b/arch/arm/boot/dts/tegra30-cardhu-a02.dts
@@ -9,7 +9,7 @@
        model = "NVIDIA Tegra30 Cardhu A02 evaluation board";
        compatible = "nvidia,cardhu-a02", "nvidia,cardhu", "nvidia,tegra30";
 
-       sdhci@78000400 {
+       mmc@78000400 {
                status = "okay";
                power-gpios = <&gpio TEGRA_GPIO(D, 4) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;

diff --git a/arch/arm/boot/dts/tegra30-cardhu-a04.dts b/arch/arm/boot/dts/tegra30-cardhu-a04.dts
index c9ad4e566407f28959bdf35ea7be09766508ca7c..c1c0ca628af1fec80ac2ed26f10eb11a09fdcf90 100644 (file)
--- a/arch/arm/boot/dts/tegra30-cardhu-a04.dts
+++ b/arch/arm/boot/dts/tegra30-cardhu-a04.dts
@@ -11,7 +11,7 @@
        model = "NVIDIA Tegra30 Cardhu A04 (A05, A06, A07) evaluation board";
        compatible = "nvidia,cardhu-a04", "nvidia,cardhu", "nvidia,tegra30";
 
-       sdhci@78000400 {
+       mmc@78000400 {
                status = "okay";
                power-gpios = <&gpio TEGRA_GPIO(D, 3) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;

diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
index c8dc3b6ab2f6005fa084f98533706d50d81320cf..dab9989fa76051ffe1725ccc7fcce2c4d4456efb 100644 (file)
--- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -384,7 +384,7 @@
                };
        };
 
-       sdhci@78000000 {
+       mmc@78000000 {
                status = "okay";
                cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
                wp-gpios = <&gpio TEGRA_GPIO(T, 3) GPIO_ACTIVE_HIGH>;
@@ -392,7 +392,7 @@
                bus-width = <4>;
        };
 
-       sdhci@78000600 {
+       mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
index 8e106e784dce563970e1140d3a9d95da427e3573..7d4a6ca4936a01d8fad9df8aaf7ec7b4f8caa7c5 100644 (file)
--- a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
@@ -98,7 +98,7 @@
        };
 
        /* SD/MMC */
-       sdhci@78000200 {
+       mmc@78000200 {
                status = "okay";
                bus-width = <4>;
                cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; /* MMCD */

diff --git a/arch/arm/boot/dts/tegra30-colibri.dtsi b/arch/arm/boot/dts/tegra30-colibri.dtsi
index adba554381c7824b805d38910c2569b1a91f2eaa..a7bfe26f038d6bdfeca4853ff996a8d8db0584e6 100644 (file)
--- a/arch/arm/boot/dts/tegra30-colibri.dtsi
+++ b/arch/arm/boot/dts/tegra30-colibri.dtsi
@@ -933,7 +933,7 @@
        };
 
        /* eMMC */
-       sdhci@78000600 {
+       mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi
index 27000f0ba35b61cbb0f5d41887caf00907939176..4780ae3b000e650bf41ed086fc1424b69c67b486 100644 (file)
--- a/arch/arm/boot/dts/tegra30.dtsi
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@ -853,7 +853,7 @@
                };
        };
 
-       sdhci@78000000 {
+       mmc@78000000 {
                compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
                reg = <0x78000000 0x200>;
                interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
@@ -863,7 +863,7 @@
                status = "disabled";
        };
 
-       sdhci@78000200 {
+       mmc@78000200 {
                compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
                reg = <0x78000200 0x200>;
                interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
@@ -873,7 +873,7 @@
                status = "disabled";
        };
 
-       sdhci@78000400 {
+       mmc@78000400 {
                compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
                reg = <0x78000400 0x200>;
                interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -883,7 +883,7 @@
                status = "disabled";
        };
 
-       sdhci@78000600 {
+       mmc@78000600 {
                compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
                reg = <0x78000600 0x200>;
                interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;