diff options
author | Anatolij Gustschin <agust@denx.de> | 2009-04-06 22:01:43 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-04-13 17:51:25 -0400 |
commit | dcd07be3ffab7d20f4d498369e7526f6f4945257 (patch) | |
tree | 00d4eb7adcf9d1cf0219143454e8729a131c3408 /drivers/net | |
parent | a8729eb302a5b5da8b0b4d29582c42648a2e0f12 (diff) |
phylib: Add interrupt source check function to M88E1121R driver
Add did_interrupt() function to check if a PHY port
really caused an interrupt. This is needed in the case
of shared PHY interrupt pin configuration to stop
interrupt event processing for PHY ports which didn't
cause an interrupt.
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/phy/marvell.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index e9f436ba800f..7a3ec9d39a9a 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c | |||
@@ -458,6 +458,18 @@ static int marvell_read_status(struct phy_device *phydev) | |||
458 | return 0; | 458 | return 0; |
459 | } | 459 | } |
460 | 460 | ||
461 | static int m88e1121_did_interrupt(struct phy_device *phydev) | ||
462 | { | ||
463 | int imask; | ||
464 | |||
465 | imask = phy_read(phydev, MII_M1011_IEVENT); | ||
466 | |||
467 | if (imask & MII_M1011_IMASK_INIT) | ||
468 | return 1; | ||
469 | |||
470 | return 0; | ||
471 | } | ||
472 | |||
461 | static struct phy_driver marvell_drivers[] = { | 473 | static struct phy_driver marvell_drivers[] = { |
462 | { | 474 | { |
463 | .phy_id = 0x01410c60, | 475 | .phy_id = 0x01410c60, |
@@ -520,6 +532,7 @@ static struct phy_driver marvell_drivers[] = { | |||
520 | .read_status = &marvell_read_status, | 532 | .read_status = &marvell_read_status, |
521 | .ack_interrupt = &marvell_ack_interrupt, | 533 | .ack_interrupt = &marvell_ack_interrupt, |
522 | .config_intr = &marvell_config_intr, | 534 | .config_intr = &marvell_config_intr, |
535 | .did_interrupt = &m88e1121_did_interrupt, | ||
523 | .driver = { .owner = THIS_MODULE }, | 536 | .driver = { .owner = THIS_MODULE }, |
524 | }, | 537 | }, |
525 | { | 538 | { |