From c03e64cefc00e934cc90f2effa7b4b7f43bdea7f Mon Sep 17 00:00:00 2001 From: Anatolij Gustschin Date: Tue, 7 Apr 2009 02:01:43 +0000 Subject: [PATCH] --- yaml --- r: 143435 b: refs/heads/master c: dcd07be3ffab7d20f4d498369e7526f6f4945257 h: refs/heads/master i: 143433: b760c212f9ab6d2135688e8b856b55cdbfecdfcc 143431: 1af3ad92cdabd9ac241faed6a23f3ef88f7ca731 v: v3 --- [refs] | 2 +- trunk/drivers/net/phy/marvell.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 707e40356202..8c05c6df0fd3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8729eb302a5b5da8b0b4d29582c42648a2e0f12 +refs/heads/master: dcd07be3ffab7d20f4d498369e7526f6f4945257 diff --git a/trunk/drivers/net/phy/marvell.c b/trunk/drivers/net/phy/marvell.c index e9f436ba800f..7a3ec9d39a9a 100644 --- a/trunk/drivers/net/phy/marvell.c +++ b/trunk/drivers/net/phy/marvell.c @@ -458,6 +458,18 @@ static int marvell_read_status(struct phy_device *phydev) return 0; } +static int m88e1121_did_interrupt(struct phy_device *phydev) +{ + int imask; + + imask = phy_read(phydev, MII_M1011_IEVENT); + + if (imask & MII_M1011_IMASK_INIT) + return 1; + + return 0; +} + static struct phy_driver marvell_drivers[] = { { .phy_id = 0x01410c60, @@ -520,6 +532,7 @@ static struct phy_driver marvell_drivers[] = { .read_status = &marvell_read_status, .ack_interrupt = &marvell_ack_interrupt, .config_intr = &marvell_config_intr, + .did_interrupt = &m88e1121_did_interrupt, .driver = { .owner = THIS_MODULE }, }, {