projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: don't use mac_base2 in the ag71xx driver
[openwrt.git]
/
target
/
linux
/
ar71xx
/
files
/
drivers
/
net
/
ag71xx
/
ag71xx_phy.c
diff --git
a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c
b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c
index
029d8ee
..
6fe4d40
100644
(file)
--- a/
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c
+++ b/
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c
@@
-27,20
+27,11
@@
static unsigned char *ag71xx_speed_str(struct ag71xx *ag)
return "?";
}
return "?";
}
-#define AR71XX_PLL_VAL_1000 0x00110000
-#define AR71XX_PLL_VAL_100 0x00001099
-#define AR71XX_PLL_VAL_10 0x00991099
-
-#define AR91XX_PLL_VAL_1000 0x1a000000
-#define AR91XX_PLL_VAL_100 0x13000a44
-#define AR91XX_PLL_VAL_10 0x00441099
-
static void ag71xx_phy_link_update(struct ag71xx *ag)
{
struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
u32 cfg2;
u32 ifctl;
static void ag71xx_phy_link_update(struct ag71xx *ag)
{
struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
u32 cfg2;
u32 ifctl;
- u32 pll;
u32 fifo5;
u32 mii_speed;
u32 fifo5;
u32 mii_speed;
@@
-65,22
+56,16
@@
static void ag71xx_phy_link_update(struct ag71xx *ag)
case SPEED_1000:
mii_speed = MII_CTRL_SPEED_1000;
cfg2 |= MAC_CFG2_IF_1000;
case SPEED_1000:
mii_speed = MII_CTRL_SPEED_1000;
cfg2 |= MAC_CFG2_IF_1000;
- pll = pdata->is_ar91xx ? AR91XX_PLL_VAL_1000
- : AR71XX_PLL_VAL_1000;
fifo5 |= FIFO_CFG5_BM;
break;
case SPEED_100:
mii_speed = MII_CTRL_SPEED_100;
cfg2 |= MAC_CFG2_IF_10_100;
ifctl |= MAC_IFCTL_SPEED;
fifo5 |= FIFO_CFG5_BM;
break;
case SPEED_100:
mii_speed = MII_CTRL_SPEED_100;
cfg2 |= MAC_CFG2_IF_10_100;
ifctl |= MAC_IFCTL_SPEED;
- pll = pdata->is_ar91xx ? AR91XX_PLL_VAL_100
- : AR71XX_PLL_VAL_100;
break;
case SPEED_10:
mii_speed = MII_CTRL_SPEED_10;
cfg2 |= MAC_CFG2_IF_10_100;
break;
case SPEED_10:
mii_speed = MII_CTRL_SPEED_10;
cfg2 |= MAC_CFG2_IF_10_100;
- pll = pdata->is_ar91xx ? AR91XX_PLL_VAL_10
- : AR71XX_PLL_VAL_10;
break;
default:
BUG();
break;
default:
BUG();
@@
-89,7
+74,10
@@
static void ag71xx_phy_link_update(struct ag71xx *ag)
ag71xx_wr(ag, AG71XX_REG_FIFO_CFG3,
pdata->is_ar91xx ? 0x780fff : 0x008001ff);
ag71xx_wr(ag, AG71XX_REG_FIFO_CFG3,
pdata->is_ar91xx ? 0x780fff : 0x008001ff);
- pdata->set_pll(pll);
+
+ if (pdata->set_pll)
+ pdata->set_pll(ag->speed);
+
ag71xx_mii_ctrl_set_speed(ag, mii_speed);
ag71xx_wr(ag, AG71XX_REG_MAC_CFG2, cfg2);
ag71xx_mii_ctrl_set_speed(ag, mii_speed);
ag71xx_wr(ag, AG71XX_REG_MAC_CFG2, cfg2);
@@
-217,7
+205,7
@@
static int ag71xx_phy_connect_multi(struct ag71xx *ag)
DBG("%s: PHY found at %s, uid=%08x\n",
dev->name,
DBG("%s: PHY found at %s, uid=%08x\n",
dev->name,
-
ag->mii_bus->phy_map[phy_addr]->dev.bus_id
,
+
dev_name(&ag->mii_bus->phy_map[phy_addr]->dev)
,
ag->mii_bus->phy_map[phy_addr]->phy_id);
if (phydev == NULL)
ag->mii_bus->phy_map[phy_addr]->phy_id);
if (phydev == NULL)
@@
-233,12
+221,12
@@
static int ag71xx_phy_connect_multi(struct ag71xx *ag)
ret = -ENODEV;
break;
case 1:
ret = -ENODEV;
break;
case 1:
- ag->phy_dev = phy_connect(dev,
phydev->dev.bus_id
,
+ ag->phy_dev = phy_connect(dev,
dev_name(&phydev->dev)
,
&ag71xx_phy_link_adjust, 0, pdata->phy_if_mode);
if (IS_ERR(ag->phy_dev)) {
printk(KERN_ERR "%s: could not connect to PHY at %s\n",
&ag71xx_phy_link_adjust, 0, pdata->phy_if_mode);
if (IS_ERR(ag->phy_dev)) {
printk(KERN_ERR "%s: could not connect to PHY at %s\n",
- dev->name,
phydev->dev.bus_id
);
+ dev->name,
dev_name(&phydev->dev)
);
return PTR_ERR(ag->phy_dev);
}
return PTR_ERR(ag->phy_dev);
}
@@
-252,7
+240,7
@@
static int ag71xx_phy_connect_multi(struct ag71xx *ag)
printk(KERN_DEBUG "%s: connected to PHY at %s "
"[uid=%08x, driver=%s]\n",
printk(KERN_DEBUG "%s: connected to PHY at %s "
"[uid=%08x, driver=%s]\n",
- dev->name,
phydev->dev.bus_id
,
+ dev->name,
dev_name(&phydev->dev)
,
phydev->phy_id, phydev->drv->name);
ag->link = 0;
phydev->phy_id, phydev->drv->name);
ag->link = 0;
This page took
0.036852 seconds
and
4
git commands to generate.