Commit 9a4e7969 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller

net: bcmgenet: utilize generic Broadcom UniMAC MDIO controller driver

Update the GENET driver to register an UniMAC MDIO bus controller for
the GENET internal MDIO bus, update the platform data code to attach the
PHY to the correct MDIO bus controller.

The Device Tree portion of the code is mostly left unmodified since the
lookup/binding is done via phandles and Device Tree nodes which are much
more flexible in locating and binding PHYs to their respective MDIO bus
controllers.
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f248aff8
...@@ -65,6 +65,7 @@ config BCMGENET ...@@ -65,6 +65,7 @@ config BCMGENET
select PHYLIB select PHYLIB
select FIXED_PHY select FIXED_PHY
select BCM7XXX_PHY select BCM7XXX_PHY
select MDIO_BCM_UNIMAC
help help
This driver supports the built-in Ethernet MACs found in the This driver supports the built-in Ethernet MACs found in the
Broadcom BCM7xxx Set Top Box family chipset. Broadcom BCM7xxx Set Top Box family chipset.
......
...@@ -657,6 +657,7 @@ struct bcmgenet_priv { ...@@ -657,6 +657,7 @@ struct bcmgenet_priv {
struct clk *clk; struct clk *clk;
struct platform_device *pdev; struct platform_device *pdev;
struct platform_device *mii_pdev;
/* WOL */ /* WOL */
struct clk *clk_wol; struct clk *clk_wol;
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <linux/of_net.h> #include <linux/of_net.h>
#include <linux/of_mdio.h> #include <linux/of_mdio.h>
#include <linux/platform_data/bcmgenet.h> #include <linux/platform_data/bcmgenet.h>
#include <linux/platform_data/mdio-bcm-unimac.h>
#include "bcmgenet.h" #include "bcmgenet.h"
...@@ -464,31 +465,120 @@ static int bcmgenet_mii_alloc(struct bcmgenet_priv *priv) ...@@ -464,31 +465,120 @@ static int bcmgenet_mii_alloc(struct bcmgenet_priv *priv)
return 0; return 0;
} }
static int bcmgenet_mii_of_init(struct bcmgenet_priv *priv) static struct device_node *bcmgenet_mii_of_find_mdio(struct bcmgenet_priv *priv)
{ {
struct device_node *dn = priv->pdev->dev.of_node; struct device_node *dn = priv->pdev->dev.of_node;
struct device *kdev = &priv->pdev->dev; struct device *kdev = &priv->pdev->dev;
struct phy_device *phydev = NULL;
char *compat; char *compat;
int phy_mode;
int ret;
compat = kasprintf(GFP_KERNEL, "brcm,genet-mdio-v%d", priv->version); compat = kasprintf(GFP_KERNEL, "brcm,genet-mdio-v%d", priv->version);
if (!compat) if (!compat)
return -ENOMEM; return NULL;
priv->mdio_dn = of_find_compatible_node(dn, NULL, compat); priv->mdio_dn = of_find_compatible_node(dn, NULL, compat);
kfree(compat); kfree(compat);
if (!priv->mdio_dn) { if (!priv->mdio_dn) {
dev_err(kdev, "unable to find MDIO bus node\n"); dev_err(kdev, "unable to find MDIO bus node\n");
return -ENODEV; return NULL;
} }
ret = of_mdiobus_register(priv->mii_bus, priv->mdio_dn); return priv->mdio_dn;
if (ret) { }
dev_err(kdev, "failed to register MDIO bus\n");
return ret; static void bcmgenet_mii_pdata_init(struct bcmgenet_priv *priv,
struct unimac_mdio_pdata *ppd)
{
struct device *kdev = &priv->pdev->dev;
struct bcmgenet_platform_data *pd = kdev->platform_data;
if (pd->phy_interface != PHY_INTERFACE_MODE_MOCA && pd->mdio_enabled) {
/*
* Internal or external PHY with MDIO access
*/
if (pd->phy_address >= 0 && pd->phy_address < PHY_MAX_ADDR)
ppd->phy_mask = 1 << pd->phy_address;
else
ppd->phy_mask = 0;
} }
}
static int bcmgenet_mii_wait(void *wait_func_data)
{
struct bcmgenet_priv *priv = wait_func_data;
wait_event_timeout(priv->wq,
!(bcmgenet_umac_readl(priv, UMAC_MDIO_CMD)
& MDIO_START_BUSY),
HZ / 100);
return 0;
}
static int bcmgenet_mii_register(struct bcmgenet_priv *priv)
{
struct platform_device *pdev = priv->pdev;
struct bcmgenet_platform_data *pdata = pdev->dev.platform_data;
struct device_node *dn = pdev->dev.of_node;
struct unimac_mdio_pdata ppd;
struct platform_device *ppdev;
struct resource *pres, res;
int id, ret;
pres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
memset(&res, 0, sizeof(res));
memset(&ppd, 0, sizeof(ppd));
ppd.wait_func = bcmgenet_mii_wait;
ppd.wait_func_data = priv;
ppd.bus_name = "bcmgenet MII bus";
/* Unimac MDIO bus controller starts at UniMAC offset + MDIO_CMD
* and is 2 * 32-bits word long, 8 bytes total.
*/
res.start = pres->start + GENET_UMAC_OFF + UMAC_MDIO_CMD;
res.end = res.start + 8;
res.flags = IORESOURCE_MEM;
if (dn)
id = of_alias_get_id(dn, "eth");
else
id = pdev->id;
ppdev = platform_device_alloc(UNIMAC_MDIO_DRV_NAME, id);
if (!ppdev)
return -ENOMEM;
/* Retain this platform_device pointer for later cleanup */
priv->mii_pdev = ppdev;
ppdev->dev.parent = &pdev->dev;
ppdev->dev.of_node = bcmgenet_mii_of_find_mdio(priv);
if (pdata)
bcmgenet_mii_pdata_init(priv, &ppd);
ret = platform_device_add_resources(ppdev, &res, 1);
if (ret)
goto out;
ret = platform_device_add_data(ppdev, &ppd, sizeof(ppd));
if (ret)
goto out;
ret = platform_device_add(ppdev);
if (ret)
goto out;
return 0;
out:
platform_device_put(ppdev);
return ret;
}
static int bcmgenet_mii_of_init(struct bcmgenet_priv *priv)
{
struct device_node *dn = priv->pdev->dev.of_node;
struct device *kdev = &priv->pdev->dev;
struct phy_device *phydev;
int phy_mode;
int ret;
/* Fetch the PHY phandle */ /* Fetch the PHY phandle */
priv->phy_dn = of_parse_phandle(dn, "phy-handle", 0); priv->phy_dn = of_parse_phandle(dn, "phy-handle", 0);
...@@ -536,33 +626,23 @@ static int bcmgenet_mii_pd_init(struct bcmgenet_priv *priv) ...@@ -536,33 +626,23 @@ static int bcmgenet_mii_pd_init(struct bcmgenet_priv *priv)
{ {
struct device *kdev = &priv->pdev->dev; struct device *kdev = &priv->pdev->dev;
struct bcmgenet_platform_data *pd = kdev->platform_data; struct bcmgenet_platform_data *pd = kdev->platform_data;
struct mii_bus *mdio = priv->mii_bus; char phy_name[MII_BUS_ID_SIZE + 3];
char mdio_bus_id[MII_BUS_ID_SIZE];
struct phy_device *phydev; struct phy_device *phydev;
int ret;
snprintf(mdio_bus_id, MII_BUS_ID_SIZE, "%s-%d",
UNIMAC_MDIO_DRV_NAME, priv->pdev->id);
if (pd->phy_interface != PHY_INTERFACE_MODE_MOCA && pd->mdio_enabled) { if (pd->phy_interface != PHY_INTERFACE_MODE_MOCA && pd->mdio_enabled) {
snprintf(phy_name, MII_BUS_ID_SIZE, PHY_ID_FMT,
mdio_bus_id, pd->phy_address);
/* /*
* Internal or external PHY with MDIO access * Internal or external PHY with MDIO access
*/ */
if (pd->phy_address >= 0 && pd->phy_address < PHY_MAX_ADDR) phydev = phy_attach(priv->dev, phy_name, pd->phy_interface);
mdio->phy_mask = ~(1 << pd->phy_address);
else
mdio->phy_mask = 0;
ret = mdiobus_register(mdio);
if (ret) {
dev_err(kdev, "failed to register MDIO bus\n");
return ret;
}
if (pd->phy_address >= 0 && pd->phy_address < PHY_MAX_ADDR)
phydev = mdiobus_get_phy(mdio, pd->phy_address);
else
phydev = phy_find_first(mdio);
if (!phydev) { if (!phydev) {
dev_err(kdev, "failed to register PHY device\n"); dev_err(kdev, "failed to register PHY device\n");
mdiobus_unregister(mdio);
return -ENODEV; return -ENODEV;
} }
} else { } else {
...@@ -611,7 +691,7 @@ int bcmgenet_mii_init(struct net_device *dev) ...@@ -611,7 +691,7 @@ int bcmgenet_mii_init(struct net_device *dev)
struct device_node *dn = priv->pdev->dev.of_node; struct device_node *dn = priv->pdev->dev.of_node;
int ret; int ret;
ret = bcmgenet_mii_alloc(priv); ret = bcmgenet_mii_register(priv);
if (ret) if (ret)
return ret; return ret;
...@@ -625,8 +705,8 @@ int bcmgenet_mii_init(struct net_device *dev) ...@@ -625,8 +705,8 @@ int bcmgenet_mii_init(struct net_device *dev)
if (of_phy_is_fixed_link(dn)) if (of_phy_is_fixed_link(dn))
of_phy_deregister_fixed_link(dn); of_phy_deregister_fixed_link(dn);
of_node_put(priv->phy_dn); of_node_put(priv->phy_dn);
mdiobus_unregister(priv->mii_bus); platform_device_unregister(priv->mii_pdev);
mdiobus_free(priv->mii_bus); platform_device_put(priv->mii_pdev);
return ret; return ret;
} }
...@@ -638,6 +718,6 @@ void bcmgenet_mii_exit(struct net_device *dev) ...@@ -638,6 +718,6 @@ void bcmgenet_mii_exit(struct net_device *dev)
if (of_phy_is_fixed_link(dn)) if (of_phy_is_fixed_link(dn))
of_phy_deregister_fixed_link(dn); of_phy_deregister_fixed_link(dn);
of_node_put(priv->phy_dn); of_node_put(priv->phy_dn);
mdiobus_unregister(priv->mii_bus); platform_device_unregister(priv->mii_pdev);
mdiobus_free(priv->mii_bus); platform_device_put(priv->mii_pdev);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment