qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-18 08:38:06 +02:00
Code

ar71xx: reset the phy in the ethernet init on ar724x

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27703 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2011-07-20 12:04:34 +00:00
parent 96c14099ce
commit 8ea4f149b0
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
View File

@ -558,8 +558,10 @@ void __init ar71xx_add_device_eth(unsigned int id)
break; break;
case AR71XX_SOC_AR7242: case AR71XX_SOC_AR7242:
ar71xx_eth0_data.reset_bit |= AR724X_RESET_GE0_MDIO; ar71xx_eth0_data.reset_bit |= AR724X_RESET_GE0_MDIO |
ar71xx_eth1_data.reset_bit |= AR724X_RESET_GE1_MDIO; RESET_MODULE_GE0_PHY;
ar71xx_eth1_data.reset_bit |= AR724X_RESET_GE1_MDIO |
RESET_MODULE_GE1_PHY;
pdata->ddr_flush = id ? ar724x_ddr_flush_ge1 pdata->ddr_flush = id ? ar724x_ddr_flush_ge1
: ar724x_ddr_flush_ge0; : ar724x_ddr_flush_ge0;
pdata->set_pll = id ? ar724x_set_pll_ge1 pdata->set_pll = id ? ar724x_set_pll_ge1
@ -580,6 +582,8 @@ void __init ar71xx_add_device_eth(unsigned int id)
ar71xx_eth1_data.reset_bit |= AR724X_RESET_GE1_MDIO; ar71xx_eth1_data.reset_bit |= AR724X_RESET_GE1_MDIO;
/* fall through */ /* fall through */
case AR71XX_SOC_AR7240: case AR71XX_SOC_AR7240:
ar71xx_eth0_data.reset_bit |= RESET_MODULE_GE0_PHY;
ar71xx_eth1_data.reset_bit |= RESET_MODULE_GE1_PHY;
pdata->ddr_flush = id ? ar724x_ddr_flush_ge1 pdata->ddr_flush = id ? ar724x_ddr_flush_ge1
: ar724x_ddr_flush_ge0; : ar724x_ddr_flush_ge0;
pdata->set_pll = id ? ar724x_set_pll_ge1 pdata->set_pll = id ? ar724x_set_pll_ge1

13
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
View File

@ -433,9 +433,22 @@ static void ag71xx_hw_stop(struct ag71xx *ag)
static void ag71xx_hw_init(struct ag71xx *ag) static void ag71xx_hw_init(struct ag71xx *ag)
{ {
struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag); struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
u32 reset_mask = pdata->reset_bit;
ag71xx_hw_stop(ag); ag71xx_hw_stop(ag);
if (pdata->is_ar724x) {
u32 reset_phy = reset_mask;
reset_phy &= RESET_MODULE_GE0_PHY | RESET_MODULE_GE1_PHY;
reset_mask &= ~(RESET_MODULE_GE0_PHY | RESET_MODULE_GE1_PHY);
ar71xx_device_stop(reset_phy);
mdelay(50);
ar71xx_device_start(reset_phy);
mdelay(200);
}
ag71xx_sb(ag, AG71XX_REG_MAC_CFG1, MAC_CFG1_SR); ag71xx_sb(ag, AG71XX_REG_MAC_CFG1, MAC_CFG1_SR);
udelay(20); udelay(20);