ARM: dts: qcom: correct mmc node naming

MMC nodes has to be named mmc@ to comply with dt-bindings.

Fix warnings as:
arch/arm/boot/dts/qcom-msm8660-surf.dt.yaml: sdcc@12400000: $nodename:0: 'sdcc@12400000' does not match '^mmc(@.*)?$'
	From schema: Documentation/devicetree/bindings/mmc/arm,pl18x.yaml

Signed-off-by: David Heidelberg <david@ixit.cz>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20211020201440.229196-1-david@ixit.cz

diff --git a/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts b/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts
index 5bedbb902ad54959feb105b86ef9bf88770c0f15..d664ccd454c55201828559a00370397c433c72a9 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts
+++ b/arch/arm/boot/dts/qcom-apq8060-dragonboard.dts
@@ -899,7 +899,7 @@
                };
                amba {
                        /* Internal 3.69 GiB eMMC */
-                       sdcc@12400000 {
+                       mmc@12400000 {
                                status = "okay";
                                pinctrl-names = "default";
                                pinctrl-0 = <&dragon_sdcc1_pins>;
@@ -908,7 +908,7 @@
                        };
 
                        /* External micro SD card, directly connected, pulled up to 2.85 V */
-                       sdcc@12180000 {
+                       mmc@12180000 {
                                status = "okay";
                                /* Enable SSBI GPIO 22 as input, use for card detect */
                                pinctrl-names = "default";
@@ -922,7 +922,7 @@
                         * Second external micro SD card, using two TXB104RGYR levelshifters
                         * to lift from 1.8 V to 2.85 V
                         */
-                       sdcc@12200000 {
+                       mmc@12200000 {
                                status = "okay";
                                /* Enable SSBI GPIO 26 as input, use for card detect */
                                pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts b/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
index 3bce47d16ab3d5831cc8678ce85cb2f4272e0487..9a835335bf788100c179bbb1c00d8f64f3c61d67 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
@@ -335,7 +335,7 @@
 
                amba {
                        /* eMMC */
-                       sdcc@12400000 {
+                       mmc@12400000 {
                                status = "okay";
                                vmmc-supply = <&pm8921_l5>;
                                vqmmc-supply = <&pm8921_s4>;

diff --git a/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts b/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
index 0148148a8e0a5b5a2f5ad4d6acfc32627df9d405..e068a8d0adf0babffb3a3632cf07d758d6286ec7 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
@@ -220,14 +220,14 @@
 
                amba {
                        /* eMMC */
-                       sdcc1: sdcc@12400000 {
+                       sdcc1: mmc@12400000 {
                                status = "okay";
                                vmmc-supply = <&pm8921_l5>;
                                vqmmc-supply = <&pm8921_s4>;
                        };
 
                        /* External micro SD card */
-                       sdcc3: sdcc@12180000 {
+                       sdcc3: mmc@12180000 {
                                status = "okay";
                                vmmc-supply = <&v3p3_fixed>;
                                pinctrl-names   = "default";
@@ -235,7 +235,7 @@
                                cd-gpios        = <&tlmm_pinmux 26 GPIO_ACTIVE_LOW>;
                        };
                        /* WLAN */
-                       sdcc4: sdcc@121c0000 {
+                       sdcc4: mmc@121c0000 {
                                status = "okay";
                                vmmc-supply = <&v3p3_fixed>;
                                vqmmc-supply = <&v3p3_fixed>;

diff --git a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
index d0a17b5a5fa385662f27ba68380d02504cbf2873..2638b380be20146657f6c291cb55d4ed49d87888 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
@@ -314,14 +314,14 @@
 
                amba {
                        /* eMMC */
-                       sdcc1: sdcc@12400000 {
+                       sdcc1: mmc@12400000 {
                                status = "okay";
                                vmmc-supply = <&pm8921_l5>;
                                vqmmc-supply = <&pm8921_s4>;
                        };
 
                        /* External micro SD card */
-                       sdcc3: sdcc@12180000 {
+                       sdcc3: mmc@12180000 {
                                status = "okay";
                                vmmc-supply = <&pm8921_l6>;
                                pinctrl-names   = "default";
@@ -329,7 +329,7 @@
                                cd-gpios        = <&tlmm_pinmux 26 GPIO_ACTIVE_LOW>;
                        };
                        /* WLAN */
-                       sdcc4: sdcc@121c0000 {
+                       sdcc4: mmc@121c0000 {
                                status = "okay";
                                vmmc-supply = <&ext_3p3v>;
                                vqmmc-supply = <&pm8921_lvs1>;

diff --git a/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts b/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts
index 72e47bdc5c1245a3835e6e7a3443042f438272c9..f8c97efc61fc242f3136e6798fa6dc9b99dfbf3e 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts
@@ -374,14 +374,14 @@
                };
 
                amba {
-                       sdcc1: sdcc@12400000 {
+                       sdcc1: mmc@12400000 {
                                status = "okay";
 
                                vmmc-supply = <&pm8921_l5>;
                                vqmmc-supply = <&pm8921_s4>;
                        };
 
-                       sdcc3: sdcc@12180000 {
+                       sdcc3: mmc@12180000 {
                                status = "okay";
 
                                vmmc-supply = <&pm8921_l6>;

diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index 3d0dfa45ac7c525ca8d36de2ccfd76bb0ae38ce9..856494392eb4a0a52cb38c193097413bf235622b 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -1073,7 +1073,7 @@
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges;
-                       sdcc1: sdcc@12400000 {
+                       sdcc1: mmc@12400000 {
                                status          = "disabled";
                                compatible      = "arm,pl18x", "arm,primecell";
                                pinctrl-names   = "default";
@@ -1093,7 +1093,7 @@
                                dma-names = "tx", "rx";
                        };
 
-                       sdcc3: sdcc@12180000 {
+                       sdcc3: mmc@12180000 {
                                compatible      = "arm,pl18x", "arm,primecell";
                                arm,primecell-periphid = <0x00051180>;
                                status          = "disabled";
@@ -1111,7 +1111,7 @@
                                dma-names = "tx", "rx";
                        };
 
-                       sdcc4: sdcc@121c0000 {
+                       sdcc4: mmc@121c0000 {
                                compatible      = "arm,pl18x", "arm,primecell";
                                arm,primecell-periphid = <0x00051180>;
                                status          = "disabled";

diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi
index 4139d3817bd6fb6f0176774f023eedcf1ba68a7f..8ab3d38709f185cafe0916d42583889236b46a21 100644 (file)
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
@@ -1181,7 +1181,7 @@
                        #size-cells = <1>;
                        ranges;
 
-                       sdcc1: sdcc@12400000 {
+                       sdcc1: mmc@12400000 {
                                status          = "disabled";
                                compatible      = "arm,pl18x", "arm,primecell";
                                arm,primecell-periphid = <0x00051180>;
@@ -1201,7 +1201,7 @@
                                dma-names = "tx", "rx";
                        };
 
-                       sdcc3: sdcc@12180000 {
+                       sdcc3: mmc@12180000 {
                                compatible      = "arm,pl18x", "arm,primecell";
                                arm,primecell-periphid = <0x00051180>;
                                status          = "disabled";

diff --git a/arch/arm/boot/dts/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom-mdm9615.dtsi
index 6e90c5d5a050ef1e635e3982d96a9d7c1dee3dd0..c32415f0e66d617a3cf31d9d9b95570cb583fc7c 100644 (file)
--- a/arch/arm/boot/dts/qcom-mdm9615.dtsi
+++ b/arch/arm/boot/dts/qcom-mdm9615.dtsi
@@ -354,7 +354,7 @@
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges;
-                       sdcc1: sdcc@12180000 {
+                       sdcc1: mmc@12180000 {
                                status = "disabled";
                                compatible = "arm,pl18x", "arm,primecell";
                                arm,primecell-periphid = <0x00051180>;
@@ -374,7 +374,7 @@
                                assigned-clock-rates = <400000>;
                        };
 
-                       sdcc2: sdcc@12140000 {
+                       sdcc2: mmc@12140000 {
                                compatible = "arm,pl18x", "arm,primecell";
                                arm,primecell-periphid = <0x00051180>;
                                status = "disabled";

diff --git a/arch/arm/boot/dts/qcom-msm8660-surf.dts b/arch/arm/boot/dts/qcom-msm8660-surf.dts
index 6a321ccb0bd07723a8b90c270964e90541490e25..414280d9bdbafab0564fad975809fd5c9857d119 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8660-surf.dts
+++ b/arch/arm/boot/dts/qcom-msm8660-surf.dts
@@ -35,13 +35,13 @@
 
                amba {
                        /* eMMC */
-                       sdcc1: sdcc@12400000 {
+                       sdcc1: mmc@12400000 {
                                status = "okay";
                                vmmc-supply = <&vsdcc_fixed>;
                        };
 
                        /* External micro SD card */
-                       sdcc3: sdcc@12180000 {
+                       sdcc3: mmc@12180000 {
                                status = "okay";
                                vmmc-supply = <&vsdcc_fixed>;
                        };

diff --git a/arch/arm/boot/dts/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom-msm8660.dtsi
index 21cb58ab68ac95a71022c6eabcad299f4fcd5648..1e8aab357f9c521a8e6fb9ec438dda79d4b39cd9 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8660.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8660.dtsi
@@ -483,7 +483,7 @@
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges;
-                       sdcc1: sdcc@12400000 {
+                       sdcc1: mmc@12400000 {
                                status          = "disabled";
                                compatible      = "arm,pl18x", "arm,primecell";
                                arm,primecell-periphid = <0x00051180>;
@@ -499,7 +499,7 @@
                                cap-mmc-highspeed;
                        };
 
-                       sdcc2: sdcc@12140000 {
+                       sdcc2: mmc@12140000 {
                                status          = "disabled";
                                compatible      = "arm,pl18x", "arm,primecell";
                                arm,primecell-periphid = <0x00051180>;
@@ -514,7 +514,7 @@
                                cap-mmc-highspeed;
                        };
 
-                       sdcc3: sdcc@12180000 {
+                       sdcc3: mmc@12180000 {
                                compatible      = "arm,pl18x", "arm,primecell";
                                arm,primecell-periphid = <0x00051180>;
                                status          = "disabled";
@@ -530,7 +530,7 @@
                                no-1-8-v;
                        };
 
-                       sdcc4: sdcc@121c0000 {
+                       sdcc4: mmc@121c0000 {
                                compatible      = "arm,pl18x", "arm,primecell";
                                arm,primecell-periphid = <0x00051180>;
                                status          = "disabled";
@@ -545,7 +545,7 @@
                                cap-mmc-highspeed;
                        };
 
-                       sdcc5: sdcc@12200000 {
+                       sdcc5: mmc@12200000 {
                                compatible      = "arm,pl18x", "arm,primecell";
                                arm,primecell-periphid = <0x00051180>;
                                status          = "disabled";

diff --git a/arch/arm/boot/dts/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom-msm8960-cdp.dts
index e7d2e937ea4cfa6ffb73cf92266763d4358e464f..4af01039c3b2110a007e76d8a938cf022a672e26 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8960-cdp.dts
+++ b/arch/arm/boot/dts/qcom-msm8960-cdp.dts
@@ -26,12 +26,12 @@
 
                amba {
                        /* eMMC */
-                       sdcc1: sdcc@12400000 {
+                       sdcc1: mmc@12400000 {
                                status = "okay";
                        };
 
                        /* External micro SD card */
-                       sdcc3: sdcc@12180000 {
+                       sdcc3: mmc@12180000 {
                                status = "okay";
                        };
                };

diff --git a/arch/arm/boot/dts/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom-msm8960.dtsi
index 172ea3c70eac200e85f89917ba3c1533ee9ea036..2a0ec97a264f2fee46ace0f2470f897acf8287dc 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8960.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8960.dtsi
@@ -263,7 +263,7 @@
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges;
-                       sdcc1: sdcc@12400000 {
+                       sdcc1: mmc@12400000 {
                                status          = "disabled";
                                compatible      = "arm,pl18x", "arm,primecell";
                                arm,primecell-periphid = <0x00051180>;
@@ -280,7 +280,7 @@
                                vmmc-supply = <&vsdcc_fixed>;
                        };
 
-                       sdcc3: sdcc@12180000 {
+                       sdcc3: mmc@12180000 {
                                compatible      = "arm,pl18x", "arm,primecell";
                                arm,primecell-periphid = <0x00051180>;
                                status          = "disabled";