Re: [PATCH v3] ARM: at91: Fix link breakage when !CONFIG_PHYLIB

[Nicolas Ferre]

On 27/05/2013 14:42, Arnd Bergmann :
> On Monday 27 May 2013 14:05:13 Nicolas Ferre wrote:
> > On 27/05/2013 12:48, Alexandre Belloni :
> > A v3 is not needed simply for this. Thanks, anyway!
> >
> > One question though: why not just add
> >
> >           select PHYLIB
> >
> > In Kconfig entry:
> >
> >    config MACH_SAMA5_DT
> >
> > ?
> >
> > (note that I like to play with everybody's nerves ;-))
>
> That would make it impossible to build a sama5 kernel without networking
> support, which is probably not what you want.
>
> Jean-Christophe's suggestion to add the inline helper is best.

It seems that it has been clearly rejected by David. So the best 
solution remains to...

> Aside from
> that, please note that
>
> > > diff --git a/arch/arm/mach-at91/board-dt-sama5.c b/arch/arm/mach-at91/board-dt-sama5.c
> > > index 705305e..e9ce541 100644
> > > --- a/arch/arm/mach-at91/board-dt-sama5.c
> > > +++ b/arch/arm/mach-at91/board-dt-sama5.c
> > > @@ -47,22 +47,24 @@ static int ksz9021rn_phy_fixup(struct phy_device *phy)
> > >    #define GMII_ERCR	11
> > >    #define GMII_ERDWR	12
> > >
> > > -	/* Set delay values */
> > > -	value = GMII_RCCPSR | 0x8000;
> > > -	phy_write(phy, GMII_ERCR, value);
> > > -	value = 0xF2F4;
> > > -	phy_write(phy, GMII_ERDWR, value);
> > > -	value = GMII_RRDPSR | 0x8000;
> > > -	phy_write(phy, GMII_ERCR, value);
> > > -	value = 0x2222;
> > > -	phy_write(phy, GMII_ERDWR, value);
> > > +	if (IS_BUILTIN(CONFIG_PHYLIB)) {
> > > +		/* Set delay values */
> > > +		value = GMII_RCCPSR | 0x8000;
> > > +		phy_write(phy, GMII_ERCR, value);
> > > +		value = 0xF2F4;
> > > +		phy_write(phy, GMII_ERDWR, value);
> > > +		value = GMII_RRDPSR | 0x8000;
> > > +		phy_write(phy, GMII_ERCR, value);
> > > +		value = 0x2222;
> > > +		phy_write(phy, GMII_ERDWR, value);
> > > +	}
> > >
> > >    	return 0;
> > >    }
>
> This part of the patch is not actually needed if you
>
> > >    static void __init sama5_dt_device_init(void)
> > >    {
> > > -	if (of_machine_is_compatible("atmel,sama5d3xcm"))
> > > +	if (of_machine_is_compatible("atmel,sama5d3xcm") && IS_BUILTIN(CONFIG_PHYLIB))
> > >    		phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK,
> > >    			ksz9021rn_phy_fixup);
>
> do this change, or the inline helper.

... simply use this "IS_BUILTIN(CONFIG_PHYLIB)" here -----^^^^^^^^^ (and 
not above as suggested by Arnd).

Jean-Christophe, Alexandre: do you agree with this conclusion?

I plan to stack this patch for next at91-fixes batch.

Bye,
--
Nicolas Ferre
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/