diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-15 09:30:46 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-15 09:48:03 +0200 |
commit | 8fddb2edf6b862afbf4a663df179e3aabd932e39 (patch) | |
tree | c76af019ee858388d7024acda218e5b36e62854a /drivers | |
parent | 6d16fbdcd487a976840adc2b1438e0d0efced3a7 (diff) | |
download | barebox-8fddb2edf6b862afbf4a663df179e3aabd932e39.tar.gz barebox-8fddb2edf6b862afbf4a663df179e3aabd932e39.tar.xz |
net mii: add a parent pointer to miidevs and set it to the hardware device
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/altera_tse.c | 1 | ||||
-rw-r--r-- | drivers/net/dm9000.c | 1 | ||||
-rw-r--r-- | drivers/net/ep93xx.c | 1 | ||||
-rw-r--r-- | drivers/net/fec_imx.c | 1 | ||||
-rw-r--r-- | drivers/net/fec_mpc5200.c | 1 | ||||
-rw-r--r-- | drivers/net/macb.c | 1 | ||||
-rw-r--r-- | drivers/net/miidev.c | 2 | ||||
-rw-r--r-- | drivers/net/netx_eth.c | 1 | ||||
-rw-r--r-- | drivers/net/smc91111.c | 1 | ||||
-rw-r--r-- | drivers/net/smc911x.c | 1 | ||||
-rw-r--r-- | drivers/net/usb/asix.c | 1 | ||||
-rw-r--r-- | drivers/net/usb/smsc95xx.c | 1 |
12 files changed, 13 insertions, 0 deletions
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c index ac8dea4a58..7e456c762e 100644 --- a/drivers/net/altera_tse.c +++ b/drivers/net/altera_tse.c @@ -549,6 +549,7 @@ static int tse_probe(struct device_d *dev) miidev->write = tse_phy_write; miidev->flags = 0; miidev->edev = edev; + miidev->parent = dev; if (dev->platform_data != NULL) miidev->address = *((int8_t *)(dev->platform_data)); diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c index 98134ce0e3..e9ec61b37d 100644 --- a/drivers/net/dm9000.c +++ b/drivers/net/dm9000.c @@ -541,6 +541,7 @@ static int dm9000_probe(struct device_d *dev) priv->miidev.address = 0; priv->miidev.flags = 0; priv->miidev.edev = edev; + priv->miidev.parent = dev; mii_register(&priv->miidev); eth_register(edev); diff --git a/drivers/net/ep93xx.c b/drivers/net/ep93xx.c index 55848cf2e2..954ec789f3 100644 --- a/drivers/net/ep93xx.c +++ b/drivers/net/ep93xx.c @@ -503,6 +503,7 @@ static int ep93xx_eth_probe(struct device_d *dev) priv->miidev.write = ep93xx_phy_write; priv->miidev.address = 0; priv->miidev.flags = 0; + priv->miidev.parent = dev; priv->tx_dq.base = calloc(NUMTXDESC, sizeof(struct tx_descriptor)); diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c index bbce2b699e..3b0f266a2b 100644 --- a/drivers/net/fec_imx.c +++ b/drivers/net/fec_imx.c @@ -645,6 +645,7 @@ static int fec_probe(struct device_d *dev) fec->miidev.address = pdata->phy_addr; fec->miidev.flags = pdata->xcv_type == MII10 ? MIIDEV_FORCE_10 : 0; fec->miidev.edev = edev; + fec->miidev.parent = dev; mii_register(&fec->miidev); } diff --git a/drivers/net/fec_mpc5200.c b/drivers/net/fec_mpc5200.c index 84be3c7f21..403aad5235 100644 --- a/drivers/net/fec_mpc5200.c +++ b/drivers/net/fec_mpc5200.c @@ -688,6 +688,7 @@ int mpc5xxx_fec_probe(struct device_d *dev) fec->miidev.address = CONFIG_PHY_ADDR; fec->miidev.flags = pdata->xcv_type == MII10 ? MIIDEV_FORCE_10 : 0; fec->miidev.edev = edev; + fec->miidev.parent = dev; mii_register(&fec->miidev); } diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 435fa2879f..898cf3d1ab 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -441,6 +441,7 @@ static int macb_probe(struct device_d *dev) macb->miidev.flags = pdata->flags & AT91SAM_ETHER_FORCE_LINK ? MIIDEV_FORCE_LINK : 0; macb->miidev.edev = edev; + macb->miidev.parent = dev; macb->flags = pdata->flags; macb->rx_buffer = xmalloc(CFG_MACB_RX_BUFFER_SIZE); diff --git a/drivers/net/miidev.c b/drivers/net/miidev.c index fa9d79e82d..501a4f8e1e 100644 --- a/drivers/net/miidev.c +++ b/drivers/net/miidev.c @@ -210,6 +210,8 @@ int mii_register(struct mii_device *mdev) mdev->dev.priv = mdev; mdev->dev.id = -1; strcpy(mdev->dev.name, "miidev"); + if (mdev->parent) + dev_add_child(mdev->parent, &mdev->dev); return register_device(&mdev->dev); } diff --git a/drivers/net/netx_eth.c b/drivers/net/netx_eth.c index fd09983eb7..5503bc94dd 100644 --- a/drivers/net/netx_eth.c +++ b/drivers/net/netx_eth.c @@ -264,6 +264,7 @@ static int netx_eth_probe(struct device_d *dev) priv->miidev.write = netx_miidev_write; priv->miidev.address = 0; priv->miidev.flags = 0; + priv->miidev.parent = dev; netx_eth_init_phy(); mii_register(&priv->miidev); diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c index edb0f6880f..2313aaeb63 100644 --- a/drivers/net/smc91111.c +++ b/drivers/net/smc91111.c @@ -1318,6 +1318,7 @@ static int smc91c111_probe(struct device_d *dev) priv->miidev.address = 0; priv->miidev.flags = 0; priv->miidev.edev = edev; + priv->miidev.parent = dev; priv->base = dev_request_mem_region(dev, 0); smc91c111_reset(edev); diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 45d24adc85..fba61c460f 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -732,6 +732,7 @@ static int smc911x_probe(struct device_d *dev) priv->miidev.address = 1; priv->miidev.flags = 0; priv->miidev.edev = edev; + priv->miidev.parent = dev; priv->base = base; smc911x_reset(edev); diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c index d148925b04..be5a170d71 100644 --- a/drivers/net/usb/asix.c +++ b/drivers/net/usb/asix.c @@ -474,6 +474,7 @@ static int asix_init_mii(struct usbnet *dev) dev->miidev.address = asix_get_phy_addr(dev); dev->miidev.flags = 0; dev->miidev.edev = &dev->edev; + dev->miidev.parent = &dev->udev->dev; return mii_register(&dev->miidev); } diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index ae137fb978..b51899292b 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -444,6 +444,7 @@ static int smsc95xx_phy_initialize(struct usbnet *dev) dev->miidev.address = 1; /* FIXME: asix_get_phy_addr(dev); */ dev->miidev.flags = 0; dev->miidev.edev = &dev->edev; + dev->miidev.parent = &dev->udev->dev; // dev->miidev.name = dev->edev.name; /* reset phy and wait for reset to complete */ |