Messages in this thread Patch in this message | | | From | Ben Dooks <> | Subject | [PATCH] of_mdio: fix phy interrupt passing | Date | Mon, 17 Feb 2014 16:29:40 +0000 |
| |
The of_mdiobus_register_phy() is not setting phy->irq this causing some drivers to incorrectly assume that the PHY does not have an IRQ associated with it or install an interrupt handler for the PHY.
Simplify the code setting irq and set the phy->irq at the same time so that the case if mdio->irq is not NULL is easier to read.
This fixes the issue: net eth0: attached PHY 1 (IRQ -1) to driver Micrel KSZ8041RNLI
to the correct: net eth0: attached PHY 1 (IRQ 416) to driver Micrel KSZ8041RNLI
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> --- drivers/of/of_mdio.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c index 875b7b6..7b3e7b0 100644 --- a/drivers/of/of_mdio.c +++ b/drivers/of/of_mdio.c @@ -44,7 +44,7 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio, struct device_node *chi { struct phy_device *phy; bool is_c45; - int rc, prev_irq; + int rc; u32 max_speed = 0; is_c45 = of_device_is_compatible(child, @@ -55,11 +55,11 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio, struct device_node *chi return 1; if (mdio->irq) { - prev_irq = mdio->irq[addr]; - mdio->irq[addr] = - irq_of_parse_and_map(child, 0); - if (!mdio->irq[addr]) - mdio->irq[addr] = prev_irq; + rc = irq_of_parse_and_map(child, 0); + if (rc > 0) { + mdio->irq[addr] = rc; + phy->irq = rc; + } } /* Associate the OF node with the device structure so it -- 1.8.5.3
| |