Hi Nicolas, On mer., déc. 16 2015, Nicolas Ferre <nicolas.fe...@atmel.com> wrote:
> Le 16/12/2015 11:27, Gregory CLEMENT a écrit : >> During the initialization of PHY the gigabit bit capable is set if the >> controller is a GEM. However, for sama5d2 and sama5d4, the GEM is >> configured to support only 10/100. >> >> Improperly setting the GBE capability leads to an unresponsive MAC >> controller. This patch fix this behavior allowing to use the gmac with >> these SoCs. >> >> Suggested-by: Nicolas Ferre <nicolas.fe...@atmel.com> >> Signed-off-by: Gregory CLEMENT <gregory.clem...@free-electrons.com> >> >> fix gem >> --- >> drivers/net/macb.c | 13 +++++++++++-- >> 1 file changed, 11 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/net/macb.c b/drivers/net/macb.c >> index a5c1880..ab38f48 100644 >> --- a/drivers/net/macb.c >> +++ b/drivers/net/macb.c >> @@ -109,6 +109,15 @@ static int macb_is_gem(struct macb_device *macb) >> return MACB_BFEXT(IDNUM, macb_readl(macb, MID)) == 0x2; >> } >> >> +static int gem_is_gigabit_capable(struct macb_device *macb) >> +{ >> + /* >> + * The GEM controllers embeded in SAMA5D2 and SAMA5D4 are >> + * configured to support only 10/100. >> + */ >> + return macb_is_gem(macb) && !cpu_is_sama5d2() && !cpu_is_sama5d2(); > > Typo here: sama5d2 twice! > ;-) > > >> +} >> + >> static void macb_mdio_write(struct macb_device *macb, u8 reg, u16 value) >> { >> unsigned long netctl; >> @@ -480,8 +489,8 @@ static int macb_phy_init(struct macb_device *macb) >> return 0; >> } >> >> - /* First check for GMAC */ >> - if (macb_is_gem(macb)) { >> + /* First check for GMAC and that it is GiB capable */ >> + if (gem_is_gigabit_capable(macb)) And here a { was missing! Sorry for the nois a v3 will come. Gregory >> lpa = macb_mdio_read(macb, MII_STAT1000); >> >> if (lpa & (LPA_1000FULL | LPA_1000HALF)) { >> > > > -- > Nicolas Ferre -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot