Skip to content

Commit f17d7a0

Browse files
bhargav-j47joyxu
authored andcommitted
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>
1 parent 6de23f8 commit f17d7a0

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

arch/arm64/boot/dts/hisilicon/hi3660.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,7 +1057,7 @@
10571057
};
10581058

10591059
/* SD */
1060-
dwmmc1: dwmmc1@ff37f000 {
1060+
dwmmc1: mmc@ff37f000 {
10611061
compatible = "hisilicon,hi3660-dw-mshc";
10621062
reg = <0x0 0xff37f000 0x0 0x1000>;
10631063
#address-cells = <1>;
@@ -1075,7 +1075,7 @@
10751075
};
10761076

10771077
/* SDIO */
1078-
dwmmc2: dwmmc2@ff3ff000 {
1078+
dwmmc2: mmc@ff3ff000 {
10791079
compatible = "hisilicon,hi3660-dw-mshc";
10801080
reg = <0x0 0xff3ff000 0x0 0x1000>;
10811081
#address-cells = <0x1>;

arch/arm64/boot/dts/hisilicon/hi3670.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@
679679
};
680680

681681
/* SD */
682-
dwmmc1: dwmmc1@ff37f000 {
682+
dwmmc1: mmc@ff37f000 {
683683
compatible = "hisilicon,hi3670-dw-mshc",
684684
"hisilicon,hi3660-dw-mshc";
685685
reg = <0x0 0xff37f000 0x0 0x1000>;
@@ -698,7 +698,7 @@
698698
};
699699

700700
/* SDIO */
701-
dwmmc2: dwmmc2@fc183000 {
701+
dwmmc2: mmc@fc183000 {
702702
compatible = "hisilicon,hi3670-dw-mshc",
703703
"hisilicon,hi3660-dw-mshc";
704704
reg = <0x0 0xfc183000 0x0 0x1000>;

arch/arm64/boot/dts/hisilicon/hi6220.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,7 @@
799799
#mbox-cells = <3>;
800800
};
801801

802-
dwmmc_0: dwmmc0@f723d000 {
802+
dwmmc_0: mmc@f723d000 {
803803
compatible = "hisilicon,hi6220-dw-mshc";
804804
reg = <0x0 0xf723d000 0x0 0x1000>;
805805
interrupts = <0x0 0x48 0x4>;
@@ -812,7 +812,7 @@
812812
&emmc_cfg_func &emmc_rst_cfg_func>;
813813
};
814814

815-
dwmmc_1: dwmmc1@f723e000 {
815+
dwmmc_1: mmc@f723e000 {
816816
compatible = "hisilicon,hi6220-dw-mshc";
817817
hisilicon,peripheral-syscon = <&ao_ctrl>;
818818
reg = <0x0 0xf723e000 0x0 0x1000>;
@@ -828,7 +828,7 @@
828828
pinctrl-1 = <&sd_pmx_idle &sd_clk_cfg_idle &sd_cfg_idle>;
829829
};
830830

831-
dwmmc_2: dwmmc2@f723f000 {
831+
dwmmc_2: mmc@f723f000 {
832832
compatible = "hisilicon,hi6220-dw-mshc";
833833
reg = <0x0 0xf723f000 0x0 0x1000>;
834834
interrupts = <0x0 0x4a 0x4>;

0 commit comments

Comments
 (0)