Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 26 Jan 2022 11:17:19 +0000
From:   John Keeping <john@metanate.com>
To:     Johan Jonker <jbx6244@gmail.com>
Cc:     Heiko Stuebner <heiko@sntech.de>, Rob Herring <robh+dt@kernel.org>,
        linux-arm-kernel@lists.infradead.org,
        linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ARM: dts: rockchip: fix MMC compatibles for rk3288
Message-ID: <YfEtv+UIT7Y+d2lx@donbot>
References: <20220125115007.3138311-1-john@metanate.com>
 <7e935740-66a3-da07-a196-0584dab310b9@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <7e935740-66a3-da07-a196-0584dab310b9@gmail.com>
Precedence: bulk

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 <john@metanate.com>
> > ---
> >  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;