| Message ID | 1469888748-26085-6-git-send-email-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Jul 30, 2016 at 04:25:48PM +0200, Hans de Goede wrote: > Use the new sun7i-a20-mmc compatible for the mmc controllers on sun7i > and newer. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> This should probably go through Ulf tree together with the rest of that serie to maintain the bisectability. Thanks a lot for this work, Maxime
Hi, On 30-07-16 17:16, Maxime Ripard wrote: > On Sat, Jul 30, 2016 at 04:25:48PM +0200, Hans de Goede wrote: >> Use the new sun7i-a20-mmc compatible for the mmc controllers on sun7i >> and newer. >> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> > > Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > This should probably go through Ulf tree together with the rest of > that serie to maintain the bisectability. This going through Ulf's tree is fine with me, and indeed seems best, ack. Regards, Hans -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Hans, On 30/07/16 15:25, Hans de Goede wrote: > Use the new sun7i-a20-mmc compatible for the mmc controllers on sun7i > and newer. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > Changes in v2: > -New patch in v2 of this patch-set > --- > arch/arm/boot/dts/sun6i-a31.dtsi | 8 ++++---- > arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++---- > arch/arm/boot/dts/sun8i-a23-a33.dtsi | 6 +++--- > arch/arm/boot/dts/sun8i-h3.dtsi | 6 +++--- > 4 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi > index 1867af2..0d24f10 100644 > --- a/arch/arm/boot/dts/sun6i-a31.dtsi > +++ b/arch/arm/boot/dts/sun6i-a31.dtsi > @@ -469,7 +469,7 @@ > }; > > mmc0: mmc@01c0f000 { > - compatible = "allwinner,sun5i-a13-mmc"; > + compatible = "allwinner,sun7i-a20-mmc"; But that breaks systems with newer DTs on older kernels, which do not know about sun7i-a20-mmc. I assume this somehow worked before(?), so why not use: compatible = "allwinner,sun7i-a20-mmc", "allwinner,sun5i-a13-mmc"; So newer kernels would pick up the new name and behaviour, while older kernels would revert to the old name and use the existing driver. Cheers, Andre. > 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>, > diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi > index bd0c476..94cf5a1 100644 > --- a/arch/arm/boot/dts/sun7i-a20.dtsi > +++ b/arch/arm/boot/dts/sun7i-a20.dtsi > @@ -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>, > diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi > index 7e05e09..e3b196e 100644 > --- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi > +++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi > @@ -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>, > diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi > index 93c88f3..b5cc2dc 100644 > --- a/arch/arm/boot/dts/sun8i-h3.dtsi > +++ b/arch/arm/boot/dts/sun8i-h3.dtsi > @@ -154,7 +154,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>, > @@ -173,7 +173,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>, > @@ -192,7 +192,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>, > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On 01-08-16 15:11, Andre Przywara wrote: > Hi Hans, > > On 30/07/16 15:25, Hans de Goede wrote: >> Use the new sun7i-a20-mmc compatible for the mmc controllers on sun7i >> and newer. >> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >> --- >> Changes in v2: >> -New patch in v2 of this patch-set >> --- >> arch/arm/boot/dts/sun6i-a31.dtsi | 8 ++++---- >> arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++---- >> arch/arm/boot/dts/sun8i-a23-a33.dtsi | 6 +++--- >> arch/arm/boot/dts/sun8i-h3.dtsi | 6 +++--- >> 4 files changed, 14 insertions(+), 14 deletions(-) >> >> diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi >> index 1867af2..0d24f10 100644 >> --- a/arch/arm/boot/dts/sun6i-a31.dtsi >> +++ b/arch/arm/boot/dts/sun6i-a31.dtsi >> @@ -469,7 +469,7 @@ >> }; >> >> mmc0: mmc@01c0f000 { >> - compatible = "allwinner,sun5i-a13-mmc"; >> + compatible = "allwinner,sun7i-a20-mmc"; > > But that breaks systems with newer DTs on older kernels, which do not > know about sun7i-a20-mmc. I assume this somehow worked before(?), so why > not use: > compatible = "allwinner,sun7i-a20-mmc", > "allwinner,sun5i-a13-mmc"; > > So newer kernels would pick up the new name and behaviour, while older > kernels would revert to the old name and use the existing driver. Good idea, I'll send a v3 with this change. Regards, Hans > > Cheers, > Andre. > >> 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>, >> diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi >> index bd0c476..94cf5a1 100644 >> --- a/arch/arm/boot/dts/sun7i-a20.dtsi >> +++ b/arch/arm/boot/dts/sun7i-a20.dtsi >> @@ -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>, >> diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi >> index 7e05e09..e3b196e 100644 >> --- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi >> +++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi >> @@ -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>, >> diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi >> index 93c88f3..b5cc2dc 100644 >> --- a/arch/arm/boot/dts/sun8i-h3.dtsi >> +++ b/arch/arm/boot/dts/sun8i-h3.dtsi >> @@ -154,7 +154,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>, >> @@ -173,7 +173,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>, >> @@ -192,7 +192,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>, >> -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Aug 01, 2016 at 02:11:09PM +0100, Andre Przywara wrote: > Hi Hans, > > On 30/07/16 15:25, Hans de Goede wrote: > > Use the new sun7i-a20-mmc compatible for the mmc controllers on sun7i > > and newer. > > > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > > --- > > Changes in v2: > > -New patch in v2 of this patch-set > > --- > > arch/arm/boot/dts/sun6i-a31.dtsi | 8 ++++---- > > arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++---- > > arch/arm/boot/dts/sun8i-a23-a33.dtsi | 6 +++--- > > arch/arm/boot/dts/sun8i-h3.dtsi | 6 +++--- > > 4 files changed, 14 insertions(+), 14 deletions(-) > > > > diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi > > index 1867af2..0d24f10 100644 > > --- a/arch/arm/boot/dts/sun6i-a31.dtsi > > +++ b/arch/arm/boot/dts/sun6i-a31.dtsi > > @@ -469,7 +469,7 @@ > > }; > > > > mmc0: mmc@01c0f000 { > > - compatible = "allwinner,sun5i-a13-mmc"; > > + compatible = "allwinner,sun7i-a20-mmc"; > > But that breaks systems with newer DTs on older kernels, which do not > know about sun7i-a20-mmc. That's not backward compatibility. That's the forward one, and that has never been something we supported. See https://www.kernel.org/doc/Documentation/devicetree/bindings/ABI.txt Maxime
Hi, On 22/08/16 08:54, Maxime Ripard wrote: > On Mon, Aug 01, 2016 at 02:11:09PM +0100, Andre Przywara wrote: >> Hi Hans, >> >> On 30/07/16 15:25, Hans de Goede wrote: >>> Use the new sun7i-a20-mmc compatible for the mmc controllers on sun7i >>> and newer. >>> >>> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >>> --- >>> Changes in v2: >>> -New patch in v2 of this patch-set >>> --- >>> arch/arm/boot/dts/sun6i-a31.dtsi | 8 ++++---- >>> arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++---- >>> arch/arm/boot/dts/sun8i-a23-a33.dtsi | 6 +++--- >>> arch/arm/boot/dts/sun8i-h3.dtsi | 6 +++--- >>> 4 files changed, 14 insertions(+), 14 deletions(-) >>> >>> diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi >>> index 1867af2..0d24f10 100644 >>> --- a/arch/arm/boot/dts/sun6i-a31.dtsi >>> +++ b/arch/arm/boot/dts/sun6i-a31.dtsi >>> @@ -469,7 +469,7 @@ >>> }; >>> >>> mmc0: mmc@01c0f000 { >>> - compatible = "allwinner,sun5i-a13-mmc"; >>> + compatible = "allwinner,sun7i-a20-mmc"; >> >> But that breaks systems with newer DTs on older kernels, which do not >> know about sun7i-a20-mmc. > > That's not backward compatibility. That's the forward one, and that > has never been something we supported. I know, but it's unfortunate anyway and easy to fix with the above mentioned fallback scheme. So isn't that something that we can support anyway, despite it being not strictly necessary? For instance I tend to load different kernels now and then (different distro kernels, older versions for regression checks, ...) and really like the fact that I can go with _one_ known best DT. I understand that that's not always possible, but on the other hand I wouldn't give up so easily, especially if there is a nice way to achieve compatibility without hurting anyone. Cheers, Andre. > See https://www.kernel.org/doc/Documentation/devicetree/bindings/ABI.txt > > Maxime > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi index 1867af2..0d24f10 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -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>, diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index bd0c476..94cf5a1 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -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>, diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi index 7e05e09..e3b196e 100644 --- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi +++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi @@ -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>, diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi index 93c88f3..b5cc2dc 100644 --- a/arch/arm/boot/dts/sun8i-h3.dtsi +++ b/arch/arm/boot/dts/sun8i-h3.dtsi @@ -154,7 +154,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>, @@ -173,7 +173,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>, @@ -192,7 +192,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>,
Use the new sun7i-a20-mmc compatible for the mmc controllers on sun7i and newer. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- Changes in v2: -New patch in v2 of this patch-set --- arch/arm/boot/dts/sun6i-a31.dtsi | 8 ++++---- arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++---- arch/arm/boot/dts/sun8i-a23-a33.dtsi | 6 +++--- arch/arm/boot/dts/sun8i-h3.dtsi | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-)