Skip to contentSkip to conversation

net: phy/cortina: Add four phy addresses support

PATCH New Chunhe Lan 2 participants 3 messages Apr 30, 2014 – Jul 18, 2014

Subsystems (2)
Network drivers Ethernet PHY
lore
Share & tools
lore

Chunhe Lan

author
#0 lore raw

PATCH 1/1 net: phy/cortina: Add four phy addresses support

Before CORTINA driver only supports two phy addresses. This patch adds the four phy addresses support for CORTINA PHY module.

Signed-off-by Chunhe Lan <[email protected]>
---
 drivers/net/phy/cortina.c |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)
drivers/net/phy/cortina.c +22 -6
index 7e46679..1b9434f 100644
@@ -289,25 +289,41 @@ int phy_cortina_init(void)
 int get_phy_id(struct mii_dev *bus, int addr, int devad, u32 *phy_id)
 {
 	int phy_reg;
+	bool cortina_phy = false;
+
+	switch (addr) {
+#ifdef CORTINA_PHY_ADDR1
+	case CORTINA_PHY_ADDR1:
+#endif
+#ifdef CORTINA_PHY_ADDR2
+	case CORTINA_PHY_ADDR2:
+#endif
+#ifdef CORTINA_PHY_ADDR3
+	case CORTINA_PHY_ADDR3:
+#endif
+#ifdef CORTINA_PHY_ADDR4
+	case CORTINA_PHY_ADDR4:
+#endif
+		cortina_phy = true;
+		break;
+	default:
+		break;
+	}
 
-#if defined(CORTINA_PHY_ADDR1) || defined(CORTINA_PHY_ADDR2)
 	/* Cortina PHY has non-standard offset of PHY ID registers */
-	if (addr == CORTINA_PHY_ADDR1 || addr == CORTINA_PHY_ADDR2)
+	if (cortina_phy)
 		phy_reg = bus->read(bus, addr, 0, VILLA_GLOBAL_CHIP_ID_LSB);
 	else
-#endif
 		phy_reg = bus->read(bus, addr, devad, MII_PHYSID1);
 
 	if (phy_reg < 0)
 		return -EIO;
 
 	*phy_id = (phy_reg & 0xffff) << 16;
-#if defined(CORTINA_PHY_ADDR1) || defined(CORTINA_PHY_ADDR2)
 	/* Cortina PHY has non-standard offset of PHY ID registers */
-	if (addr == CORTINA_PHY_ADDR1 || addr == CORTINA_PHY_ADDR2)
+	if (cortina_phy)
 		phy_reg = bus->read(bus, addr, 0, VILLA_GLOBAL_CHIP_ID_MSB);
 	else
-#endif
 		phy_reg = bus->read(bus, addr, devad, MII_PHYSID2);
 
 	if (phy_reg < 0)
Signature · 1 line
1.7.6.5
#1 lore raw

PATCH 1/1 net: phy/cortina: Add four phy addresses support

Quoted 9 lines · Chunhe Lan

Before CORTINA driver only supports two phy addresses. This patch adds the four phy addresses support for CORTINA PHY module.

Signed-off-by Chunhe Lan <[email protected]>
---
 drivers/net/phy/cortina.c |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)

Chunhe,

Does this patch depend on other patches? I don't see cortina.c file.

York

#2 lore raw

PATCH 1/1 net: phy/cortina: Add four phy addresses support

Quoted 11 lines · York Sun
Quoted 9 lines · Chunhe Lan

Before CORTINA driver only supports two phy addresses. This patch adds the four phy addresses support for CORTINA PHY module.

Signed-off-by Chunhe Lan <[email protected]>
---
 drivers/net/phy/cortina.c |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)
Quoted 4 lines

Chunhe,

Does this patch depend on other patches? I don't see cortina.c file.

Looks like you have this patch consolidated into this one
http://patchwork.ozlabs.org/patch/350162/.

Please confirm so we can drop this.

York