ARM: dts: uniphier: change SD/eMMC node names to follow json-schema

Follow the standard nodename pattern "^mmc(@.*)?$" defined in
Documentation/devicetree/bindings/mmc/mmc-controller.yaml

Otherwise, after the dt-binding is converted to json-schema,
'make ARCH=arm dtbs_check' will show warnings like this:

  sdhc@5a000000: $nodename:0: 'sdhc@5a000000' does not match '^mmc(@.*)?$'

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/boot/dts/uniphier-ld4.dtsi b/arch/arm/boot/dts/uniphier-ld4.dtsi
index 64ec46c72a4cc917c427454f987b0579509abd07..f3a20dc0b22baa660aa888738dd45a3f25c067bc 100644 (file)
--- a/arch/arm/boot/dts/uniphier-ld4.dtsi
+++ b/arch/arm/boot/dts/uniphier-ld4.dtsi
@@ -245,7 +245,7 @@
                        #dma-cells = <1>;
                };
 
-               sd: sdhc@5a400000 {
+               sd: mmc@5a400000 {
                        compatible = "socionext,uniphier-sd-v2.91";
                        status = "disabled";
                        reg = <0x5a400000 0x200>;
@@ -265,7 +265,7 @@
                        sd-uhs-sdr50;
                };
 
-               emmc: sdhc@5a500000 {
+               emmc: mmc@5a500000 {
                        compatible = "socionext,uniphier-sd-v2.91";
                        status = "disabled";
                        reg = <0x5a500000 0x200>;

diff --git a/arch/arm/boot/dts/uniphier-pro4.dtsi b/arch/arm/boot/dts/uniphier-pro4.dtsi
index 2ec04d7972efce1bbc25e2913a6ce2c4188f66ce..e96b5796f0f824a6def195a68ee795cdde83ffa0 100644 (file)
--- a/arch/arm/boot/dts/uniphier-pro4.dtsi
+++ b/arch/arm/boot/dts/uniphier-pro4.dtsi
@@ -279,7 +279,7 @@
                        #dma-cells = <1>;
                };
 
-               sd: sdhc@5a400000 {
+               sd: mmc@5a400000 {
                        compatible = "socionext,uniphier-sd-v2.91";
                        status = "disabled";
                        reg = <0x5a400000 0x200>;
@@ -299,7 +299,7 @@
                        sd-uhs-sdr50;
                };
 
-               emmc: sdhc@5a500000 {
+               emmc: mmc@5a500000 {
                        compatible = "socionext,uniphier-sd-v2.91";
                        status = "disabled";
                        reg = <0x5a500000 0x200>;
@@ -317,7 +317,7 @@
                        non-removable;
                };
 
-               sd1: sdhc@5a600000 {
+               sd1: mmc@5a600000 {
                        compatible = "socionext,uniphier-sd-v2.91";
                        status = "disabled";
                        reg = <0x5a600000 0x200>;

diff --git a/arch/arm/boot/dts/uniphier-pro5.dtsi b/arch/arm/boot/dts/uniphier-pro5.dtsi
index ea3961f920a0bf4c18c5c9e6a6e6f109b53ce295..f794a067676093796613a57340ea474343018ae9 100644 (file)
--- a/arch/arm/boot/dts/uniphier-pro5.dtsi
+++ b/arch/arm/boot/dts/uniphier-pro5.dtsi
@@ -469,7 +469,7 @@
                        resets = <&sys_rst 2>, <&sys_rst 2>;
                };
 
-               emmc: sdhc@68400000 {
+               emmc: mmc@68400000 {
                        compatible = "socionext,uniphier-sd-v3.1";
                        status = "disabled";
                        reg = <0x68400000 0x800>;
@@ -485,7 +485,7 @@
                        non-removable;
                };
 
-               sd: sdhc@68800000 {
+               sd: mmc@68800000 {
                        compatible = "socionext,uniphier-sd-v3.1";
                        status = "disabled";
                        reg = <0x68800000 0x800>;

diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi
index 13b0d4a7741f3ec68099dd77dfb1f140afe5e19c..04d6bef3a00f7be3fe17e052a9e78521af0daa14 100644 (file)
--- a/arch/arm/boot/dts/uniphier-pxs2.dtsi
+++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi
@@ -446,7 +446,7 @@
                        };
                };
 
-               emmc: sdhc@5a000000 {
+               emmc: mmc@5a000000 {
                        compatible = "socionext,uniphier-sd-v3.1.1";
                        status = "disabled";
                        reg = <0x5a000000 0x800>;
@@ -462,7 +462,7 @@
                        non-removable;
                };
 
-               sd: sdhc@5a400000 {
+               sd: mmc@5a400000 {
                        compatible = "socionext,uniphier-sd-v3.1.1";
                        status = "disabled";
                        reg = <0x5a400000 0x800>;

diff --git a/arch/arm/boot/dts/uniphier-sld8.dtsi b/arch/arm/boot/dts/uniphier-sld8.dtsi
index 4fc6676f548693ddb18bbf1cbef51d9bc79e5685..beb1eac8543633982d83044205e1baf8313dcae7 100644 (file)
--- a/arch/arm/boot/dts/uniphier-sld8.dtsi
+++ b/arch/arm/boot/dts/uniphier-sld8.dtsi
@@ -249,7 +249,7 @@
                        #dma-cells = <1>;
                };
 
-               sd: sdhc@5a400000 {
+               sd: mmc@5a400000 {
                        compatible = "socionext,uniphier-sd-v2.91";
                        status = "disabled";
                        reg = <0x5a400000 0x200>;
@@ -269,7 +269,7 @@
                        sd-uhs-sdr50;
                };
 
-               emmc: sdhc@5a500000 {
+               emmc: mmc@5a500000 {
                        compatible = "socionext,uniphier-sd-v2.91";
                        status = "disabled";
                        reg = <0x5a500000 0x200>;