ARM: tegra: rename sdhci nodes to mmc

Align with existing Linux Tegra device trees to simplify using U-Boot
device trees as a base for future Linux adaptations.

Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>

diff --git a/arch/arm/dts/tegra114-asus-tf701t.dts b/arch/arm/dts/tegra114-asus-tf701t.dts
index 2505b9bb72683613826d9fd9e6a9a60d0ec4e7eb..bd43a80a20832c4378bdbe901821da777008f77c 100644 (file)
--- a/arch/arm/dts/tegra114-asus-tf701t.dts
+++ b/arch/arm/dts/tegra114-asus-tf701t.dts
@@ -1151,7 +1151,7 @@
                };
        };
 
-       sdmmc3: sdhci@78000400 {
+       sdmmc3: mmc@78000400 {
                status = "okay";
                bus-width = <4>;
 
@@ -1165,7 +1165,7 @@
                vqmmc-supply = <&vddio_usd>;
        };
 
-       sdmmc4: sdhci@78000600 {
+       sdmmc4: mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra114-dalmore.dts b/arch/arm/dts/tegra114-dalmore.dts
index 18bcb75fafa09f65d061bb27e0074e78bc3ca76a..48708f37246780f69919e09c6a51a79152c62362 100644 (file)
--- a/arch/arm/dts/tegra114-dalmore.dts
+++ b/arch/arm/dts/tegra114-dalmore.dts
@@ -16,8 +16,8 @@
                i2c2 = "/i2c@7000c400";
                i2c3 = "/i2c@7000c500";
                i2c4 = "/i2c@7000c700";
-               mmc0 = "/sdhci@78000600";
-               mmc1 = "/sdhci@78000400";
+               mmc0 = "/mmc@78000600";
+               mmc1 = "/mmc@78000400";
                usb0 = "/usb@7d000000";
                usb1 = "/usb@7d008000";
        };
@@ -57,13 +57,13 @@
                spi-max-frequency = <25000000>;
        };
 
-       sdhci@78000400 {
+       mmc@78000400 {
                cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
                bus-width = <4>;
                status = "okay";
        };
 
-       sdhci@78000600 {
+       mmc@78000600 {
                bus-width = <8>;
                status = "okay";
                non-removable;

diff --git a/arch/arm/dts/tegra114-microsoft-surface-2-common.dtsi b/arch/arm/dts/tegra114-microsoft-surface-2-common.dtsi
index 79369753a1717c10fa88ebffbbdd2fbda1bd7a6b..f735f5060ce75507fa6ca32d514fea57d58b497f 100644 (file)
--- a/arch/arm/dts/tegra114-microsoft-surface-2-common.dtsi
+++ b/arch/arm/dts/tegra114-microsoft-surface-2-common.dtsi
@@ -814,7 +814,7 @@
                };
        };
 
-       sdmmc3: sdhci@78000400 {
+       sdmmc3: mmc@78000400 {
                status = "okay";
                bus-width = <4>;
 
@@ -827,7 +827,7 @@
                vqmmc-supply = <&vddio_usd>;
        };
 
-       sdmmc4: sdhci@78000600 {
+       sdmmc4: mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra114-nvidia-tegratab.dts b/arch/arm/dts/tegra114-nvidia-tegratab.dts
index f65772a8e019b47ba7fce652e3db532af355c7f0..6ff2850b9117434c78dda037a2edbdf3c70c7b5e 100644 (file)
--- a/arch/arm/dts/tegra114-nvidia-tegratab.dts
+++ b/arch/arm/dts/tegra114-nvidia-tegratab.dts
@@ -953,7 +953,7 @@
                };
        };
 
-       sdmmc3: sdhci@78000400 {
+       sdmmc3: mmc@78000400 {
                status = "okay";
                bus-width = <4>;
 
@@ -967,7 +967,7 @@
                vqmmc-supply = <&vddio_usd>;
        };
 
-       sdmmc4: sdhci@78000600 {
+       sdmmc4: mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra114.dtsi b/arch/arm/dts/tegra114.dtsi
index 250d692f6bfbece38177f59b8bcdd2429c672536..0a783fbc95d268e3bc9aa36e872f16450f7a2cf4 100644 (file)
--- a/arch/arm/dts/tegra114.dtsi
+++ b/arch/arm/dts/tegra114.dtsi
@@ -631,7 +631,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>;
@@ -641,7 +641,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>;
@@ -651,7 +651,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>;
@@ -661,7 +661,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/dts/tegra124-apalis.dts b/arch/arm/dts/tegra124-apalis.dts
index 08184ab3ac29d0d7901027a6ac5d1cbe93611646..5ac08037a9244db70fde77802f4f5938496e61b8 100644 (file)
--- a/arch/arm/dts/tegra124-apalis.dts
+++ b/arch/arm/dts/tegra124-apalis.dts
@@ -54,9 +54,9 @@
                i2c1 = "/i2c@7000c000";
                i2c2 = "/i2c@7000c400";
                i2c3 = "/i2c@7000c500";
-               mmc0 = "/sdhci@700b0600";
-               mmc1 = "/sdhci@700b0000";
-               mmc2 = "/sdhci@700b0400";
+               mmc0 = "/mmc@700b0600";
+               mmc1 = "/mmc@700b0000";
+               mmc2 = "/mmc@700b0400";
                rtc0 = "/i2c@7000c000/rtc@68";
                rtc1 = "/i2c@7000d000/pmic@40";
                rtc2 = "/rtc@7000e000";
@@ -1958,7 +1958,7 @@
        };
 
        /* Apalis MMC1 */
-       sdhci@700b0000 {
+       mmc@700b0000 {
                status = "okay";
                /* MMC1_CD# */
                cd-gpios = <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_LOW>;
@@ -1967,7 +1967,7 @@
        };
 
        /* Apalis SD1 */
-       sdhci@700b0400 {
+       mmc@700b0400 {
                status = "okay";
                /* SD1_CD# */
                cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
@@ -1976,7 +1976,7 @@
        };
 
        /* eMMC */
-       sdhci@700b0600 {
+       mmc@700b0600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra124-cei-tk1-som.dts b/arch/arm/dts/tegra124-cei-tk1-som.dts
index e5b41f3183cd98b02bc2c09bcd06368e81b8a57e..59901a3439b5f2ce8a1daf182e6cb45122bf8411 100644 (file)
--- a/arch/arm/dts/tegra124-cei-tk1-som.dts
+++ b/arch/arm/dts/tegra124-cei-tk1-som.dts
@@ -16,8 +16,8 @@
                i2c2 = "/i2c@7000c400";
                i2c3 = "/i2c@7000c500";
                i2c4 = "/i2c@7000c700";
-               mmc0 = "/sdhci@700b0600";
-               mmc1 = "/sdhci@700b0400";
+               mmc0 = "/mmc@700b0600";
+               mmc1 = "/mmc@700b0400";
                spi0 = "/spi@7000d400";
                spi1 = "/spi@7000da00";
                usb0 = "/usb@7d000000";
@@ -297,7 +297,7 @@
                };
        };
 
-       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>;
@@ -305,7 +305,7 @@
                bus-width = <4>;
        };
 
-       sdhci@700b0600 {
+       mmc@700b0600 {
                status = "okay";
                bus-width = <8>;
        };

diff --git a/arch/arm/dts/tegra124-jetson-tk1.dts b/arch/arm/dts/tegra124-jetson-tk1.dts
index 59e080a8af6f6346a4d8677ac7a7fa032cdc27dc..7d19a25e278fcf300840c4c33b7325558416f767 100644 (file)
--- a/arch/arm/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/dts/tegra124-jetson-tk1.dts
@@ -16,8 +16,8 @@
                i2c2 = "/i2c@7000c400";
                i2c3 = "/i2c@7000c500";
                i2c4 = "/i2c@7000c700";
-               mmc0 = "/sdhci@700b0600";
-               mmc1 = "/sdhci@700b0400";
+               mmc0 = "/mmc@700b0600";
+               mmc1 = "/mmc@700b0400";
                spi0 = "/spi@7000d400";
                spi1 = "/spi@7000da00";
                usb0 = "/usb@7d000000";
@@ -301,7 +301,7 @@
                };
        };
 
-       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>;
@@ -309,7 +309,7 @@
                bus-width = <4>;
        };
 
-       sdhci@700b0600 {
+       mmc@700b0600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra124-nyan-big.dts b/arch/arm/dts/tegra124-nyan-big.dts
index f1c97052a847e648e5ca2aecaadaa5dd33c73c12..b942d92e900ca858ea36d7965164196a93eb2739 100644 (file)
--- a/arch/arm/dts/tegra124-nyan-big.dts
+++ b/arch/arm/dts/tegra124-nyan-big.dts
@@ -16,8 +16,8 @@
                i2c5 = "/i2c@7000d100";
                rtc0 = "/i2c@7000d000/pmic@40";
                rtc1 = "/rtc@7000e000";
-               mmc0 = "/sdhci@700b0600";
-               mmc1 = "/sdhci@700b0400";
+               mmc0 = "/mmc@700b0600";
+               mmc1 = "/mmc@700b0400";
                spi0 = "/spi@7000d400";
                spi1 = "/spi@7000da00";
                usb0 = "/usb@7d000000";
@@ -59,7 +59,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/dts/tegra124-nyan.dtsi b/arch/arm/dts/tegra124-nyan.dtsi
index 2b28fe14970b172d7805fd5d9aa912a43e217c2c..7b465c601af060efb68658bca6138356fb4abfcd 100644 (file)
--- a/arch/arm/dts/tegra124-nyan.dtsi
+++ b/arch/arm/dts/tegra124-nyan.dtsi
@@ -370,7 +370,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";
                power-gpios = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
@@ -382,7 +382,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>;
@@ -392,7 +392,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/dts/tegra124-venice2.dts b/arch/arm/dts/tegra124-venice2.dts
index 7e9c6aa1839e6b25cb0fdbb2d28acc0ede64bdd3..0e855d8bc30d33cd60b6665590ae39f610bdcd78 100644 (file)
--- a/arch/arm/dts/tegra124-venice2.dts
+++ b/arch/arm/dts/tegra124-venice2.dts
@@ -17,8 +17,8 @@
                i2c3 = "/i2c@7000c500";
                i2c4 = "/i2c@7000c700";
                i2c5 = "/i2c@7000d100";
-               mmc0 = "/sdhci@700b0600";
-               mmc1 = "/sdhci@700b0400";
+               mmc0 = "/mmc@700b0600";
+               mmc1 = "/mmc@700b0400";
                spi0 = "/spi@7000d400";
                spi1 = "/spi@7000da00";
                usb0 = "/usb@7d000000";
@@ -70,7 +70,7 @@
                spi-max-frequency = <25000000>;
        };
 
-       sdhci@700b0400 {
+       mmc@700b0400 {
                status = "okay";
                cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
                power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
@@ -78,7 +78,7 @@
                bus-width = <4>;
        };
 
-       sdhci@700b0600 {
+       mmc@700b0600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra124-xiaomi-mocha.dts b/arch/arm/dts/tegra124-xiaomi-mocha.dts
index 64386f2b7b702e35fcfd572e91b7347ca61343fa..09b5c1eea056e0cf7ad953d27a42cf565b7b545f 100644 (file)
--- a/arch/arm/dts/tegra124-xiaomi-mocha.dts
+++ b/arch/arm/dts/tegra124-xiaomi-mocha.dts
@@ -476,7 +476,7 @@
                };
        };
 
-       sdmmc3: sdhci@700b0400 {
+       sdmmc3: mmc@700b0400 {
                status = "okay";
                bus-width = <4>;
 
@@ -487,7 +487,7 @@
                vqmmc-supply = <&vddio_usd>;
        };
 
-       sdmmc4: sdhci@700b0600 {
+       sdmmc4: mmc@700b0600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra124.dtsi b/arch/arm/dts/tegra124.dtsi
index cac9b1123020e4434fd1fd15e3ce0774e6982a42..1c62d1f6e7b9345fdebd2c508ea141c5ab15d5cf 100644 (file)
--- a/arch/arm/dts/tegra124.dtsi
+++ b/arch/arm/dts/tegra124.dtsi
@@ -717,7 +717,7 @@
                #phy-cells = <1>;
        };
 
-       sdhci@700b0000 {
+       mmc@700b0000 {
                compatible = "nvidia,tegra124-sdhci";
                reg = <0x700b0000 0x200>;
                interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
@@ -727,7 +727,7 @@
                status = "disabled";
        };
 
-       sdhci@700b0200 {
+       mmc@700b0200 {
                compatible = "nvidia,tegra124-sdhci";
                reg = <0x700b0200 0x200>;
                interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
@@ -737,7 +737,7 @@
                status = "disabled";
        };
 
-       sdhci@700b0400 {
+       mmc@700b0400 {
                compatible = "nvidia,tegra124-sdhci";
                reg = <0x700b0400 0x200>;
                interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -747,7 +747,7 @@
                status = "disabled";
        };
 
-       sdhci@700b0600 {
+       mmc@700b0600 {
                compatible = "nvidia,tegra124-sdhci";
                reg = <0x700b0600 0x200>;
                interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm/dts/tegra186-p2771-0000-000.dts b/arch/arm/dts/tegra186-p2771-0000-000.dts
index 84e850d6fca6d6675eadcb1a61d9dea7ebe205ee..39076058bfb43f5bede56895334f9a2b748dc529 100644 (file)
--- a/arch/arm/dts/tegra186-p2771-0000-000.dts
+++ b/arch/arm/dts/tegra186-p2771-0000-000.dts
@@ -6,7 +6,7 @@
        model = "NVIDIA P2771-0000-000";
        compatible = "nvidia,p2771-0000-000", "nvidia,p2771-0000", "nvidia,tegra186";
 
-       sdhci@3400000 {
+       mmc@3400000 {
                cd-gpios = <&gpio_main TEGRA_MAIN_GPIO(P, 6) GPIO_ACTIVE_LOW>;
                power-gpios = <&gpio_main TEGRA_MAIN_GPIO(P, 5) GPIO_ACTIVE_HIGH>;
        };

diff --git a/arch/arm/dts/tegra186-p2771-0000-500.dts b/arch/arm/dts/tegra186-p2771-0000-500.dts
index 1ac8ab431e9017b3c0e7735668e6835c9a022722..cb36dae80e59a1dd570d9e4f171559db0c32b288 100644 (file)
--- a/arch/arm/dts/tegra186-p2771-0000-500.dts
+++ b/arch/arm/dts/tegra186-p2771-0000-500.dts
@@ -6,7 +6,7 @@
        model = "NVIDIA P2771-0000-500";
        compatible = "nvidia,p2771-0000-500", "nvidia,p2771-0000", "nvidia,tegra186";
 
-       sdhci@3400000 {
+       mmc@3400000 {
                cd-gpios = <&gpio_main TEGRA_MAIN_GPIO(P, 5) GPIO_ACTIVE_LOW>;
                power-gpios = <&gpio_main TEGRA_MAIN_GPIO(P, 6) GPIO_ACTIVE_HIGH>;
        };

diff --git a/arch/arm/dts/tegra186-p2771-0000.dtsi b/arch/arm/dts/tegra186-p2771-0000.dtsi
index 7cda0b41f74b61a84e8181352e4eb6a646113ba7..7bbf81fe2bf981350b481f56e893e918c0ce2662 100644 (file)
--- a/arch/arm/dts/tegra186-p2771-0000.dtsi
+++ b/arch/arm/dts/tegra186-p2771-0000.dtsi
@@ -10,8 +10,8 @@
 
        aliases {
                ethernet = "/ethernet@2490000";
-               mmc0 = "/sdhci@3460000";
-               mmc1 = "/sdhci@3400000";
+               mmc0 = "/mmc@3460000";
+               mmc1 = "/mmc@3400000";
                i2c0 = "/bpmp/i2c";
                i2c1 = "/i2c@3160000";
                i2c2 = "/i2c@c240000";
@@ -48,13 +48,13 @@
                status = "okay";
        };
 
-       sdhci@3400000 {
+       mmc@3400000 {
                status = "okay";
                wp-gpios = <&gpio_main TEGRA_MAIN_GPIO(P, 4) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
        };
 
-       sdhci@3460000 {
+       mmc@3460000 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra186.dtsi b/arch/arm/dts/tegra186.dtsi
index edcb7aacb8ee6e3062e5b5ce60e788af92435c4c..0cabf608a9ef2ab87fb0ccfe51004df3afbc6aa9 100644 (file)
--- a/arch/arm/dts/tegra186.dtsi
+++ b/arch/arm/dts/tegra186.dtsi
@@ -136,7 +136,7 @@
                status = "disabled";
        };
 
-       sdhci@3400000 {
+       mmc@3400000 {
                compatible = "nvidia,tegra186-sdhci";
                reg = <0x0 0x03400000 0x0 0x200>;
                resets = <&bpmp TEGRA186_RESET_SDMMC1>;
@@ -146,7 +146,7 @@
                status = "disabled";
        };
 
-       sdhci@3460000 {
+       mmc@3460000 {
                compatible = "nvidia,tegra186-sdhci";
                reg = <0x0 0x03460000 0x0 0x200>;
                resets = <&bpmp TEGRA186_RESET_SDMMC4>;

diff --git a/arch/arm/dts/tegra20-acer-a500-picasso.dts b/arch/arm/dts/tegra20-acer-a500-picasso.dts
index 4afde7663304cec53bcc8469c5e0ff209beca13c..d8d2d10a48a00b3a09da7660402ea14d38687bca 100644 (file)
--- a/arch/arm/dts/tegra20-acer-a500-picasso.dts
+++ b/arch/arm/dts/tegra20-acer-a500-picasso.dts
@@ -400,7 +400,7 @@
                nvidia,xcvr-lsrslew = <2>;
        };
 
-       sdmmc3: sdhci@c8000400 {
+       sdmmc3: mmc@c8000400 {
                status = "okay";
                bus-width = <4>;
 
@@ -412,7 +412,7 @@
                vqmmc-supply = <&vdd_3v3_sys>;
        };
 
-       sdmmc4: sdhci@c8000600 {
+       sdmmc4: mmc@c8000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra20-asus-transformer.dtsi b/arch/arm/dts/tegra20-asus-transformer.dtsi
index df078a6fcdc58388a28c24ee766925dd21f019f4..db6bed3e5d232226065eb9993c8b78b014cd168f 100644 (file)
--- a/arch/arm/dts/tegra20-asus-transformer.dtsi
+++ b/arch/arm/dts/tegra20-asus-transformer.dtsi
@@ -437,7 +437,7 @@
                status = "okay";
        };
 
-       sdmmc3: sdhci@c8000400 {
+       sdmmc3: mmc@c8000400 {
                status = "okay";
                bus-width = <4>;
 
@@ -449,7 +449,7 @@
                vqmmc-supply = <&vdd_3v3_sys>;
        };
 
-       sdmmc4: sdhci@c8000600 {
+       sdmmc4: mmc@c8000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra20-colibri.dts b/arch/arm/dts/tegra20-colibri.dts
index 11023968f4129f55eac0f85abe4cea8837099f71..776491a515ee058def8cc3a32a0df2a9131c9972 100644 (file)
--- a/arch/arm/dts/tegra20-colibri.dts
+++ b/arch/arm/dts/tegra20-colibri.dts
@@ -14,7 +14,7 @@
                i2c0 = "/i2c@7000d000";
                i2c1 = "/i2c@7000c000";
                i2c2 = "/i2c@7000c400";
-               mmc0 = "/sdhci@c8000600";
+               mmc0 = "/mmc@c8000600";
                usb0 = "/usb@c5000000";
                usb1 = "/usb@c5004000"; /* On-module only, for ASIX */
                usb2 = "/usb@c5008000";
@@ -106,7 +106,7 @@
                nvidia,vbus-gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;
        };
 
-       sdhci@c8000600 {
+       mmc@c8000600 {
                status = "okay";
                bus-width = <4>;
                cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/dts/tegra20-harmony.dts b/arch/arm/dts/tegra20-harmony.dts
index 7fe7d52096c4d8c7a069e770dc8d5fa7269bcc6b..60cc7b32bb08b54c533d725a6cac4603a3c1a58c 100644 (file)
--- a/arch/arm/dts/tegra20-harmony.dts
+++ b/arch/arm/dts/tegra20-harmony.dts
@@ -18,8 +18,8 @@
                usb0 = "/usb@c5000000";
                usb1 = "/usb@c5004000";
                usb2 = "/usb@c5008000";
-               mmc0 = "/sdhci@c8000600";
-               mmc1 = "/sdhci@c8000200";
+               mmc0 = "/mmc@c8000600";
+               mmc1 = "/mmc@c8000200";
        };
 
        memory {
@@ -645,7 +645,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>;
@@ -653,7 +653,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/dts/tegra20-lg-star.dts b/arch/arm/dts/tegra20-lg-star.dts
index 8012b57e5bbedda93b309ecbddffe222015a7af0..912c0b6051be2ed3e3c5bb1893618709efa8e426 100644 (file)
--- a/arch/arm/dts/tegra20-lg-star.dts
+++ b/arch/arm/dts/tegra20-lg-star.dts
@@ -413,7 +413,7 @@
                vbus-supply = <&avdd_3v3_usb>;
        };
 
-       sdmmc3: sdhci@c8000400 {
+       sdmmc3: mmc@c8000400 {
                status = "okay";
                bus-width = <4>;
 
@@ -423,7 +423,7 @@
                vqmmc-supply = <&vdd_1v8_vio>;
        };
 
-       sdmmc4: sdhci@c8000600 {
+       sdmmc4: mmc@c8000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra20-medcom-wide.dts b/arch/arm/dts/tegra20-medcom-wide.dts
index 1c79d757467d756290480b236f3edb0241b939e5..00e9272541a1afef81c80eb0c1e9d675c8b7703b 100644 (file)
--- a/arch/arm/dts/tegra20-medcom-wide.dts
+++ b/arch/arm/dts/tegra20-medcom-wide.dts
@@ -12,7 +12,7 @@
 
        aliases {
                usb0 = "/usb@c5008000";
-               mmc0 = "/sdhci@c8000600";
+               mmc0 = "/mmc@c8000600";
        };
 
        memory {

diff --git a/arch/arm/dts/tegra20-motorola-mot.dtsi b/arch/arm/dts/tegra20-motorola-mot.dtsi
index 5a9f58ff17f447467f9b72d533ef23338d368948..b3c0e36340d50c0d47fa67d5d9315f206e0d1874 100644 (file)
--- a/arch/arm/dts/tegra20-motorola-mot.dtsi
+++ b/arch/arm/dts/tegra20-motorola-mot.dtsi
@@ -425,7 +425,7 @@
                vbus-supply = <&avdd_3v3_periph>;
        };
 
-       sdmmc3: sdhci@c8000400 {
+       sdmmc3: mmc@c8000400 {
                status = "okay";
                bus-width = <4>;
 
@@ -435,7 +435,7 @@
                vqmmc-supply = <&vddio_usd>;
        };
 
-       sdmmc4: sdhci@c8000600 {
+       sdmmc4: mmc@c8000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra20-paz00.dts b/arch/arm/dts/tegra20-paz00.dts
index f851767a55f1dd75ff8caa2fde45071ca90210c1..9179951841240c5e446b411c9c40a3d3bae1044b 100644 (file)
--- a/arch/arm/dts/tegra20-paz00.dts
+++ b/arch/arm/dts/tegra20-paz00.dts
@@ -19,8 +19,8 @@
                usb0 = "/usb@c5000000";
                usb1 = "/usb@c5004000";
                usb2 = "/usb@c5008000";
-               mmc0 = "/sdhci@c8000600";
-               mmc1 = "/sdhci@c8000000";
+               mmc0 = "/mmc@c8000600";
+               mmc1 = "/mmc@c8000000";
        };
 
        memory {
@@ -485,7 +485,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>;
@@ -493,7 +493,7 @@
                bus-width = <4>;
        };
 
-       sdhci@c8000600 {
+       mmc@c8000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra20-plutux.dts b/arch/arm/dts/tegra20-plutux.dts
index 1b642be99281b91cb65b1fd47a8ea88615eeba11..8d8672da23d47aba0ec50b35a60ff8e0f97dceaa 100644 (file)
--- a/arch/arm/dts/tegra20-plutux.dts
+++ b/arch/arm/dts/tegra20-plutux.dts
@@ -12,7 +12,7 @@
 
        aliases {
                usb0 = "/usb@c5008000";
-               mmc0 = "/sdhci@c8000600";
+               mmc0 = "/mmc@c8000600";
        };
 
        memory {

diff --git a/arch/arm/dts/tegra20-samsung-bose.dts b/arch/arm/dts/tegra20-samsung-bose.dts
index 5bb9a33adf2ccfd51cb20fae95aaf36493ebc177..64cf8489707f84d65be5aa9d0e0268c59ad0c7db 100644 (file)
--- a/arch/arm/dts/tegra20-samsung-bose.dts
+++ b/arch/arm/dts/tegra20-samsung-bose.dts
@@ -92,7 +92,7 @@
                };
        };
 
-       sdhci@c8000400 {
+       mmc@c8000400 {
                broken-cd;
        };
 

diff --git a/arch/arm/dts/tegra20-samsung-n1-common.dtsi b/arch/arm/dts/tegra20-samsung-n1-common.dtsi
index 7225047caba457f4beb719c8e87b5117ae4134f7..b82e64642481655821ff61fbdeeddec03b3f61f9 100644 (file)
--- a/arch/arm/dts/tegra20-samsung-n1-common.dtsi
+++ b/arch/arm/dts/tegra20-samsung-n1-common.dtsi
@@ -365,7 +365,7 @@
                vbus-supply = <&usb_phy_reg>;
        };
 
-       sdmmc3: sdhci@c8000400 {
+       sdmmc3: mmc@c8000400 {
                status = "okay";
                bus-width = <4>;
 
@@ -373,7 +373,7 @@
                vqmmc-supply = <&vdd_3v3_sys>;
        };
 
-       sdmmc4: sdhci@c8000600 {
+       sdmmc4: mmc@c8000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra20-samsung-n1.dts b/arch/arm/dts/tegra20-samsung-n1.dts
index 930a3195aa02f8c5cd6e56a8621e4ed32e19ff22..82b337973b9f1fd0ea754d5aa00e99c526bdd8e4 100644 (file)
--- a/arch/arm/dts/tegra20-samsung-n1.dts
+++ b/arch/arm/dts/tegra20-samsung-n1.dts
@@ -151,7 +151,7 @@
                };
        };
 
-       sdhci@c8000400 {
+       mmc@c8000400 {
                /* battery blocks the sdcard slot and the device lacks CD pin */
                non-removable;
        };

diff --git a/arch/arm/dts/tegra20-seaboard.dts b/arch/arm/dts/tegra20-seaboard.dts
index 341c7f35836a88e07ebe7ebe1ce65647403c41e7..dbb2e49962e9e1b09f480b96997e968194bd5dd6 100644 (file)
--- a/arch/arm/dts/tegra20-seaboard.dts
+++ b/arch/arm/dts/tegra20-seaboard.dts
@@ -19,8 +19,8 @@
                rtc0 = "/i2c@7000d000/tps6586x@34";
                rtc1 = "/rtc@7000e000";
                serial0 = &uartd;
-               mmc0 = "/sdhci@c8000600";
-               mmc1 = "/sdhci@c8000400";
+               mmc0 = "/mmc@c8000600";
+               mmc1 = "/mmc@c8000400";
        };
 
        chosen {
@@ -803,14 +803,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>;
@@ -818,7 +818,7 @@
                bus-width = <4>;
        };
 
-       sdhci@c8000600 {
+       mmc@c8000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra20-tamonten.dtsi b/arch/arm/dts/tegra20-tamonten.dtsi
index f13ef4d05a841772506121e97f91f7aca31ebd67..98fa51bed30639658e97d3d135301d1221b069d4 100644 (file)
--- a/arch/arm/dts/tegra20-tamonten.dtsi
+++ b/arch/arm/dts/tegra20-tamonten.dtsi
@@ -476,7 +476,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/dts/tegra20-tec.dts b/arch/arm/dts/tegra20-tec.dts
index 4733c8134900b73df073f706ad66928518d98fc4..b26979496c602842fb018fe1e60ef79d17c86d72 100644 (file)
--- a/arch/arm/dts/tegra20-tec.dts
+++ b/arch/arm/dts/tegra20-tec.dts
@@ -12,7 +12,7 @@
 
        aliases {
                usb0 = "/usb@c5008000";
-               mmc0 = "/sdhci@c8000600";
+               mmc0 = "/mmc@c8000600";
        };
 
        memory {

diff --git a/arch/arm/dts/tegra20-trimslice.dts b/arch/arm/dts/tegra20-trimslice.dts
index fa942d2607880622c993de75fa5dbf190e2c547a..9542eb6c41b96d101a3f39c22cea15e62be68ef1 100644 (file)
--- a/arch/arm/dts/tegra20-trimslice.dts
+++ b/arch/arm/dts/tegra20-trimslice.dts
@@ -12,8 +12,8 @@
 
        aliases {
                usb0 = "/usb@c5000000";
-               mmc0 = "/sdhci@c8000600";
-               mmc1 = "/sdhci@c8000000";
+               mmc0 = "/mmc@c8000600";
+               mmc1 = "/mmc@c8000000";
                spi0 = "/spi@7000c380";
        };
 
@@ -55,12 +55,12 @@
                nvidia,vbus-gpio = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
        };
 
-       sdhci@c8000000 {
+       mmc@c8000000 {
                status = "okay";
                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/dts/tegra20-ventana.dts b/arch/arm/dts/tegra20-ventana.dts
index 85cd1e39bda7739dd2de118c0965ab77f61b9ad6..50cf78e4170e79ef6cb5b3cb2a58911eab096f4c 100644 (file)
--- a/arch/arm/dts/tegra20-ventana.dts
+++ b/arch/arm/dts/tegra20-ventana.dts
@@ -18,8 +18,8 @@
                usb0 = "/usb@c5000000";
                usb1 = "/usb@c5004000";
                usb2 = "/usb@c5008000";
-               mmc0 = "/sdhci@c8000600";
-               mmc1 = "/sdhci@c8000400";
+               mmc0 = "/mmc@c8000600";
+               mmc1 = "/mmc@c8000400";
        };
 
        memory {
@@ -576,14 +576,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>;
@@ -591,7 +591,7 @@
                bus-width = <4>;
        };
 
-       sdhci@c8000600 {
+       mmc@c8000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra20.dtsi b/arch/arm/dts/tegra20.dtsi
index 4a40edfdfbe7be04bea24487072133229b788232..430df19b8b77a50e080a5381efc1992c220864af 100644 (file)
--- a/arch/arm/dts/tegra20.dtsi
+++ b/arch/arm/dts/tegra20.dtsi
@@ -766,7 +766,7 @@
                status = "disabled";
        };
 
-       sdhci@c8000000 {
+       mmc@c8000000 {
                compatible = "nvidia,tegra20-sdhci";
                reg = <0xc8000000 0x200>;
                interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
@@ -776,7 +776,7 @@
                status = "disabled";
        };
 
-       sdhci@c8000200 {
+       mmc@c8000200 {
                compatible = "nvidia,tegra20-sdhci";
                reg = <0xc8000200 0x200>;
                interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
@@ -786,7 +786,7 @@
                status = "disabled";
        };
 
-       sdhci@c8000400 {
+       mmc@c8000400 {
                compatible = "nvidia,tegra20-sdhci";
                reg = <0xc8000400 0x200>;
                interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -796,7 +796,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/dts/tegra210-p2371-0000.dts b/arch/arm/dts/tegra210-p2371-0000.dts
index 539e7cef93b6cff011cc845c4ad63865700d1901..e5e9d68651a32b2b374a79ea3a99d3e89880156f 100644 (file)
--- a/arch/arm/dts/tegra210-p2371-0000.dts
+++ b/arch/arm/dts/tegra210-p2371-0000.dts
@@ -12,8 +12,8 @@
 
        aliases {
                i2c0 = "/i2c@7000d000";
-               mmc0 = "/sdhci@700b0600";
-               mmc1 = "/sdhci@700b0000";
+               mmc0 = "/mmc@700b0600";
+               mmc1 = "/mmc@700b0000";
                usb0 = "/usb@7d000000";
        };
 
@@ -21,14 +21,14 @@
                reg = <0x0 0x80000000 0x0 0xc0000000>;
        };
 
-       sdhci@700b0000 {
+       mmc@700b0000 {
                status = "okay";
                cd-gpios = <&gpio TEGRA_GPIO(Z, 1) GPIO_ACTIVE_LOW>;
                power-gpios = <&gpio TEGRA_GPIO(Z, 4) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
        };
 
-       sdhci@700b0600 {
+       mmc@700b0600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra210-p2371-2180.dts b/arch/arm/dts/tegra210-p2371-2180.dts
index 649c163152e200df4f1bf3c13547b41b9495d196..a619b2475ebb42a54d60f3972c1e8c6df4a3e53d 100644 (file)
--- a/arch/arm/dts/tegra210-p2371-2180.dts
+++ b/arch/arm/dts/tegra210-p2371-2180.dts
@@ -14,8 +14,8 @@
                i2c0 = "/i2c@7000d000";
                i2c2 = "/i2c@7000c400";
                i2c3 = "/i2c@7000c500";
-               mmc0 = "/sdhci@700b0600";
-               mmc1 = "/sdhci@700b0000";
+               mmc0 = "/mmc@700b0600";
+               mmc1 = "/mmc@700b0000";
                usb0 = "/usb@7d000000";
        };
 
@@ -73,7 +73,7 @@
                };
        };
 
-       sdhci@700b0000 {
+       mmc@700b0000 {
                status = "okay";
                cd-gpios = <&gpio TEGRA_GPIO(Z, 1) GPIO_ACTIVE_LOW>;
                power-gpios = <&gpio TEGRA_GPIO(Z, 3) GPIO_ACTIVE_HIGH>;
@@ -81,7 +81,7 @@
                bus-width = <4>;
        };
 
-       sdhci@700b0600 {
+       mmc@700b0600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra210-p2571.dts b/arch/arm/dts/tegra210-p2571.dts
index 16370c596e07e5316789afa3bda06e6750e17322..f48ce4d662f45cf71cc92ba495ec6280b9d68fbe 100644 (file)
--- a/arch/arm/dts/tegra210-p2571.dts
+++ b/arch/arm/dts/tegra210-p2571.dts
@@ -17,8 +17,8 @@
                i2c3 = "/i2c@7000c500";
                i2c4 = "/i2c@7000c700";
                i2c5 = "/i2c@7000d100";
-               mmc0 = "/sdhci@700b0600";
-               mmc1 = "/sdhci@700b0000";
+               mmc0 = "/mmc@700b0600";
+               mmc1 = "/mmc@700b0000";
                spi0 = "/spi@7000d400";
                spi1 = "/spi@7000da00";
                spi2 = "/spi@70410000";
@@ -74,14 +74,14 @@
                spi-max-frequency = <24000000>;
        };
 
-       sdhci@700b0000 {
+       mmc@700b0000 {
                status = "okay";
                cd-gpios = <&gpio TEGRA_GPIO(Z, 1) GPIO_ACTIVE_LOW>;
                power-gpios = <&gpio TEGRA_GPIO(Z, 4) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
        };
 
-       sdhci@700b0600 {
+       mmc@700b0600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra210-p3450-0000.dts b/arch/arm/dts/tegra210-p3450-0000.dts
index ddeeb232de2d14e0d42656573d3c7f354d996d61..333060a4ec76abec1013ab9fd6ff2f5bf2537ea7 100644 (file)
--- a/arch/arm/dts/tegra210-p3450-0000.dts
+++ b/arch/arm/dts/tegra210-p3450-0000.dts
@@ -20,8 +20,8 @@
                i2c2 = "/i2c@7000c400";
                i2c3 = "/i2c@7000c500";
                i2c4 = "/i2c@7000c700";
-               mmc0 = "/sdhci@700b0600";
-               mmc1 = "/sdhci@700b0000";
+               mmc0 = "/mmc@700b0600";
+               mmc1 = "/mmc@700b0000";
                spi0 = "/spi@70410000";
                usb0 = "/usb@7d000000";
        };
@@ -89,14 +89,14 @@
                };
        };
 
-       sdhci@700b0000 {
+       mmc@700b0000 {
                status = "okay";
                cd-gpios = <&gpio TEGRA_GPIO(Z, 1) GPIO_ACTIVE_LOW>;
                power-gpios = <&gpio TEGRA_GPIO(Z, 3) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
        };
 
-       sdhci@700b0600 {
+       mmc@700b0600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra210.dtsi b/arch/arm/dts/tegra210.dtsi
index 92eb4f67bf568529499543f7574efd72a3998000..45b1ca9a0417b06458d38f2266b27573b204d01e 100644 (file)
--- a/arch/arm/dts/tegra210.dtsi
+++ b/arch/arm/dts/tegra210.dtsi
@@ -696,7 +696,7 @@
                #phy-cells = <1>;
        };
 
-       sdhci@700b0000 {
+       mmc@700b0000 {
                compatible = "nvidia,tegra210-sdhci", "nvidia,tegra124-sdhci";
                reg = <0x0 0x700b0000 0x0 0x200>;
                interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
@@ -709,7 +709,7 @@
                status = "disabled";
        };
 
-       sdhci@700b0200 {
+       mmc@700b0200 {
                compatible = "nvidia,tegra210-sdhci", "nvidia,tegra124-sdhci";
                reg = <0x0 0x700b0200 0x0 0x200>;
                interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
@@ -722,7 +722,7 @@
                status = "disabled";
        };
 
-       sdhci@700b0400 {
+       mmc@700b0400 {
                compatible = "nvidia,tegra210-sdhci", "nvidia,tegra124-sdhci";
                reg = <0x0 0x700b0400 0x0 0x200>;
                interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -735,7 +735,7 @@
                status = "disabled";
        };
 
-       sdhci@700b0600 {
+       mmc@700b0600 {
                compatible = "nvidia,tegra210-sdhci", "nvidia,tegra124-sdhci";
                reg = <0x0 0x700b0600 0x0 0x200>;
                interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm/dts/tegra30-apalis.dts b/arch/arm/dts/tegra30-apalis.dts
index 77502dfdb4783f83f8dc535fdec1b1a87774824a..19553d14fb1aa917534e3a8f64a59061eb73a091 100644 (file)
--- a/arch/arm/dts/tegra30-apalis.dts
+++ b/arch/arm/dts/tegra30-apalis.dts
@@ -15,9 +15,9 @@
                i2c1 = "/i2c@7000c000";
                i2c2 = "/i2c@7000c500";
                i2c3 = "/i2c@7000c700";
-               mmc0 = "/sdhci@78000600";
-               mmc1 = "/sdhci@78000400";
-               mmc2 = "/sdhci@78000000";
+               mmc0 = "/mmc@78000600";
+               mmc1 = "/mmc@78000400";
+               mmc2 = "/mmc@78000000";
                spi0 = "/spi@7000d400";
                spi1 = "/spi@7000dc00";
                spi2 = "/spi@7000de00";
@@ -246,21 +246,21 @@
                spi-max-frequency = <25000000>;
        };
 
-       sdhci@78000000 {
+       mmc@78000000 {
                status = "okay";
                bus-width = <4>;
                /* SD1_CD# */
                cd-gpios = <&gpio TEGRA_GPIO(CC, 5) GPIO_ACTIVE_LOW>;
        };
 
-       sdhci@78000400 {
+       mmc@78000400 {
                status = "okay";
                bus-width = <8>;
                /* MMC1_CD# */
                cd-gpios = <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_LOW>;
        };
 
-       sdhci@78000600 {
+       mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra30-asus-grouper-common.dtsi b/arch/arm/dts/tegra30-asus-grouper-common.dtsi
index ddacdbb85c8f3d60034164c2e9510750682e9272..8eb36eb816442eb9090a94bd9e8fbc0259bf582b 100644 (file)
--- a/arch/arm/dts/tegra30-asus-grouper-common.dtsi
+++ b/arch/arm/dts/tegra30-asus-grouper-common.dtsi
@@ -773,7 +773,7 @@
                clock-frequency = <400000>;
        };
 
-       sdmmc4: sdhci@78000600 {
+       sdmmc4: mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra30-asus-p1801-t.dts b/arch/arm/dts/tegra30-asus-p1801-t.dts
index 31cbef1b93cd1c026344172d648ea8b65aa1257d..2d6b4aba016d1fb44f0b019d301595e0e23e5e95 100644 (file)
--- a/arch/arm/dts/tegra30-asus-p1801-t.dts
+++ b/arch/arm/dts/tegra30-asus-p1801-t.dts
@@ -1100,7 +1100,7 @@
                };
        };
 
-       sdmmc1: sdhci@78000000 {
+       sdmmc1: mmc@78000000 {
                status = "okay";
                bus-width = <4>;
 
@@ -1111,7 +1111,7 @@
                vqmmc-supply = <&vddio_usd>;
        };
 
-       sdmmc4: sdhci@78000600 {
+       sdmmc4: mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra30-asus-tf600t.dts b/arch/arm/dts/tegra30-asus-tf600t.dts
index 5135b8c666c85f9839a65cf47c06d93abbd761db..498c398baadd4da98cb5b4814acd77e168645b66 100644 (file)
--- a/arch/arm/dts/tegra30-asus-tf600t.dts
+++ b/arch/arm/dts/tegra30-asus-tf600t.dts
@@ -1065,7 +1065,7 @@
                };
        };
 
-       sdmmc1: sdhci@78000000 {
+       sdmmc1: mmc@78000000 {
                status = "okay";
                bus-width = <4>;
 
@@ -1076,7 +1076,7 @@
                vqmmc-supply = <&vddio_usd>;
        };
 
-       sdmmc4: sdhci@78000600 {
+       sdmmc4: mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra30-asus-transformer.dtsi b/arch/arm/dts/tegra30-asus-transformer.dtsi
index 47a44fbc9dd778ba34a2353e005cafdcdb74eadd..e58414dc4b0cdaceacb5639cb63747bfc98764f9 100644 (file)
--- a/arch/arm/dts/tegra30-asus-transformer.dtsi
+++ b/arch/arm/dts/tegra30-asus-transformer.dtsi
@@ -1093,7 +1093,7 @@
                };
        };
 
-       sdmmc1: sdhci@78000000 {
+       sdmmc1: mmc@78000000 {
                status = "okay";
                bus-width = <4>;
 
@@ -1104,7 +1104,7 @@
                vqmmc-supply = <&vddio_usd>;
        };
 
-       sdmmc4: sdhci@78000600 {
+       sdmmc4: mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra30-beaver.dts b/arch/arm/dts/tegra30-beaver.dts
index 9bb097b081362997c54437e0efb748837876811f..b78982edd1a392249063404915856547169c6153 100644 (file)
--- a/arch/arm/dts/tegra30-beaver.dts
+++ b/arch/arm/dts/tegra30-beaver.dts
@@ -16,8 +16,8 @@
                i2c2 = "/i2c@7000c400";
                i2c3 = "/i2c@7000c500";
                i2c4 = "/i2c@7000c700";
-               mmc0 = "/sdhci@78000600";
-               mmc1 = "/sdhci@78000000";
+               mmc0 = "/mmc@78000600";
+               mmc1 = "/mmc@78000000";
                spi0 = "/spi@7000da00";
                usb0 = "/usb@7d000000";
                usb1 = "/usb@7d008000";
@@ -191,7 +191,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>;
@@ -199,7 +199,7 @@
                bus-width = <4>;
        };
 
-       sdhci@78000600 {
+       mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra30-cardhu.dts b/arch/arm/dts/tegra30-cardhu.dts
index 7534861e40d9f47203d3e669ddd5d58f7bc734a9..299ba7ef371559ce1bf3c140e334d7c54aadfb32 100644 (file)
--- a/arch/arm/dts/tegra30-cardhu.dts
+++ b/arch/arm/dts/tegra30-cardhu.dts
@@ -16,8 +16,8 @@
                i2c2 = "/i2c@7000c400";
                i2c3 = "/i2c@7000c500";
                i2c4 = "/i2c@7000c700";
-               mmc0 = "/sdhci@78000600";
-               mmc1 = "/sdhci@78000000";
+               mmc0 = "/mmc@78000600";
+               mmc1 = "/mmc@78000000";
                spi0 = "/spi@7000da00";
                usb0 = "/usb@7d008000";
        };
@@ -183,7 +183,7 @@
                spi-max-frequency = <25000000>;
        };
 
-       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>;
@@ -191,7 +191,7 @@
                bus-width = <4>;
        };
 
-       sdhci@78000600 {
+       mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra30-colibri.dts b/arch/arm/dts/tegra30-colibri.dts
index 38afe7819c771367855d27cdde9f54db28fadd8e..075a35f1c9a1fdd41cba6ba3713a11b93f4e710e 100644 (file)
--- a/arch/arm/dts/tegra30-colibri.dts
+++ b/arch/arm/dts/tegra30-colibri.dts
@@ -14,8 +14,8 @@
                i2c0 = "/i2c@7000d000";
                i2c1 = "/i2c@7000c000";
                i2c2 = "/i2c@7000c700";
-               mmc0 = "/sdhci@78000600";
-               mmc1 = "/sdhci@78000200";
+               mmc0 = "/mmc@78000600";
+               mmc1 = "/mmc@78000200";
                spi0 = "/spi@7000d400";
                usb0 = "/usb@7d000000";
                usb1 = "/usb@7d004000"; /* on module only, for ASIX */
@@ -61,13 +61,13 @@
                spi-max-frequency = <25000000>;
        };
 
-       sdhci@78000200 {
+       mmc@78000200 {
                status = "okay";
                bus-width = <4>;
                cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; /* MMCD */
        };
 
-       sdhci@78000600 {
+       mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra30-htc-endeavoru.dts b/arch/arm/dts/tegra30-htc-endeavoru.dts
index 79f423bd22a79bb17b880f06e604ec661292f384..e67d335f73c5e8e491abca1ec9f42104047fc852 100644 (file)
--- a/arch/arm/dts/tegra30-htc-endeavoru.dts
+++ b/arch/arm/dts/tegra30-htc-endeavoru.dts
@@ -1246,7 +1246,7 @@
                };
        };
 
-       sdmmc4: sdhci@78000600 {
+       sdmmc4: mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra30-lenovo-ideapad-yoga-11.dts b/arch/arm/dts/tegra30-lenovo-ideapad-yoga-11.dts
index 53f42089d30b07db9f7ea2c57422ef95086b0ca1..2d96d6867e680c7359943b3f41afcae968e96f82 100644 (file)
--- a/arch/arm/dts/tegra30-lenovo-ideapad-yoga-11.dts
+++ b/arch/arm/dts/tegra30-lenovo-ideapad-yoga-11.dts
@@ -1119,7 +1119,7 @@
                >;
        };
 
-       sdmmc1: sdhci@78000000 {
+       sdmmc1: mmc@78000000 {
                status = "okay";
                bus-width = <4>;
 
@@ -1129,7 +1129,7 @@
                vqmmc-supply = <&vddio_usd>;
        };
 
-       sdmmc4: sdhci@78000600 {
+       sdmmc4: mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra30-lg-p880.dts b/arch/arm/dts/tegra30-lg-p880.dts
index ab5993150b2144f30cf80c45ed587fb658fded15..84b6dc1f95ae0c3a13a7fea325512c4c9d65b299 100644 (file)
--- a/arch/arm/dts/tegra30-lg-p880.dts
+++ b/arch/arm/dts/tegra30-lg-p880.dts
@@ -126,7 +126,7 @@
                };
        };
 
-       sdmmc3: sdhci@78000400  {
+       sdmmc3: mmc@78000400  {
                status = "okay";
                bus-width = <4>;
 

diff --git a/arch/arm/dts/tegra30-lg-x3.dtsi b/arch/arm/dts/tegra30-lg-x3.dtsi
index 09c5d04a225aa4f95b3ba238bb580926a9f6768c..9c074f3c5533e8ff06ca2a98d73074f1017a5fdf 100644 (file)
--- a/arch/arm/dts/tegra30-lg-x3.dtsi
+++ b/arch/arm/dts/tegra30-lg-x3.dtsi
@@ -1031,7 +1031,7 @@
                };
        };
 
-       sdmmc4: sdhci@78000600 {
+       sdmmc4: mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra30-microsoft-surface-rt.dts b/arch/arm/dts/tegra30-microsoft-surface-rt.dts
index 2d22d3e0bb137be4401e7aa8a31af121ee29eef4..77cd79cb0d6e8fd3fc2204f7912c3c2d84342e58 100644 (file)
--- a/arch/arm/dts/tegra30-microsoft-surface-rt.dts
+++ b/arch/arm/dts/tegra30-microsoft-surface-rt.dts
@@ -946,7 +946,7 @@
                };
        };
 
-       sdmmc1: sdhci@78000000 {
+       sdmmc1: mmc@78000000 {
                status = "okay";
                bus-width = <4>;
 
@@ -956,7 +956,7 @@
                vqmmc-supply = <&vddio_usd>;
        };
 
-       sdmmc4: sdhci@78000600 {
+       sdmmc4: mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra30-ouya.dts b/arch/arm/dts/tegra30-ouya.dts
index e6b2824d783c4a79d6153e54ab5c90c0315a17ad..4911c802a513128be7f2e7e6885387dd6c0013d3 100644 (file)
--- a/arch/arm/dts/tegra30-ouya.dts
+++ b/arch/arm/dts/tegra30-ouya.dts
@@ -1970,7 +1970,7 @@
                };
        };
 
-       sdmmc4: sdhci@78000600 {
+       sdmmc4: mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra30-pegatron-chagall.dts b/arch/arm/dts/tegra30-pegatron-chagall.dts
index 98eb369f7a87795caa370814a432ddba2f524f6c..1ff53b7c54bd0099796db1cf223a6c2d87de5629 100644 (file)
--- a/arch/arm/dts/tegra30-pegatron-chagall.dts
+++ b/arch/arm/dts/tegra30-pegatron-chagall.dts
@@ -1121,7 +1121,7 @@
                };
        };
 
-       sdmmc1: sdhci@78000000 {
+       sdmmc1: mmc@78000000 {
                status = "okay";
                bus-width = <4>;
 
@@ -1131,7 +1131,7 @@
                vqmmc-supply = <&vddio_usd>;
        };
 
-       sdmmc4: sdhci@78000600 {
+       sdmmc4: mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra30-tamonten.dtsi b/arch/arm/dts/tegra30-tamonten.dtsi
index 33da1754d30e2fccefee1a20b8c05093d98e2d7f..0240568cd94f31a85d5e2c8f12eb852065703f0f 100644 (file)
--- a/arch/arm/dts/tegra30-tamonten.dtsi
+++ b/arch/arm/dts/tegra30-tamonten.dtsi
@@ -18,9 +18,9 @@
                i2c2 = "/i2c@7000c400";
                i2c3 = "/i2c@7000c500";
                i2c4 = "/i2c@7000d000";
-               mmc0 = "/sdhci@78000600";
-               mmc1 = "/sdhci@78000400";
-               mmc2 = "/sdhci@78000000";
+               mmc0 = "/mmc@78000600";
+               mmc1 = "/mmc@78000400";
+               mmc2 = "/mmc@78000000";
                usb0 = "/usb@7d008000";
        };
 
@@ -54,14 +54,14 @@
        };
 
        /* SD slot on the base board */
-       sdhci@78000400 {
+       mmc@78000400 {
                cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
                wp-gpios = <&gpio TEGRA_GPIO(I, 3) GPIO_ACTIVE_HIGH>;
                bus-width = <4>;
        };
 
        /* EMMC on the COM module */
-       sdhci@78000600 {
+       mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra30-tec-ng.dts b/arch/arm/dts/tegra30-tec-ng.dts
index f2a49b8cbe2b5d2da4c36f1e2b54b6c3d6722a2a..444a390ba580bef5d802245b14fa997f3aad797b 100644 (file)
--- a/arch/arm/dts/tegra30-tec-ng.dts
+++ b/arch/arm/dts/tegra30-tec-ng.dts
@@ -16,7 +16,7 @@
        };
 
        /* SD card slot */
-       sdhci@78000400 {
+       mmc@78000400 {
                status = "okay";
        };
 };

diff --git a/arch/arm/dts/tegra30-wexler-qc750.dts b/arch/arm/dts/tegra30-wexler-qc750.dts
index ededbf579fd901cbf8cc46c9f943ac06dab8e0d7..c310a22f56f6998789dfbf5b3b95eff613133448 100644 (file)
--- a/arch/arm/dts/tegra30-wexler-qc750.dts
+++ b/arch/arm/dts/tegra30-wexler-qc750.dts
@@ -985,7 +985,7 @@
                };
        };
 
-       sdmmc1: sdhci@78000000 {
+       sdmmc1: mmc@78000000 {
                status = "okay";
                bus-width = <4>;
 
@@ -996,7 +996,7 @@
                vqmmc-supply = <&vddio_usd>;
        };
 
-       sdmmc4: sdhci@78000600 {
+       sdmmc4: mmc@78000600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm/dts/tegra30.dtsi b/arch/arm/dts/tegra30.dtsi
index 82e843d05be580e0012dbd6f9cc65720630ebf72..cf772338b55b4036daa1fb17857951b701c58a60 100644 (file)
--- a/arch/arm/dts/tegra30.dtsi
+++ b/arch/arm/dts/tegra30.dtsi
@@ -803,7 +803,7 @@
                };
        };
 
-       sdhci@78000000 {
+       mmc@78000000 {
                compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
                reg = <0x78000000 0x200>;
                interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
@@ -813,7 +813,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>;
@@ -823,7 +823,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>;
@@ -833,7 +833,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>;