| Message ID | 1270025218-7245-1-git-send-email-anders.darander@gmail.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
Anders Darander wrote: > From: Anders Darander <ad@datarespons.se> > > Add the possibility to set the phy address. This is needed if an integrated > switch is connected to the MAC, as it is often the case that the highest port > is the one connected to the MAC of the MCU. > > E.g. in the case of the Micrel KSZ8873, port 3 is the one to connect to the > MCU, thus, the MAC needs to connect to phy address 0x03, instead of the first > phy found. We're using phy_mask in one of our projects, it's still using 2.6.29, though. I think it's worth testing if it's still working. static struct at91_eth_data __initdata p298_macb_data = { .is_rmii = 0, .phy_mask = ~(1 << 8), }; at91_add_device_eth(&p298_macb_data); cheers, Marc
* Marc Kleine-Budde <mkl@pengutronix.de> [100331 11:18]: > We're using phy_mask in one of our projects, it's still using 2.6.29, > though. I think it's worth testing if it's still working. Well, that was obviously something I overlooked / misinterpreted when I tried to solve our problem! As I understand it, phy_mask is a bitfield for setting which PHYs should be enabled... Then this should have worked OK for us! > static struct at91_eth_data __initdata p298_macb_data = { > .is_rmii = 0, > .phy_mask = ~(1 << 8), > }; > at91_add_device_eth(&p298_macb_data); I've not tested it, but it should probably have worked. Regards, Anders -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Anders Darander wrote: > * Marc Kleine-Budde <mkl@pengutronix.de> [100331 11:18]: >> We're using phy_mask in one of our projects, it's still using 2.6.29, >> though. I think it's worth testing if it's still working. > > Well, that was obviously something I overlooked / misinterpreted when I > tried to solve our problem! > > As I understand it, phy_mask is a bitfield for setting which PHYs should > be enabled... Then this should have worked OK for us! Yes, it's a bitmask of PHYs that should be probed. >> static struct at91_eth_data __initdata p298_macb_data = { >> .is_rmii = 0, >> .phy_mask = ~(1 << 8), >> }; > >> at91_add_device_eth(&p298_macb_data); > > I've not tested it, but it should probably have worked. Cheers, Marc
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index c8a18a6..af7b61b 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -53,6 +53,14 @@ #define MACB_RX_INT_FLAGS (MACB_BIT(RCOMP) | MACB_BIT(RXUBR) \ | MACB_BIT(ISR_ROVR)) +/* + * Setup PHY probeing + */ + +static unsigned short phy_addr = PHY_MAX_ADDR; +module_param(phy_addr, ushort, 0); +MODULE_PARAM_DESC(phy_addr, "PHY address connected to the MACB"); + static void __macb_set_hwaddr(struct macb *bp) { u32 bottom; @@ -193,7 +201,11 @@ static int macb_mii_probe(struct net_device *dev) struct eth_platform_data *pdata; int ret; - phydev = phy_find_first(bp->mii_bus); + if (phy_addr >= PHY_MAX_ADDRESS) + phydev = phy_find_first(bp->mii_bus); + else + phydev = bp->mii_bus->phy_map[phy_addr]; + if (!phydev) { printk (KERN_ERR "%s: no PHY found\n", dev->name); return -1;