arm64: dts: hisilicon: Rename dwmmc nodes to mmc

The core mmc devicetree schema expects mmc controller nodes to be named
using '^mmc(@.*)?$' pattern.

The legacy Hisilicon SoC files (hi3660, hi3670, and hi6220) previously
used the 'dwmmc' prefix for their nodes. This caused warnings during
dtbs_check.

Rename the 'dwmmc' nodes to 'mmc' to comply with the standard schema and
dtbs_check warnings. The legacy phandle labels are kept intact.

Signed-off-by: Bhargav Joshi <rougueprince47@gmail.com>
Acked-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>

diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
index 957a1b41f19b4b1575cce42682e48b2e3d61a0c8..374aa173bec6d2af09e5800f961e6e7acc142326 100644 (file)
--- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
@@ -1057,7 +1057,7 @@
                };
 
                /* SD */
-               dwmmc1: dwmmc1@ff37f000 {
+               dwmmc1: mmc@ff37f000 {
                        compatible = "hisilicon,hi3660-dw-mshc";
                        reg = <0x0 0xff37f000 0x0 0x1000>;
                        #address-cells = <1>;
@@ -1075,7 +1075,7 @@
                };
 
                /* SDIO */
-               dwmmc2: dwmmc2@ff3ff000 {
+               dwmmc2: mmc@ff3ff000 {
                        compatible = "hisilicon,hi3660-dw-mshc";
                        reg = <0x0 0xff3ff000 0x0 0x1000>;
                        #address-cells = <0x1>;

diff --git a/arch/arm64/boot/dts/hisilicon/hi3670.dtsi b/arch/arm64/boot/dts/hisilicon/hi3670.dtsi
index 886b93c5893a09b8e2e7bf22ee8afba3a5f9a045..0db1849a2878896324572ace0e53ea850768357f 100644 (file)
--- a/arch/arm64/boot/dts/hisilicon/hi3670.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi3670.dtsi
@@ -679,7 +679,7 @@
                };
 
                /* SD */
-               dwmmc1: dwmmc1@ff37f000 {
+               dwmmc1: mmc@ff37f000 {
                        compatible = "hisilicon,hi3670-dw-mshc",
                                     "hisilicon,hi3660-dw-mshc";
                        reg = <0x0 0xff37f000 0x0 0x1000>;
@@ -698,7 +698,7 @@
                };
 
                /* SDIO */
-               dwmmc2: dwmmc2@fc183000 {
+               dwmmc2: mmc@fc183000 {
                        compatible = "hisilicon,hi3670-dw-mshc",
                                     "hisilicon,hi3660-dw-mshc";
                        reg = <0x0 0xfc183000 0x0 0x1000>;

diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
index f8b56d443850f28921847589ceeb31729de96fb1..61eaa7f8c1c90f3ca78520f40167cbc14b588fa0 100644 (file)
--- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
@@ -799,7 +799,7 @@
                        #mbox-cells = <3>;
                };
 
-               dwmmc_0: dwmmc0@f723d000 {
+               dwmmc_0: mmc@f723d000 {
                        compatible = "hisilicon,hi6220-dw-mshc";
                        reg = <0x0 0xf723d000 0x0 0x1000>;
                        interrupts = <0x0 0x48 0x4>;
@@ -812,7 +812,7 @@
                                     &emmc_cfg_func &emmc_rst_cfg_func>;
                };
 
-               dwmmc_1: dwmmc1@f723e000 {
+               dwmmc_1: mmc@f723e000 {
                        compatible = "hisilicon,hi6220-dw-mshc";
                        hisilicon,peripheral-syscon = <&ao_ctrl>;
                        reg = <0x0 0xf723e000 0x0 0x1000>;
@@ -828,7 +828,7 @@
                        pinctrl-1 = <&sd_pmx_idle &sd_clk_cfg_idle &sd_cfg_idle>;
                };
 
-               dwmmc_2: dwmmc2@f723f000 {
+               dwmmc_2: mmc@f723f000 {
                        compatible = "hisilicon,hi6220-dw-mshc";
                        reg = <0x0 0xf723f000 0x0 0x1000>;
                        interrupts = <0x0 0x4a 0x4>;