diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/altera_tse.c | 2 | ||||
-rw-r--r-- | drivers/net/at91_ether.c | 1 | ||||
-rw-r--r-- | drivers/net/cs8900.c | 1 | ||||
-rw-r--r-- | drivers/net/dm9000.c | 2 | ||||
-rw-r--r-- | drivers/net/ep93xx.c | 2 | ||||
-rw-r--r-- | drivers/net/fec_imx.c | 2 | ||||
-rw-r--r-- | drivers/net/fec_mpc5200.c | 2 | ||||
-rw-r--r-- | drivers/net/macb.c | 2 | ||||
-rw-r--r-- | drivers/net/miidev.c | 2 | ||||
-rw-r--r-- | drivers/net/netx_eth.c | 2 | ||||
-rw-r--r-- | drivers/net/smc91111.c | 2 | ||||
-rw-r--r-- | drivers/net/smc911x.c | 2 | ||||
-rw-r--r-- | drivers/net/usb/asix.c | 1 | ||||
-rw-r--r-- | drivers/net/usb/smsc95xx.c | 1 | ||||
-rw-r--r-- | drivers/net/usb/usbnet.c | 1 |
15 files changed, 25 insertions, 0 deletions
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c index e7dabda5d1..7e456c762e 100644 --- a/drivers/net/altera_tse.c +++ b/drivers/net/altera_tse.c @@ -518,6 +518,7 @@ static int tse_probe(struct device_d *dev) edev->halt = tse_eth_halt; edev->get_ethaddr = tse_get_ethaddr; edev->set_ethaddr = tse_set_ethaddr; + edev->parent = dev; #ifdef CONFIG_TSE_USE_DEDICATED_DESC_MEM tx_desc = dev_request_mem_region(dev, 3); @@ -548,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/at91_ether.c b/drivers/net/at91_ether.c index d5e26a15d0..8d0b43b9e5 100644 --- a/drivers/net/at91_ether.c +++ b/drivers/net/at91_ether.c @@ -272,6 +272,7 @@ static int at91rm9200_eth_init (struct device_d *dev) edev->halt = at91rm9200_eth_halt; edev->get_ethaddr = at91rm9200_get_ethaddr; edev->set_ethaddr = at91rm9200_set_ethaddr; + edev->parent = dev; p_mac = AT91C_BASE_EMAC; diff --git a/drivers/net/cs8900.c b/drivers/net/cs8900.c index d954e39d7b..33afc5e0f3 100644 --- a/drivers/net/cs8900.c +++ b/drivers/net/cs8900.c @@ -458,6 +458,7 @@ static int cs8900_probe(struct device_d *dev) edev->halt = cs8900_halt; edev->get_ethaddr = cs8900_get_ethaddr; edev->set_ethaddr = cs8900_set_ethaddr; + edev->parent = dev; eth_register(edev); return 0; diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c index be14317eff..e9ec61b37d 100644 --- a/drivers/net/dm9000.c +++ b/drivers/net/dm9000.c @@ -513,6 +513,7 @@ static int dm9000_probe(struct device_d *dev) edev->halt = dm9000_eth_halt; edev->set_ethaddr = dm9000_set_ethaddr; edev->get_ethaddr = dm9000_get_ethaddr; + edev->parent = dev; /* RESET device */ dm9000_reset(priv); @@ -540,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 7821cd24c9..954ec789f3 100644 --- a/drivers/net/ep93xx.c +++ b/drivers/net/ep93xx.c @@ -497,11 +497,13 @@ static int ep93xx_eth_probe(struct device_d *dev) edev->halt = ep93xx_eth_halt; edev->get_ethaddr = ep93xx_eth_get_ethaddr; edev->set_ethaddr = ep93xx_eth_set_ethaddr; + edev->parent = dev; priv->miidev.read = ep93xx_phy_read; 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 8b4f439745..3b0f266a2b 100644 --- a/drivers/net/fec_imx.c +++ b/drivers/net/fec_imx.c @@ -612,6 +612,7 @@ static int fec_probe(struct device_d *dev) edev->halt = fec_halt; edev->get_ethaddr = fec_get_hwaddr; edev->set_ethaddr = fec_set_hwaddr; + edev->parent = dev; fec->regs = dev_request_mem_region(dev, 0); @@ -644,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 310d70d869..403aad5235 100644 --- a/drivers/net/fec_mpc5200.c +++ b/drivers/net/fec_mpc5200.c @@ -672,6 +672,7 @@ int mpc5xxx_fec_probe(struct device_d *dev) edev->halt = mpc5xxx_fec_halt; edev->get_ethaddr = mpc5xxx_fec_get_ethaddr; edev->set_ethaddr = mpc5xxx_fec_set_ethaddr; + edev->parent = dev; fec->eth = dev_request_mem_region(dev, 0); fec->tbdBase = (FEC_TBD *)FEC_BD_BASE; @@ -687,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 95ad3d7289..898cf3d1ab 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -433,6 +433,7 @@ static int macb_probe(struct device_d *dev) edev->halt = macb_halt; edev->get_ethaddr = pdata->get_ethaddr ? pdata->get_ethaddr : macb_get_ethaddr; edev->set_ethaddr = macb_set_ethaddr; + edev->parent = dev; macb->miidev.read = macb_phy_read; macb->miidev.write = macb_phy_write; @@ -440,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 fd40f6271a..5503bc94dd 100644 --- a/drivers/net/netx_eth.c +++ b/drivers/net/netx_eth.c @@ -258,11 +258,13 @@ static int netx_eth_probe(struct device_d *dev) edev->halt = netx_eth_halt; edev->get_ethaddr = netx_eth_get_ethaddr; edev->set_ethaddr = netx_eth_set_ethaddr; + edev->parent = dev; priv->miidev.read = netx_miidev_read; 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 1c1ffea542..2313aaeb63 100644 --- a/drivers/net/smc91111.c +++ b/drivers/net/smc91111.c @@ -1311,12 +1311,14 @@ static int smc91c111_probe(struct device_d *dev) edev->halt = smc91c111_eth_halt; edev->get_ethaddr = smc91c111_get_ethaddr; edev->set_ethaddr = smc91c111_set_ethaddr; + edev->parent = dev; priv->miidev.read = smc91c111_phy_read; priv->miidev.write = smc91c111_phy_write; 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 8c6f9fc19e..fba61c460f 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -725,12 +725,14 @@ static int smc911x_probe(struct device_d *dev) edev->halt = smc911x_eth_halt; edev->get_ethaddr = smc911x_get_ethaddr; edev->set_ethaddr = smc911x_set_ethaddr; + edev->parent = dev; priv->miidev.read = smc911x_phy_read; priv->miidev.write = smc911x_phy_write; 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 */ diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index cd658ed526..5ffd7a6037 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -206,6 +206,7 @@ int usbnet_probe(struct usb_device *usbdev, const struct usb_device_id *prod) edev->recv = usbnet_recv, edev->halt = usbnet_halt, edev->priv = undev; + edev->parent = &usbdev->dev; info = (struct driver_info *)prod->driver_info; undev->driver_info = info; |