Prior to commit 4bac670aa5cb ("mmc: dw_mmc: rockchip: use common_caps")
the mshcN aliases were used in an unusual way by the dw_mmc driver and
affected behaviour. Now that this has been fixed, rename the mmc
aliases to use the standard form.
Signed-off-by: John Keeping <[email protected]>
---
arch/arm/boot/dts/rk3288.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index aaaa61875701..50fa0a4652b5 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -25,10 +25,10 @@ aliases {
i2c3 = &i2c3;
i2c4 = &i2c4;
i2c5 = &i2c5;
- mshc0 = &emmc;
- mshc1 = &sdmmc;
- mshc2 = &sdio0;
- mshc3 = &sdio1;
+ mmc0 = &emmc;
+ mmc1 = &sdmmc;
+ mmc2 = &sdio0;
+ mmc3 = &sdio1;
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
--
2.35.0
Hi John,
MMC aliases should go in the dts board files.
Sort on reg address, based on availability and without number gab.
(For rk3288 a lot of boards to change. That's why it wasn't done
yet...Could someone pick that up?)
Johan
On 1/25/22 12:50, John Keeping wrote:
> Prior to commit 4bac670aa5cb ("mmc: dw_mmc: rockchip: use common_caps")
> the mshcN aliases were used in an unusual way by the dw_mmc driver and
> affected behaviour. Now that this has been fixed, rename the mmc
> aliases to use the standard form.
>
> Signed-off-by: John Keeping <[email protected]>
> ---
> arch/arm/boot/dts/rk3288.dtsi | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
> index aaaa61875701..50fa0a4652b5 100644
> --- a/arch/arm/boot/dts/rk3288.dtsi
> +++ b/arch/arm/boot/dts/rk3288.dtsi
> @@ -25,10 +25,10 @@ aliases {
> i2c3 = &i2c3;
> i2c4 = &i2c4;
> i2c5 = &i2c5;
> - mshc0 = &emmc;
> - mshc1 = &sdmmc;
> - mshc2 = &sdio0;
> - mshc3 = &sdio1;
> + mmc0 = &emmc;
> + mmc1 = &sdmmc;
> + mmc2 = &sdio0;
> + mmc3 = &sdio1;
> serial0 = &uart0;
> serial1 = &uart1;
> serial2 = &uart2;
Hi Johan,
On Tue, Jan 25, 2022 at 01:14:21PM +0100, Johan Jonker wrote:
> MMC aliases should go in the dts board files.
> Sort on reg address, based on availability and without number gab.
> (For rk3288 a lot of boards to change. That's why it wasn't done
> yet...Could someone pick that up?)
Since there aren't any mmc aliases for rk3288 at the moment, I'll drop
this and send a patch adding them for the one board I have access to.
At some point the nonstandard mshc aliases should be removed, but it
may be best to keep them around for a while given that 5.17 will be the
first kernel that doesn't use these as a weird mechanism for per-port
settings.
> On 1/25/22 12:50, John Keeping wrote:
> > Prior to commit 4bac670aa5cb ("mmc: dw_mmc: rockchip: use common_caps")
> > the mshcN aliases were used in an unusual way by the dw_mmc driver and
> > affected behaviour. Now that this has been fixed, rename the mmc
> > aliases to use the standard form.
> >
> > Signed-off-by: John Keeping <[email protected]>
> > ---
> > arch/arm/boot/dts/rk3288.dtsi | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
> > index aaaa61875701..50fa0a4652b5 100644
> > --- a/arch/arm/boot/dts/rk3288.dtsi
> > +++ b/arch/arm/boot/dts/rk3288.dtsi
> > @@ -25,10 +25,10 @@ aliases {
> > i2c3 = &i2c3;
> > i2c4 = &i2c4;
> > i2c5 = &i2c5;
> > - mshc0 = &emmc;
> > - mshc1 = &sdmmc;
> > - mshc2 = &sdio0;
> > - mshc3 = &sdio1;
> > + mmc0 = &emmc;
> > + mmc1 = &sdmmc;
> > + mmc2 = &sdio0;
> > + mmc3 = &sdio1;
> > serial0 = &uart0;
> > serial1 = &uart1;
> > serial2 = &uart2;