mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-21 23:21:58 +00:00
ppc4xx: Fix 4xx enet driver to support 460GT EMAC2+3
This patch fixes a problem with the RGMII setup of the 460GT. The 460GT has 2 RGMII instances and we need to configure the 2nd RGMII instance for the EMAC2+3 channels. Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
parent
1c2926abdd
commit
e54ec0f016
1 changed files with 13 additions and 3 deletions
|
@ -717,6 +717,11 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
|
||||||
#ifdef CONFIG_4xx_DCACHE
|
#ifdef CONFIG_4xx_DCACHE
|
||||||
static u32 last_used_ea = 0;
|
static u32 last_used_ea = 0;
|
||||||
#endif
|
#endif
|
||||||
|
#if defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \
|
||||||
|
defined(CONFIG_460EX) || defined(CONFIG_460GT) || \
|
||||||
|
defined(CONFIG_405EX)
|
||||||
|
int rgmii_channel;
|
||||||
|
#endif
|
||||||
|
|
||||||
EMAC_4XX_HW_PST hw_p = dev->priv;
|
EMAC_4XX_HW_PST hw_p = dev->priv;
|
||||||
|
|
||||||
|
@ -1022,12 +1027,17 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
|
||||||
#if defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \
|
#if defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \
|
||||||
defined(CONFIG_460EX) || defined(CONFIG_460GT) || \
|
defined(CONFIG_460EX) || defined(CONFIG_460GT) || \
|
||||||
defined(CONFIG_405EX)
|
defined(CONFIG_405EX)
|
||||||
|
if (devnum >= 2)
|
||||||
|
rgmii_channel = devnum - 2;
|
||||||
|
else
|
||||||
|
rgmii_channel = devnum;
|
||||||
|
|
||||||
if (speed == 1000)
|
if (speed == 1000)
|
||||||
reg = (RGMII_SSR_SP_1000MBPS << RGMII_SSR_V (devnum));
|
reg = (RGMII_SSR_SP_1000MBPS << RGMII_SSR_V(rgmii_channel));
|
||||||
else if (speed == 100)
|
else if (speed == 100)
|
||||||
reg = (RGMII_SSR_SP_100MBPS << RGMII_SSR_V (devnum));
|
reg = (RGMII_SSR_SP_100MBPS << RGMII_SSR_V(rgmii_channel));
|
||||||
else if (speed == 10)
|
else if (speed == 10)
|
||||||
reg = (RGMII_SSR_SP_10MBPS << RGMII_SSR_V (devnum));
|
reg = (RGMII_SSR_SP_10MBPS << RGMII_SSR_V(rgmii_channel));
|
||||||
else {
|
else {
|
||||||
printf("Error in RGMII Speed\n");
|
printf("Error in RGMII Speed\n");
|
||||||
return -1;
|
return -1;
|
||||||
|
|
Loading…
Reference in a new issue