arm64: 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.

Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts b/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts
index d0d03cc30197ba2057a3bd3b74790bc1129b88d3..e6fe62e5c2341c34fe28d135bcba62428badbdc3 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts
@@ -894,12 +894,12 @@ pmc@7000e400 {
        };
 
        /* WIFI/BT module */
-       sdhci@700b0000 {
+       mmc@700b0000 {
                status = "disabled";
        };
 
        /* external SD/MMC */
-       sdhci@700b0400 {
+       mmc@700b0400 {
                cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
                power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
                wp-gpios = <&gpio TEGRA_GPIO(Q, 4) GPIO_ACTIVE_HIGH>;
@@ -909,7 +909,7 @@ sdhci@700b0400 {
        };
 
        /* EMMC 4.51 */
-       sdhci@700b0600 {
+       mmc@700b0600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm64/boot/dts/nvidia/tegra132.dtsi b/arch/arm64/boot/dts/nvidia/tegra132.dtsi
index 4fc34c5ec2dcdd6c7234b1297eadeda98b57e3fd..8558ad38b69c78adcd1eb0a4082fcbdcd549d8e3 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra132.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra132.dtsi
@@ -691,7 +691,7 @@ utmi-2 {
                };
        };
 
-       sdhci@700b0000 {
+       mmc@700b0000 {
                compatible = "nvidia,tegra124-sdhci";
                reg = <0x0 0x700b0000 0x0 0x200>;
                interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
@@ -702,7 +702,7 @@ sdhci@700b0000 {
                status = "disabled";
        };
 
-       sdhci@700b0200 {
+       mmc@700b0200 {
                compatible = "nvidia,tegra124-sdhci";
                reg = <0x0 0x700b0200 0x0 0x200>;
                interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
@@ -713,7 +713,7 @@ sdhci@700b0200 {
                status = "disabled";
        };
 
-       sdhci@700b0400 {
+       mmc@700b0400 {
                compatible = "nvidia,tegra124-sdhci";
                reg = <0x0 0x700b0400 0x0 0x200>;
                interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -724,7 +724,7 @@ sdhci@700b0400 {
                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/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts b/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
index f35b0ba29cb55558bdcca081fde9d06bc223205d..37ec15a14c77f2e8cf9f5b36a607d0c04b90766e 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
@@ -103,7 +103,7 @@ exp2: gpio@77 {
        };
 
        /* SDMMC1 (SD/MMC) */
-       sdhci@3400000 {
+       mmc@3400000 {
                status = "okay";
 
                vmmc-supply = <&vdd_sd>;

diff --git a/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi b/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi
index 7b5b9bb332cf65f9d564a6893a1f3fabed171820..d1ed7eee949ac82f1058385ef66c0470f7b0a121 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi
@@ -9,8 +9,8 @@ / {
 
        aliases {
                ethernet0 = "/ethernet@2490000";
-               sdhci0 = "/sdhci@3460000";
-               sdhci1 = "/sdhci@3400000";
+               mmc0 = "/mmc@3460000";
+               mmc1 = "/mmc@3400000";
                serial0 = &uarta;
                i2c0 = "/bpmp/i2c";
                i2c1 = "/i2c@3160000";
@@ -135,7 +135,7 @@ i2c@31e0000 {
        };
 
        /* SDMMC1 (SD/MMC) */
-       sdhci@3400000 {
+       mmc@3400000 {
                cd-gpios = <&gpio TEGRA186_MAIN_GPIO(P, 5) GPIO_ACTIVE_LOW>;
                wp-gpios = <&gpio TEGRA186_MAIN_GPIO(P, 4) GPIO_ACTIVE_HIGH>;
 
@@ -143,12 +143,12 @@ sdhci@3400000 {
        };
 
        /* SDMMC3 (SDIO) */
-       sdhci@3440000 {
+       mmc@3440000 {
                status = "okay";
        };
 
        /* SDMMC4 (eMMC) */
-       sdhci@3460000 {
+       mmc@3460000 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm64/boot/dts/nvidia/tegra186.dtsi b/arch/arm64/boot/dts/nvidia/tegra186.dtsi
index 1e9947cd607a3aa648df0101982cd8a57c540f98..03b24f8640b3f0779f09de5f0d7f68f85a814965 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra186.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra186.dtsi
@@ -333,7 +333,7 @@ gen9_i2c: i2c@31e0000 {
                status = "disabled";
        };
 
-       sdmmc1: sdhci@3400000 {
+       sdmmc1: mmc@3400000 {
                compatible = "nvidia,tegra186-sdhci";
                reg = <0x0 0x03400000 0x0 0x10000>;
                interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
@@ -362,7 +362,7 @@ sdmmc1: sdhci@3400000 {
                status = "disabled";
        };
 
-       sdmmc2: sdhci@3420000 {
+       sdmmc2: mmc@3420000 {
                compatible = "nvidia,tegra186-sdhci";
                reg = <0x0 0x03420000 0x0 0x10000>;
                interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
@@ -386,7 +386,7 @@ sdmmc2: sdhci@3420000 {
                status = "disabled";
        };
 
-       sdmmc3: sdhci@3440000 {
+       sdmmc3: mmc@3440000 {
                compatible = "nvidia,tegra186-sdhci";
                reg = <0x0 0x03440000 0x0 0x10000>;
                interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
@@ -412,7 +412,7 @@ sdmmc3: sdhci@3440000 {
                status = "disabled";
        };
 
-       sdmmc4: sdhci@3460000 {
+       sdmmc4: mmc@3460000 {
                compatible = "nvidia,tegra186-sdhci";
                reg = <0x0 0x03460000 0x0 0x10000>;
                interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi
index f3781e86f321509b52de5ff5791ea16dde8d971b..442e333ac13f6261117de95656752e113430ad08 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi
@@ -9,8 +9,8 @@ / {
 
        aliases {
                ethernet0 = "/cbb@0/ethernet@2490000";
-               sdhci0 = "/cbb@0/sdhci@3460000";
-               sdhci1 = "/cbb@0/sdhci@3400000";
+               mmc0 = "/cbb@0/mmc@3460000";
+               mmc1 = "/cbb@0/mmc@3400000";
                serial0 = &tcu;
                i2c0 = "/bpmp/i2c";
                i2c1 = "/cbb@0/i2c@3160000";
@@ -58,12 +58,12 @@ serial@3110000 {
                };
 
                /* SDMMC1 (SD/MMC) */
-               sdhci@3400000 {
+               mmc@3400000 {
                        cd-gpios = <&gpio TEGRA194_MAIN_GPIO(A, 0) GPIO_ACTIVE_LOW>;
                };
 
                /* SDMMC4 (eMMC) */
-               sdhci@3460000 {
+               mmc@3460000 {
                        status = "okay";
                        bus-width = <8>;
                        non-removable;

diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts b/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts
index 9a7d136b467f56e16437b0326a25a921ff3ef347..0f9868b6fd6bf33cfd9b48a7dd9ab566ac47a09d 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts
@@ -28,7 +28,7 @@ ddc: i2c@31c0000 {
                };
 
                /* SDMMC1 (SD/MMC) */
-               sdhci@3400000 {
+               mmc@3400000 {
                        status = "okay";
                };
 

diff --git a/arch/arm64/boot/dts/nvidia/tegra194.dtsi b/arch/arm64/boot/dts/nvidia/tegra194.dtsi
index f056158a263491f58dc238c9a923d99ae9009e82..d5246c75b78252ffffef2b37960959c5f4e3f716 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra194.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra194.dtsi
@@ -456,7 +456,7 @@ pwm8: pwm@32f0000 {
                        #pwm-cells = <2>;
                };
 
-               sdmmc1: sdhci@3400000 {
+               sdmmc1: mmc@3400000 {
                        compatible = "nvidia,tegra194-sdhci";
                        reg = <0x03400000 0x10000>;
                        interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
@@ -481,7 +481,7 @@ sdmmc1: sdhci@3400000 {
                        status = "disabled";
                };
 
-               sdmmc3: sdhci@3440000 {
+               sdmmc3: mmc@3440000 {
                        compatible = "nvidia,tegra194-sdhci";
                        reg = <0x03440000 0x10000>;
                        interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
@@ -507,7 +507,7 @@ sdmmc3: sdhci@3440000 {
                        status = "disabled";
                };
 
-               sdmmc4: sdhci@3460000 {
+               sdmmc4: mmc@3460000 {
                        compatible = "nvidia,tegra194-sdhci";
                        reg = <0x03460000 0x10000>;
                        interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi
index 751775357d51133d54e7eb9eca9746454d5da8b1..251c6099482a783dbe0096739c12ea627bda90b1 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi
@@ -293,7 +293,7 @@ pmc@7000e400 {
        };
 
        /* eMMC */
-       sdhci@700b0600 {
+       mmc@700b0600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi
index 9ace2d9ea085ae9319dc396f1dd010101a891857..f9158dc943f9b1e96138e911c2f7c3e981200dc8 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi
@@ -34,7 +34,7 @@ pmc@7000e400 {
        };
 
        /* eMMC */
-       sdhci@700b0600 {
+       mmc@700b0600 {
                status = "okay";
                bus-width = <8>;
                non-removable;

diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
index 411321e77cd85d35782b4dcf76d9f7cc538dd5bb..1e74f50d17eef1de5705bd444730305f6e69aa83 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
@@ -1505,7 +1505,7 @@ usb3-1 {
        };
 
        /* MMC/SD */
-       sdhci@700b0000 {
+       mmc@700b0000 {
                status = "okay";
                bus-width = <4>;
 

diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi
index 615a8f5a6cf2f77e409f3a39f2d5708e023ad346..579d5b8a757d33f20e162ccc4b7c6afa43cf7721 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi
@@ -1580,7 +1580,7 @@ pmc@7000e400 {
                status = "okay";
        };
 
-       sdhci@700b0600 {
+       mmc@700b0600 {
                bus-width = <8>;
                non-removable;
                status = "okay";

diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts b/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts
index 146353f4c0cc30d85dc5f9295cfe0ee8f6129723..aca01408c81f9451594e45d4237719dcedf0c96c 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts
@@ -543,7 +543,7 @@ usb3-0 {
                };
        };
 
-       sdhci@700b0000 {
+       mmc@700b0000 {
                status = "okay";
                bus-width = <4>;
 
@@ -561,7 +561,7 @@ usb@700d0000 {
                hvdd-usb-supply = <&vdd_1v8>;
        };
 
-       sdhci@700b0400 {
+       mmc@700b0400 {
                status = "okay";
                bus-width = <4>;
 

diff --git a/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts b/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
index 2faab639055285c21a27dfad9234357a961e1148..745f5a4fa161ef346b5745326625fcb5bca25c22 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
@@ -1697,7 +1697,7 @@ usb3-0 {
                };
        };
 
-       sdhci@700b0600 {
+       mmc@700b0600 {
                bus-width = <8>;
                non-removable;
                status = "okay";

diff --git a/arch/arm64/boot/dts/nvidia/tegra210.dtsi b/arch/arm64/boot/dts/nvidia/tegra210.dtsi
index 41ffa0531cd8dc0e5758900d67c091bd9b8b43d1..1f7dc518b39492ecf5185e147943aefafd0e0de0 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra210.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra210.dtsi
@@ -1175,7 +1175,7 @@ usb3-3 {
                };
        };
 
-       sdhci@700b0000 {
+       mmc@700b0000 {
                compatible = "nvidia,tegra210-sdhci";
                reg = <0x0 0x700b0000 0x0 0x200>;
                interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
@@ -1203,7 +1203,7 @@ sdhci@700b0000 {
                status = "disabled";
        };
 
-       sdhci@700b0200 {
+       mmc@700b0200 {
                compatible = "nvidia,tegra210-sdhci";
                reg = <0x0 0x700b0200 0x0 0x200>;
                interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
@@ -1220,7 +1220,7 @@ sdhci@700b0200 {
                status = "disabled";
        };
 
-       sdhci@700b0400 {
+       mmc@700b0400 {
                compatible = "nvidia,tegra210-sdhci";
                reg = <0x0 0x700b0400 0x0 0x200>;
                interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -1243,7 +1243,7 @@ sdhci@700b0400 {
                status = "disabled";
        };
 
-       sdhci@700b0600 {
+       mmc@700b0600 {
                compatible = "nvidia,tegra210-sdhci";
                reg = <0x0 0x700b0600 0x0 0x200>;
                interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;