| Message ID | 20201201032127.41681-1-yangbo.lu@nxp.com |
|---|---|
| State | New |
| Headers | show |
| Series | arm64: dts: freescale: use fixed index mmcN for NXP layerscape reference boards | expand |
On Tue, Dec 01, 2020 at 11:21:27AM +0800, Yangbo Lu wrote: > The eSDHC driver has converted to use asynchronous probe. > Let's use fixed index mmcN for eSDHC controllers, so that > we can ignore the effect on usage, and avoid problem on > previous use cases with fixed index mmcblkN. > > Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> > --- > arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts | 5 +++++ > arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 5 +++++ > arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 5 +++++ > arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts | 2 ++ > arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts | 2 ++ > arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts | 2 ++ > 6 files changed, 21 insertions(+) > > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts b/arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts > index 6290e2f..76b7e29 100644 > --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts > @@ -14,6 +14,11 @@ > / { > model = "LS1012A FRWY Board"; > compatible = "fsl,ls1012a-frwy", "fsl,ls1012a"; > + > + aliases { > + mmc0 = &esdhc0; > + mmc1 = &esdhc1; > + }; Are these esdhc devices enabled in the board dts? I think that the aliases are only needed for enabled devices. Shawn > }; > > &duart0 { > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts > index 449475a..e22c5e7 100644 > --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts > @@ -13,6 +13,11 @@ > model = "LS1012A QDS Board"; > compatible = "fsl,ls1012a-qds", "fsl,ls1012a"; > > + aliases { > + mmc0 = &esdhc0; > + mmc1 = &esdhc1; > + }; > + > sys_mclk: clock-mclk { > compatible = "fixed-clock"; > #clock-cells = <0>; > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts > index d45c176..f939d65 100644 > --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts > @@ -12,6 +12,11 @@ > / { > model = "LS1012A RDB Board"; > compatible = "fsl,ls1012a-rdb", "fsl,ls1012a"; > + > + aliases { > + mmc0 = &esdhc0; > + mmc1 = &esdhc1; > + }; > }; > > &duart0 { > diff --git a/arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts > index 2d1fe6c..4ec1a4c 100644 > --- a/arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts > +++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts > @@ -15,6 +15,8 @@ > aliases { > crypto = &crypto; > serial0 = &uart0; > + mmc0 = &esdhc0; > + mmc1 = &esdhc1; > }; > > chosen { > diff --git a/arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts > index 7723ad5..bdb3b04 100644 > --- a/arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts > +++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts > @@ -15,6 +15,8 @@ > aliases { > crypto = &crypto; > serial0 = &uart0; > + mmc0 = &esdhc0; > + mmc1 = &esdhc1; > }; > > chosen { > diff --git a/arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts > index 9178684..69e99cb 100644 > --- a/arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts > +++ b/arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts > @@ -15,6 +15,8 @@ > aliases { > crypto = &crypto; > serial0 = &uart0; > + mmc0 = &esdhc0; > + mmc1 = &esdhc1; > }; > > chosen { > -- > 2.7.4 >
Hi Shawn, > -----Original Message----- > From: Shawn Guo <shawnguo@kernel.org> > Sent: Tuesday, January 5, 2021 10:13 AM > To: Y.b. Lu <yangbo.lu@nxp.com> > Cc: devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org; Leo Li > <leoyang.li@nxp.com>; Vladimir Oltean <vladimir.oltean@nxp.com>; Rob > Herring <robh+dt@kernel.org>; Michael Walle <michael@walle.cc> > Subject: Re: [PATCH] arm64: dts: freescale: use fixed index mmcN for NXP > layerscape reference boards > > On Tue, Dec 01, 2020 at 11:21:27AM +0800, Yangbo Lu wrote: > > The eSDHC driver has converted to use asynchronous probe. > > Let's use fixed index mmcN for eSDHC controllers, so that > > we can ignore the effect on usage, and avoid problem on > > previous use cases with fixed index mmcblkN. > > > > Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> > > --- > > arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts | 5 +++++ > > arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 5 +++++ > > arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 5 +++++ > > arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts | 2 ++ > > arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts | 2 ++ > > arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts | 2 ++ > > 6 files changed, 21 insertions(+) > > > > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts > b/arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts > > index 6290e2f..76b7e29 100644 > > --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts > > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts > > @@ -14,6 +14,11 @@ > > / { > > model = "LS1012A FRWY Board"; > > compatible = "fsl,ls1012a-frwy", "fsl,ls1012a"; > > + > > + aliases { > > + mmc0 = &esdhc0; > > + mmc1 = &esdhc1; > > + }; > > Are these esdhc devices enabled in the board dts? I think that the > aliases are only needed for enabled devices. Sent out v2 to dropped the changes since esdhc devices hadn't been enabled and tested. > > Shawn > > > }; > > > > &duart0 { > > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts > b/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts > > index 449475a..e22c5e7 100644 > > --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts > > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts > > @@ -13,6 +13,11 @@ > > model = "LS1012A QDS Board"; > > compatible = "fsl,ls1012a-qds", "fsl,ls1012a"; > > > > + aliases { > > + mmc0 = &esdhc0; > > + mmc1 = &esdhc1; > > + }; > > + > > sys_mclk: clock-mclk { > > compatible = "fixed-clock"; > > #clock-cells = <0>; > > diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts > b/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts > > index d45c176..f939d65 100644 > > --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts > > +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts > > @@ -12,6 +12,11 @@ > > / { > > model = "LS1012A RDB Board"; > > compatible = "fsl,ls1012a-rdb", "fsl,ls1012a"; > > + > > + aliases { > > + mmc0 = &esdhc0; > > + mmc1 = &esdhc1; > > + }; > > }; > > > > &duart0 { > > diff --git a/arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts > b/arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts > > index 2d1fe6c..4ec1a4c 100644 > > --- a/arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts > > +++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts > > @@ -15,6 +15,8 @@ > > aliases { > > crypto = &crypto; > > serial0 = &uart0; > > + mmc0 = &esdhc0; > > + mmc1 = &esdhc1; > > }; > > > > chosen { > > diff --git a/arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts > b/arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts > > index 7723ad5..bdb3b04 100644 > > --- a/arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts > > +++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts > > @@ -15,6 +15,8 @@ > > aliases { > > crypto = &crypto; > > serial0 = &uart0; > > + mmc0 = &esdhc0; > > + mmc1 = &esdhc1; > > }; > > > > chosen { > > diff --git a/arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts > b/arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts > > index 9178684..69e99cb 100644 > > --- a/arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts > > +++ b/arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts > > @@ -15,6 +15,8 @@ > > aliases { > > crypto = &crypto; > > serial0 = &uart0; > > + mmc0 = &esdhc0; > > + mmc1 = &esdhc1; > > }; > > > > chosen { > > -- > > 2.7.4 > >
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts b/arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts index 6290e2f..76b7e29 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts @@ -14,6 +14,11 @@ / { model = "LS1012A FRWY Board"; compatible = "fsl,ls1012a-frwy", "fsl,ls1012a"; + + aliases { + mmc0 = &esdhc0; + mmc1 = &esdhc1; + }; }; &duart0 { diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts index 449475a..e22c5e7 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts @@ -13,6 +13,11 @@ model = "LS1012A QDS Board"; compatible = "fsl,ls1012a-qds", "fsl,ls1012a"; + aliases { + mmc0 = &esdhc0; + mmc1 = &esdhc1; + }; + sys_mclk: clock-mclk { compatible = "fixed-clock"; #clock-cells = <0>; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts index d45c176..f939d65 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts @@ -12,6 +12,11 @@ / { model = "LS1012A RDB Board"; compatible = "fsl,ls1012a-rdb", "fsl,ls1012a"; + + aliases { + mmc0 = &esdhc0; + mmc1 = &esdhc1; + }; }; &duart0 { diff --git a/arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts index 2d1fe6c..4ec1a4c 100644 --- a/arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts +++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts @@ -15,6 +15,8 @@ aliases { crypto = &crypto; serial0 = &uart0; + mmc0 = &esdhc0; + mmc1 = &esdhc1; }; chosen { diff --git a/arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts index 7723ad5..bdb3b04 100644 --- a/arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts +++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts @@ -15,6 +15,8 @@ aliases { crypto = &crypto; serial0 = &uart0; + mmc0 = &esdhc0; + mmc1 = &esdhc1; }; chosen { diff --git a/arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts index 9178684..69e99cb 100644 --- a/arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts +++ b/arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts @@ -15,6 +15,8 @@ aliases { crypto = &crypto; serial0 = &uart0; + mmc0 = &esdhc0; + mmc1 = &esdhc1; }; chosen {
The eSDHC driver has converted to use asynchronous probe. Let's use fixed index mmcN for eSDHC controllers, so that we can ignore the effect on usage, and avoid problem on previous use cases with fixed index mmcblkN. Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> --- arch/arm64/boot/dts/freescale/fsl-ls1012a-frwy.dts | 5 +++++ arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 5 +++++ arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 5 +++++ arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts | 2 ++ arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts | 2 ++ arch/arm64/boot/dts/freescale/fsl-lx2162a-qds.dts | 2 ++ 6 files changed, 21 insertions(+)