Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57af711d authored by Hans de Goede's avatar Hans de Goede Committed by Ulf Hansson
Browse files

ARM: dts: sunxi: Use new sun7i-a20-mmc compatible on sun7i and newer 



Use the new sun7i-a20-mmc compatible for the mmc controllers on sun7i
and newer.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent b465646e

arch/arm/boot/dts/sun6i-a31.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ 
		};



		mmc0: mmc@01c0f000 {

			compatible = "allwinner,sun5i-a13-mmc";

			compatible = "allwinner,sun7i-a20-mmc";

			reg = <0x01c0f000 0x1000>;

			clocks = <&ahb1_gates 8>,

				 <&mmc0_clk 0>,
@@ -488,7 +488,7 @@ 
		};



		mmc1: mmc@01c10000 {

			compatible = "allwinner,sun5i-a13-mmc";

			compatible = "allwinner,sun7i-a20-mmc";

			reg = <0x01c10000 0x1000>;

			clocks = <&ahb1_gates 9>,

				 <&mmc1_clk 0>,
@@ -507,7 +507,7 @@ 
		};



		mmc2: mmc@01c11000 {

			compatible = "allwinner,sun5i-a13-mmc";

			compatible = "allwinner,sun7i-a20-mmc";

			reg = <0x01c11000 0x1000>;

			clocks = <&ahb1_gates 10>,

				 <&mmc2_clk 0>,
@@ -526,7 +526,7 @@ 
		};



		mmc3: mmc@01c12000 {

			compatible = "allwinner,sun5i-a13-mmc";

			compatible = "allwinner,sun7i-a20-mmc";

			reg = <0x01c12000 0x1000>;

			clocks = <&ahb1_gates 11>,

				 <&mmc3_clk 0>,

arch/arm/boot/dts/sun7i-a20.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -905,7 +905,7 @@ 
		};



		mmc0: mmc@01c0f000 {

			compatible = "allwinner,sun5i-a13-mmc";

			compatible = "allwinner,sun7i-a20-mmc";

			reg = <0x01c0f000 0x1000>;

			clocks = <&ahb_gates 8>,

				 <&mmc0_clk 0>,
@@ -922,7 +922,7 @@ 
		};



		mmc1: mmc@01c10000 {

			compatible = "allwinner,sun5i-a13-mmc";

			compatible = "allwinner,sun7i-a20-mmc";

			reg = <0x01c10000 0x1000>;

			clocks = <&ahb_gates 9>,

				 <&mmc1_clk 0>,
@@ -939,7 +939,7 @@ 
		};



		mmc2: mmc@01c11000 {

			compatible = "allwinner,sun5i-a13-mmc";

			compatible = "allwinner,sun7i-a20-mmc";

			reg = <0x01c11000 0x1000>;

			clocks = <&ahb_gates 10>,

				 <&mmc2_clk 0>,
@@ -956,7 +956,7 @@ 
		};



		mmc3: mmc@01c12000 {

			compatible = "allwinner,sun5i-a13-mmc";

			compatible = "allwinner,sun7i-a20-mmc";

			reg = <0x01c12000 0x1000>;

			clocks = <&ahb_gates 11>,

				 <&mmc3_clk 0>,

arch/arm/boot/dts/sun8i-a23-a33.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ 
		};



		mmc0: mmc@01c0f000 {

			compatible = "allwinner,sun5i-a13-mmc";

			compatible = "allwinner,sun7i-a20-mmc";

			reg = <0x01c0f000 0x1000>;

			clocks = <&ahb1_gates 8>,

				 <&mmc0_clk 0>,
@@ -285,7 +285,7 @@ 
		};



		mmc1: mmc@01c10000 {

			compatible = "allwinner,sun5i-a13-mmc";

			compatible = "allwinner,sun7i-a20-mmc";

			reg = <0x01c10000 0x1000>;

			clocks = <&ahb1_gates 9>,

				 <&mmc1_clk 0>,
@@ -304,7 +304,7 @@ 
		};



		mmc2: mmc@01c11000 {

			compatible = "allwinner,sun5i-a13-mmc";

			compatible = "allwinner,sun7i-a20-mmc";

			reg = <0x01c11000 0x1000>;

			clocks = <&ahb1_gates 10>,

				 <&mmc2_clk 0>,

arch/arm/boot/dts/sun8i-h3.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ 
		};



		mmc0: mmc@01c0f000 {

			compatible = "allwinner,sun5i-a13-mmc";

			compatible = "allwinner,sun7i-a20-mmc";

			reg = <0x01c0f000 0x1000>;

			clocks = <&ccu CLK_BUS_MMC0>,

				 <&ccu CLK_MMC0>,
@@ -169,7 +169,7 @@ 
		};



		mmc1: mmc@01c10000 {

			compatible = "allwinner,sun5i-a13-mmc";

			compatible = "allwinner,sun7i-a20-mmc";

			reg = <0x01c10000 0x1000>;

			clocks = <&ccu CLK_BUS_MMC1>,

				 <&ccu CLK_MMC1>,
@@ -188,7 +188,7 @@ 
		};



		mmc2: mmc@01c11000 {

			compatible = "allwinner,sun5i-a13-mmc";

			compatible = "allwinner,sun7i-a20-mmc";

			reg = <0x01c11000 0x1000>;

			clocks = <&ccu CLK_BUS_MMC2>,

				 <&ccu CLK_MMC2>,