openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: pxa168_eth: Prepare proper libphy handling 

Current libphy handling in pxa168_eth lacks proper phy_connect. Prepare
to fix this by first moving phy properties from platform_data to private
driver data.

Tested-by: Antoine Ténart <antoine.tenart@free-electrons.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sebastian Hesselbarth 2014-10-22 20:26:46 +02:00 committed by David S. Miller
parent e7de17abed
commit 9d8ea73d3e
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/net/ethernet/marvell/pxa168_eth.c
View File

@ -197,6 +197,9 @@ struct tx_desc {
struct pxa168_eth_private { struct pxa168_eth_private {
int port_num; /* User Ethernet port number */ int port_num; /* User Ethernet port number */
int phy_addr; int phy_addr;
int phy_speed;
int phy_duplex;
phy_interface_t phy_intf;
int rx_resource_err; /* Rx ring resource error flag */ int rx_resource_err; /* Rx ring resource error flag */
@ -1394,19 +1397,17 @@ static void phy_init(struct pxa168_eth_private *pep)
{ {
struct phy_device *phy = pep->phy; struct phy_device *phy = pep->phy;
phy_attach(pep->dev, dev_name(&phy->dev), PHY_INTERFACE_MODE_MII); phy_attach(pep->dev, dev_name(&phy->dev), pep->phy_intf);
if (pep->pd && pep->pd->speed != 0) { phy->speed = pep->phy_speed;
phy->duplex = pep->phy_duplex;
phy->autoneg = AUTONEG_ENABLE;
phy->supported &= PHY_BASIC_FEATURES;
phy->advertising = phy->supported | ADVERTISED_Autoneg;
if (pep->phy_speed != 0) {
phy->autoneg = AUTONEG_DISABLE; phy->autoneg = AUTONEG_DISABLE;
phy->advertising = 0; phy->advertising = 0;
phy->speed = pep->pd->speed;
phy->duplex = pep->pd->duplex;
} else {
phy->autoneg = AUTONEG_ENABLE;
phy->speed = 0;
phy->duplex = 0;
phy->supported &= PHY_BASIC_FEATURES;
phy->advertising = phy->supported | ADVERTISED_Autoneg;
} }
phy_start_aneg(phy); phy_start_aneg(phy);
@ -1416,9 +1417,6 @@ static int ethernet_phy_setup(struct net_device *dev)
{ {
struct pxa168_eth_private *pep = netdev_priv(dev); struct pxa168_eth_private *pep = netdev_priv(dev);
if (pep->pd && pep->pd->init)
pep->pd->init();
pep->phy = phy_scan(pep, pep->phy_addr & 0x1f); pep->phy = phy_scan(pep, pep->phy_addr & 0x1f);
if (pep->phy != NULL) if (pep->phy != NULL)
phy_init(pep); phy_init(pep);
@ -1552,13 +1550,23 @@ static int pxa168_eth_probe(struct platform_device *pdev)
pep->port_num = pep->pd->port_number; pep->port_num = pep->pd->port_number;
pep->phy_addr = pep->pd->phy_addr; pep->phy_addr = pep->pd->phy_addr;
pep->phy_speed = pep->pd->speed;
pep->phy_duplex = pep->pd->duplex;
pep->phy_intf = pep->pd->intf;
if (pep->pd->init)
pep->pd->init();
} else if (pdev->dev.of_node) { } else if (pdev->dev.of_node) {
of_property_read_u32(pdev->dev.of_node, "port-id", of_property_read_u32(pdev->dev.of_node, "port-id",
&pep->port_num); &pep->port_num);
np = of_parse_phandle(pdev->dev.of_node, "phy-handle", 0); np = of_parse_phandle(pdev->dev.of_node, "phy-handle", 0);
if (np) if (!np) {
of_property_read_u32(np, "reg", &pep->phy_addr); dev_err(&pdev->dev, "missing phy-handle\n");
return -EINVAL;
}
of_property_read_u32(np, "reg", &pep->phy_addr);
pep->phy_intf = of_get_phy_mode(pdev->dev.of_node);
} }
/* Hardware supports only 3 ports */ /* Hardware supports only 3 ports */