Commit 3ef7c255 authored by Johan Jonker's avatar Johan Jonker Committed by Heiko Stuebner
Browse files

arm64: dts: rockchip: rename dwmmc node names to mmc 



Current dts files with 'dwmmc' nodes are manually verified.
In order to automate this process rockchip-dw-mshc.txt
has to be converted to yaml. In the new setup
rockchip-dw-mshc.yaml will inherit properties from
mmc-controller.yaml and synopsys-dw-mshc-common.yaml.
'dwmmc' will no longer be a valid name for a node,
so change them all to 'mmc'

Signed-off-by: default avatarJohan Jonker <jbx6244@gmail.com>
Link: https://lore.kernel.org/r/20200115185244.18149-2-jbx6244@gmail.com


Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 110f0271

arch/arm64/boot/dts/rockchip/px30.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -924,7 +924,7 @@ gmac: ethernet@ff360000 { 
		status = "disabled";

	};



	sdmmc: dwmmc@ff370000 {

	sdmmc: mmc@ff370000 {

		compatible = "rockchip,px30-dw-mshc", "rockchip,rk3288-dw-mshc";

		reg = <0x0 0xff370000 0x0 0x4000>;

		interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
@@ -939,7 +939,7 @@ sdmmc: dwmmc@ff370000 { 
		status = "disabled";

	};



	sdio: dwmmc@ff380000 {

	sdio: mmc@ff380000 {

		compatible = "rockchip,px30-dw-mshc", "rockchip,rk3288-dw-mshc";

		reg = <0x0 0xff380000 0x0 0x4000>;

		interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
@@ -954,7 +954,7 @@ sdio: dwmmc@ff380000 { 
		status = "disabled";

	};



	emmc: dwmmc@ff390000 {

	emmc: mmc@ff390000 {

		compatible = "rockchip,px30-dw-mshc", "rockchip,rk3288-dw-mshc";

		reg = <0x0 0xff390000 0x0 0x4000>;

		interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/rockchip/rk3308.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ spdif_tx: spdif-tx@ff3a0000 { 
		status = "disabled";

	};



	sdmmc: dwmmc@ff480000 {

	sdmmc: mmc@ff480000 {

		compatible = "rockchip,rk3308-dw-mshc", "rockchip,rk3288-dw-mshc";

		reg = <0x0 0xff480000 0x0 0x4000>;

		interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
@@ -599,7 +599,7 @@ sdmmc: dwmmc@ff480000 { 
		status = "disabled";

	};



	emmc: dwmmc@ff490000 {

	emmc: mmc@ff490000 {

		compatible = "rockchip,rk3308-dw-mshc", "rockchip,rk3288-dw-mshc";

		reg = <0x0 0xff490000 0x0 0x4000>;

		interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
@@ -612,7 +612,7 @@ emmc: dwmmc@ff490000 { 
		status = "disabled";

	};



	sdio: dwmmc@ff4a0000 {

	sdio: mmc@ff4a0000 {

		compatible = "rockchip,rk3308-dw-mshc", "rockchip,rk3288-dw-mshc";

		reg = <0x0 0xff4a0000 0x0 0x4000>;

		interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/rockchip/rk3328.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -854,7 +854,7 @@ u2phy_host: host-port { 
		};

	};



	sdmmc: dwmmc@ff500000 {

	sdmmc: mmc@ff500000 {

		compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc";

		reg = <0x0 0xff500000 0x0 0x4000>;

		interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
@@ -866,7 +866,7 @@ sdmmc: dwmmc@ff500000 { 
		status = "disabled";

	};



	sdio: dwmmc@ff510000 {

	sdio: mmc@ff510000 {

		compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc";

		reg = <0x0 0xff510000 0x0 0x4000>;

		interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
@@ -878,7 +878,7 @@ sdio: dwmmc@ff510000 { 
		status = "disabled";

	};



	emmc: dwmmc@ff520000 {

	emmc: mmc@ff520000 {

		compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc";

		reg = <0x0 0xff520000 0x0 0x4000>;

		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/rockchip/rk3368.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ xin24m: oscillator { 
		#clock-cells = <0>;

	};



	sdmmc: dwmmc@ff0c0000 {

	sdmmc: mmc@ff0c0000 {

		compatible = "rockchip,rk3368-dw-mshc", "rockchip,rk3288-dw-mshc";

		reg = <0x0 0xff0c0000 0x0 0x4000>;

		max-frequency = <150000000>;
@@ -218,7 +218,7 @@ sdmmc: dwmmc@ff0c0000 { 
		status = "disabled";

	};



	sdio0: dwmmc@ff0d0000 {

	sdio0: mmc@ff0d0000 {

		compatible = "rockchip,rk3368-dw-mshc", "rockchip,rk3288-dw-mshc";

		reg = <0x0 0xff0d0000 0x0 0x4000>;

		max-frequency = <150000000>;
@@ -232,7 +232,7 @@ sdio0: dwmmc@ff0d0000 { 
		status = "disabled";

	};



	emmc: dwmmc@ff0f0000 {

	emmc: mmc@ff0f0000 {

		compatible = "rockchip,rk3368-dw-mshc", "rockchip,rk3288-dw-mshc";

		reg = <0x0 0xff0f0000 0x0 0x4000>;

		max-frequency = <150000000>;

arch/arm64/boot/dts/rockchip/rk3399.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ gmac: ethernet@fe300000 { 
		status = "disabled";

	};



	sdio0: dwmmc@fe310000 {

	sdio0: mmc@fe310000 {

		compatible = "rockchip,rk3399-dw-mshc",

			     "rockchip,rk3288-dw-mshc";

		reg = <0x0 0xfe310000 0x0 0x4000>;
@@ -307,7 +307,7 @@ sdio0: dwmmc@fe310000 { 
		status = "disabled";

	};



	sdmmc: dwmmc@fe320000 {

	sdmmc: mmc@fe320000 {

		compatible = "rockchip,rk3399-dw-mshc",

			     "rockchip,rk3288-dw-mshc";

		reg = <0x0 0xfe320000 0x0 0x4000>;