The patch titled
sky2: fix PHY setup on FE-P
has been added to the -mm tree. Its filename is
sky2-fix-phy-setup-on-fe-p.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: sky2: fix PHY setup on FE-P
From: Stephen Hemminger <shemminger@xxxxxxxxxxxxxxxxxxxx>
Marvell reported the following fix is necessary to get fe-plus chips to
work.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/sky2.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN drivers/net/sky2.c~sky2-fix-phy-setup-on-fe-p drivers/net/sky2.c
--- a/drivers/net/sky2.c~sky2-fix-phy-setup-on-fe-p
+++ a/drivers/net/sky2.c
@@ -488,11 +488,12 @@ static void sky2_phy_init(struct sky2_hw
case CHIP_ID_YUKON_FE_P:
/* Enable Link Partner Next Page */
+ ctrl = gm_phy_read(hw, port, PHY_MARV_PHY_CTRL);
ctrl |= PHY_M_PC_ENA_LIP_NP;
/* disable Energy Detect and enable scrambler */
ctrl &= ~(PHY_M_PC_ENA_ENE_DT | PHY_M_PC_DIS_SCRAMB);
- gm_phy_write(hw, port, PHY_MARV_CTRL, ctrl);
+ gm_phy_write(hw, port, PHY_MARV_PHY_CTRL, ctrl);
/* set LED2 -> ACT, LED1 -> LINK, LED0 -> SPEED */
ctrl = PHY_M_FELP_LED2_CTRL(LED_PAR_CTRL_ACT_BL) |
_
Patches currently in -mm which might be from shemminger@xxxxxxxxxxxxxxxxxxxx are
pci-x-pci-express-read-control-interfaces-mthca.patch
git-netdev-all.patch
pci-x-pci-express-read-control-interfaces-e1000.patch
export-reciprocal_value-for-modules.patch
sky2-avoid-divide-in-receive-path.patch
sky2-118.patch
skge-remove-broken-and-unused-phy_m_pc_mdi_xmode-macro.patch
sky2-restore-multicast-list-on-resume-and-other-ops.patch
sky2-fix-phy-setup-on-fe-p.patch
git-net.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
