1 files changed, 16 insertions, 2 deletions

diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index 28a54451a3e..2b0748dba8b 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -141,6 +141,7 @@ static DEFINE_PCI_DEVICE_TABLE(sky2_id_table) = {
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4370) }, /* 88E8075 */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4380) }, /* 88E8057 */
         { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4381) }, /* 88E8059 */
+        { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4382) }, /* 88E8079 */
         { 0 }
 };
 
@@ -3079,8 +3080,10 @@ static irqreturn_t sky2_intr(int irq, void *dev_id)
 
         /* Reading this mask interrupts as side effect */
         status = sky2_read32(hw, B0_Y2_SP_ISRC2);
-        if (status == 0 || status == ~0)
+        if (status == 0 || status == ~0) {
+                sky2_write32(hw, B0_Y2_SP_ICR, 2);
                 return IRQ_NONE;
+        }
 
         prefetch(&hw->st_le[hw->st_idx]);
 
@@ -3349,6 +3352,17 @@ static void sky2_reset(struct sky2_hw *hw)
                         sky2_pci_write16(hw, pdev->pcie_cap + PCI_EXP_LNKCTL,
                                          reg);
 
+                if (hw->chip_id == CHIP_ID_YUKON_PRM &&
+                        hw->chip_rev == CHIP_REV_YU_PRM_A0) {
+                        /* change PHY Interrupt polarity to low active */
+                        reg = sky2_read16(hw, GPHY_CTRL);
+                        sky2_write16(hw, GPHY_CTRL, reg | GPC_INTPOL);
+
+                        /* adapt HW for low active PHY Interrupt */
+                        reg = sky2_read16(hw, Y2_CFG_SPC + PCI_LDO_CTRL);
+                        sky2_write16(hw, Y2_CFG_SPC + PCI_LDO_CTRL, reg | PHY_M_UNDOC1);
+                }
+
                 sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 
                 /* re-enable PEX PM in PEX PHY debug reg. 8 (clear bit 12) */
@@ -4871,7 +4885,7 @@ static const char *sky2_name(u8 chipid, char *buf, int sz)
                 "UL 2",         /* 0xba */
                 "Unknown",      /* 0xbb */
                 "Optima",       /* 0xbc */
-                "Optima Prime", /* 0xbd */
+                "OptimaEEE",    /* 0xbd */
                 "Optima 2",     /* 0xbe */
         };