Patchwork Powerpc/t4240: change the compatible flags for t4240qds board

login
register
mail settings
Submitter Haijun.Zhang
Date July 8, 2013, 7:16 a.m.
Message ID <1373267764-6364-1-git-send-email-Haijun.Zhang@freescale.com>
Download mbox | patch
Permalink /patch/257490/
State Rejected
Headers show

Comments

Haijun.Zhang - July 8, 2013, 7:16 a.m.
In order to make a difference between different T4240 board.
Specify T4240QDS board the unique compatible flags for t4240qds
eSDHC host.

Signed-off-by: Haijun Zhang <Haijun.Zhang@freescale.com>
---
 arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Scott Wood - July 8, 2013, 5:14 p.m.
On 07/08/2013 02:16:03 AM, Haijun Zhang wrote:
> In order to make a difference between different T4240 board.
> Specify T4240QDS board the unique compatible flags for t4240qds
> eSDHC host.
> 
> Signed-off-by: Haijun Zhang <Haijun.Zhang@freescale.com>
> ---
>  arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi  
> b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
> index bd611a9..08b47d0 100644
> --- a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
> +++ b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
> @@ -397,7 +397,7 @@
> 
>  /include/ "qoriq-esdhc-0.dtsi"
>  	sdhc@114000 {
> -		compatible = "fsl,t4240-esdhc", "fsl,esdhc";
> +		compatible = "fsl,t4240qds-esdhc", "fsl,esdhc";
>  		sdhci,auto-cmd12;
>  	};

NACK.  This node is describing the sdhc block of the t4240 SoC.  What  
board you stick it in doesn't change what it is.

Plus, what about users with old device trees?

-Scott
Zhang Haijun-B42677 - July 9, 2013, 6:04 a.m.
Regards & Thanks

Haijun.
Zhang Haijun-B42677 - July 10, 2013, 3:41 a.m.
Thanks.

Regards
Haijun.

> -----Original Message-----

> From: Wood Scott-B07421

> Sent: Wednesday, July 10, 2013 4:04 AM

> To: Zhang Haijun-B42677

> Cc: Wood Scott-B07421; linux-mmc@vger.kernel.org; linuxppc-

> dev@lists.ozlabs.org; cbouatmailru@gmail.com; cjb@laptop.org; Fleming

> Andy-AFLEMING; Wrobel Heinz-R39252

> Subject: Re: 答复: [PATCH] Powerpc/t4240: change the compatible flags for

> t4240qds board

> 

> On 07/09/2013 01:04:01 AM, Zhang Haijun-B42677 wrote:

> >

> >

> > Regards & Thanks

> >

> > Haijun.

> >

> > ________________________________________

> > 发件人: Wood Scott-B07421

> > 发送时间: 2013年7月8日 17:14

> > 收件人: Zhang Haijun-B42677

> > 抄送: linux-mmc@vger.kernel.org; linuxppc-dev@lists.ozlabs.org;

> > cbouatmailru@gmail.com; cjb@laptop.org; Fleming Andy-AFLEMING; Wrobel

> > Heinz-R39252; Zhang Haijun-B42677

> > 主题: Re: [PATCH] Powerpc/t4240: change the compatible flags for

> > t4240qds board

> >

> > On 07/08/2013 02:16:03 AM, Haijun Zhang wrote:

> > > In order to make a difference between different T4240 board.

> > > Specify T4240QDS board the unique compatible flags for t4240qds

> > > eSDHC host.

> > >

> > > Signed-off-by: Haijun Zhang <Haijun.Zhang@freescale.com>

> > > ---

> > >  arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 2 +-

> > >  1 file changed, 1 insertion(+), 1 deletion(-)

> > >

> > > diff --git a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi

> > > b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi

> > > index bd611a9..08b47d0 100644

> > > --- a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi

> > > +++ b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi

> > > @@ -397,7 +397,7 @@

> > >

> > >  /include/ "qoriq-esdhc-0.dtsi"

> > >       sdhc@114000 {

> > > -             compatible = "fsl,t4240-esdhc", "fsl,esdhc";

> > > +             compatible = "fsl,t4240qds-esdhc", "fsl,esdhc";

> > >               sdhci,auto-cmd12;

> > >       };

> >

> > NACK.  This node is describing the sdhc block of the t4240 SoC.  What

> > board you stick it in doesn't change what it is.

> >

> > Plus, what about users with old device trees?

> >

> > Currently no users use this ip block except esdhc driver.

> 

> I'm not talking about code users.  I'm talking about people users.

> 

> > How about change this in arch/powerpc/boot/dts/t4240qds.dts

> >

> > +++ b/arch/powerpc/boot/dts/t4240qds.dts

> > @@ -117,6 +117,10 @@

> >                         };

> >                 };

> >

> >                sdhc@114000 {

> >                       compatible = "fsl,t4240-esdhc", "fsl,esdhc";

> >                };

> >

> >                i2c@118000 {

> >

> >

> > +++ b/arch/powerpc/boot/dts/t4240qds.dts

> > @@ -117,6 +117,10 @@

> >                         };

> >                 };

> >

> > +               sdhc@114000 {

> > +                       compatible = "fsl,t4240qds-esdhc",

> > "fsl,esdhc";

> > +               };

> > +

> >                 i2c@118000 {

> 

> No.  It's still supposed to be describing the sdhc block itself, not the

> board -- and any workarounds that key off of this will still fail to work

> with existing device trees.

[Haijun Wrote:] So, leave dts unchanged and to check compitable for board in sdhci-pltfm.c
e.g.:
	unsigned long root = of_get_flat_dt_root();

	if (of_flat_dt_is_compatible(root, "fsl,T4240QDS"))
		host->quirks |= XXX;

Is this ok?
	
> 

> -Scott
Scott Wood - July 10, 2013, 8:30 p.m.
On 07/09/2013 10:41:22 PM, Zhang Haijun-B42677 wrote:
> > No.  It's still supposed to be describing the sdhc block itself,  
> not the
> > board -- and any workarounds that key off of this will still fail  
> to work
> > with existing device trees.
> [Haijun Wrote:] So, leave dts unchanged and to check compitable for  
> board in sdhci-pltfm.c
> e.g.:
> 	unsigned long root = of_get_flat_dt_root();
> 
> 	if (of_flat_dt_is_compatible(root, "fsl,T4240QDS"))
> 		host->quirks |= XXX;

Why are you looking at the flat tree at this point?  Use the normal OF  
accessors.  The flat stuff is only for early boot.

Also make sure that you only do this for quirks that are actually  
board-specific.  In your last patch you had two quirks keyed off of the  
board, one of which is keyed off of the SoC for other chips.

-SCott
Scott Wood - July 11, 2013, 2:35 p.m.
On 07/10/2013 08:02:31 PM, Zhang Haijun-B42677 wrote:
> > Also make sure that you only do this for quirks that are actually  
> board-
> > specific.  In your last patch you had two quirks keyed off of the  
> board,
> > one of which is keyed off of the SoC for other chips.
> >
> [Haijun Wrote:] Actually there are only one board with T4240 Soc.

What about customer boards?  In any case, it's not a reason to look for  
the wrong thing.

-Scott

Patch

diff --git a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
index bd611a9..08b47d0 100644
--- a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
@@ -397,7 +397,7 @@ 
 
 /include/ "qoriq-esdhc-0.dtsi"
 	sdhc@114000 {
-		compatible = "fsl,t4240-esdhc", "fsl,esdhc";
+		compatible = "fsl,t4240qds-esdhc", "fsl,esdhc";
 		sdhci,auto-cmd12;
 	};
 /include/ "qoriq-i2c-0.dtsi"