* [PATCH 1/2] Fix copper/fiber auto-selection for 88e1111
@ 2008-07-11 0:55 Wang Jian
0 siblings, 0 replies; 3+ messages in thread
From: Wang Jian @ 2008-07-11 0:55 UTC (permalink / raw)
To: netdev; +Cc: Alexandr Smirnov, Andy Fleming
The 27.15 bit (MII_M1111_HWCFG_FIBER_COPPER_AUTO) is disable bit. When
set to 1, copper/fiber auto selection is disabled. The current code
to enable but actually disable auto selection.
Signed-off-by: Wang Jian <lark@linux.net.cn>
---
drivers/net/phy/marvell.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 32a8503..737512c 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -162,7 +162,7 @@ static int m88e1111_config_init(struct phy_device
*phydev)
/* Enable Fiber/Copper auto selection */
temp = phy_read(phydev, MII_M1111_PHY_EXT_SR);
- temp |= MII_M1111_HWCFG_FIBER_COPPER_AUTO;
+ temp &= ~MII_M1111_HWCFG_FIBER_COPPER_AUTO;
phy_write(phydev, MII_M1111_PHY_EXT_SR, temp);
temp = phy_read(phydev, MII_BMCR);
--
1.5.5.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 1/2] Fix copper/fiber auto-selection for 88e1111
@ 2008-07-16 13:46 Wang Jian
2008-07-22 22:02 ` Jeff Garzik
0 siblings, 1 reply; 3+ messages in thread
From: Wang Jian @ 2008-07-16 13:46 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev, Alexandr Smirnov, Andy Fleming
The 27.15 bit (MII_M1111_HWCFG_FIBER_COPPER_AUTO) is disable bit. When
set to 1, copper/fiber auto selection is disabled. The current code
to enable but actually disable auto selection.
Signed-off-by: Wang Jian <lark@linux.net.cn>
---
drivers/net/phy/marvell.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 32a8503..737512c 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -162,7 +162,7 @@ static int m88e1111_config_init(struct phy_device
*phydev)
/* Enable Fiber/Copper auto selection */
temp = phy_read(phydev, MII_M1111_PHY_EXT_SR);
- temp |= MII_M1111_HWCFG_FIBER_COPPER_AUTO;
+ temp &= ~MII_M1111_HWCFG_FIBER_COPPER_AUTO;
phy_write(phydev, MII_M1111_PHY_EXT_SR, temp);
temp = phy_read(phydev, MII_BMCR);
--
1.5.5.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] Fix copper/fiber auto-selection for 88e1111
2008-07-16 13:46 Wang Jian
@ 2008-07-22 22:02 ` Jeff Garzik
0 siblings, 0 replies; 3+ messages in thread
From: Jeff Garzik @ 2008-07-22 22:02 UTC (permalink / raw)
To: Wang Jian; +Cc: netdev, Alexandr Smirnov, Andy Fleming
Wang Jian wrote:
> The 27.15 bit (MII_M1111_HWCFG_FIBER_COPPER_AUTO) is disable bit. When
> set to 1, copper/fiber auto selection is disabled. The current code
> to enable but actually disable auto selection.
>
> Signed-off-by: Wang Jian <lark@linux.net.cn>
> ---
> drivers/net/phy/marvell.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
applied 1-2 manually -- both patches were corrupted and not apply-able
using the standard git-am tool.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-07-22 22:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-11 0:55 [PATCH 1/2] Fix copper/fiber auto-selection for 88e1111 Wang Jian
-- strict thread matches above, loose matches on Subject: below --
2008-07-16 13:46 Wang Jian
2008-07-22 22:02 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).