mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] net: fec: Use standard phy type defines
@ 2013-03-09 11:03 Sascha Hauer
  2013-03-09 11:03 ` [PATCH 1/2] net: fec: drop sevenwire support Sascha Hauer
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Sascha Hauer @ 2013-03-09 11:03 UTC (permalink / raw)
  To: barebox

I've never seen a board using sevenwire, so remove this from
the fec driver. Also, since we now have standard phy type
defines in include/linux/phy.h, use them in the fec platform_data
instead of a fec specific enum.

Sascha

----------------------------------------------------------------
Sascha Hauer (2):
      net: fec: drop sevenwire support
      net: fec: use standard phy type defines

 arch/arm/boards/ccxmx51/ccxmx51.c                 |  2 +-
 arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c |  2 +-
 arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c |  2 +-
 arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c |  2 +-
 arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c |  2 +-
 arch/arm/boards/freescale-mx25-3-stack/3stack.c   |  2 +-
 arch/arm/boards/freescale-mx28-evk/mx28-evk.c     |  2 +-
 arch/arm/boards/freescale-mx35-3-stack/3stack.c   |  2 +-
 arch/arm/boards/freescale-mx51-pdk/board.c        |  2 +-
 arch/arm/boards/freescale-mx53-loco/board.c       |  2 +-
 arch/arm/boards/freescale-mx53-smd/board.c        |  2 +-
 arch/arm/boards/freescale-mx6-arm2/board.c        |  2 +-
 arch/arm/boards/freescale-mx6-sabrelite/board.c   |  2 +-
 arch/arm/boards/freescale-mx6-sabresd/board.c     |  2 +-
 arch/arm/boards/guf-cupid/board.c                 |  2 +-
 arch/arm/boards/guf-neso/board.c                  |  2 +-
 arch/arm/boards/guf-vincell/board.c               |  2 +-
 arch/arm/boards/imx27ads/imx27ads.c               |  2 +-
 arch/arm/boards/karo-tx25/board.c                 |  2 +-
 arch/arm/boards/karo-tx28/tx28-stk5.c             |  2 +-
 arch/arm/boards/karo-tx51/tx51.c                  |  2 +-
 arch/arm/boards/karo-tx53/board.c                 |  2 +-
 arch/arm/boards/pcm038/pcm038.c                   |  2 +-
 arch/arm/boards/pcm043/pcm043.c                   |  2 +-
 arch/arm/boards/phycard-i.MX27/pca100.c           |  2 +-
 arch/arm/boards/tqma53/board.c                    |  2 +-
 arch/ppc/boards/pcm030/pcm030.c                   |  2 +-
 drivers/net/fec_imx.c                             | 70 ++++++++--------------
 drivers/net/fec_imx.h                             |  1 -
 drivers/net/fec_mpc5200.c                         | 71 +++++++----------------
 drivers/net/fec_mpc5200.h                         |  1 -
 include/fec.h                                     | 13 +----
 32 files changed, 74 insertions(+), 136 deletions(-)

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH 1/2] net: fec: drop sevenwire support
  2013-03-09 11:03 [PATCH] net: fec: Use standard phy type defines Sascha Hauer
@ 2013-03-09 11:03 ` Sascha Hauer
  2013-03-09 16:56   ` Alexander Aring
  2013-03-09 11:03 ` [PATCH 2/2] net: fec: use standard phy type defines Sascha Hauer
  2013-03-10 13:17 ` [PATCH] net: fec: Use " Jean-Christophe PLAGNIOL-VILLARD
  2 siblings, 1 reply; 7+ messages in thread
From: Sascha Hauer @ 2013-03-09 11:03 UTC (permalink / raw)
  To: barebox

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/net/fec_imx.c     | 75 ++++++++++++++++++++-----------------------
 drivers/net/fec_mpc5200.c | 82 +++++++++++++++++++----------------------------
 include/fec.h             |  1 -
 3 files changed, 67 insertions(+), 91 deletions(-)

diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c
index 578000a..d18c062 100644
--- a/drivers/net/fec_imx.c
+++ b/drivers/net/fec_imx.c
@@ -298,15 +298,14 @@ static int fec_init(struct eth_device *dev)
 	 * Set FEC-Lite receive control register(R_CNTRL):
 	 */
 	rcntl = FEC_R_CNTRL_MAX_FL(1518);
-	if (fec->xcv_type != SEVENWIRE) {
-		rcntl |= FEC_R_CNTRL_MII_MODE;
-		/*
-		 * Set MII_SPEED = (1/(mii_speed * 2)) * System Clock
-		 * and do not drop the Preamble.
-		 */
-		writel(((fec_clk_get_rate(fec) >> 20) / 5) << 1,
-				fec->regs + FEC_MII_SPEED);
-	}
+
+	rcntl |= FEC_R_CNTRL_MII_MODE;
+	/*
+	 * Set MII_SPEED = (1/(mii_speed * 2)) * System Clock
+	 * and do not drop the Preamble.
+	 */
+	writel(((fec_clk_get_rate(fec) >> 20) / 5) << 1,
+			fec->regs + FEC_MII_SPEED);
 
 	if (fec->xcv_type == RMII) {
 		if (fec_is_imx28(fec) || fec_is_imx6(fec)) {
@@ -385,16 +384,14 @@ static int fec_open(struct eth_device *edev)
 	int ret;
 	u32 ecr;
 
-	if (fec->xcv_type != SEVENWIRE) {
-		ret = phy_device_connect(edev, &fec->miibus, fec->phy_addr,
-					 fec_update_linkspeed, fec->phy_flags,
-					 fec->interface);
-		if (ret)
-			return ret;
+	ret = phy_device_connect(edev, &fec->miibus, fec->phy_addr,
+				 fec_update_linkspeed, fec->phy_flags,
+				 fec->interface);
+	if (ret)
+		return ret;
 
-		if (fec->phy_init)
-			fec->phy_init(edev->phydev);
-	}
+	if (fec->phy_init)
+		fec->phy_init(edev->phydev);
 
 	/*
 	 * Initialize RxBD/TxBD rings
@@ -699,31 +696,27 @@ static int fec_probe(struct device_d *dev)
 
 	fec_init(edev);
 
-	if (fec->xcv_type != SEVENWIRE) {
-		fec->miibus.read = fec_miibus_read;
-		fec->miibus.write = fec_miibus_write;
-		switch (fec->xcv_type) {
-		case RMII:
-			fec->interface = PHY_INTERFACE_MODE_RMII;
-			break;
-		case RGMII:
-			fec->interface = PHY_INTERFACE_MODE_RGMII;
-			break;
-		case MII10:
-			fec->phy_flags = PHYLIB_FORCE_10;
-		case MII100:
-			fec->interface = PHY_INTERFACE_MODE_MII;
-			break;
-		case SEVENWIRE:
-			fec->interface = PHY_INTERFACE_MODE_NA;
-			break;
-		}
-		fec->miibus.priv = fec;
-		fec->miibus.parent = dev;
-
-		mdiobus_register(&fec->miibus);
+	fec->miibus.read = fec_miibus_read;
+	fec->miibus.write = fec_miibus_write;
+	switch (fec->xcv_type) {
+	case RMII:
+		fec->interface = PHY_INTERFACE_MODE_RMII;
+		break;
+	case RGMII:
+		fec->interface = PHY_INTERFACE_MODE_RGMII;
+		break;
+	case MII10:
+		fec->phy_flags = PHYLIB_FORCE_10;
+	case MII100:
+		fec->interface = PHY_INTERFACE_MODE_MII;
+		break;
 	}
 
+	fec->miibus.priv = fec;
+	fec->miibus.parent = dev;
+
+	mdiobus_register(&fec->miibus);
+
 	eth_register(edev);
 	return 0;
 
diff --git a/drivers/net/fec_mpc5200.c b/drivers/net/fec_mpc5200.c
index 9ef5350..bdb4e8b 100644
--- a/drivers/net/fec_mpc5200.c
+++ b/drivers/net/fec_mpc5200.c
@@ -294,25 +294,17 @@ static int mpc5xxx_fec_init(struct eth_device *dev)
 	/*
 	 * Set FEC-Lite receive control register(R_CNTRL):
 	 */
-	if (fec->xcv_type == SEVENWIRE) {
-		/*
-		 * Frame length=1518; 7-wire mode
-		 */
-		fec->eth->r_cntrl = 0x05ee0020;	/*0x05ee0000;FIXME */
-	} else {
-		/*
-		 * Frame length=1518; MII mode;
-		 */
-		fec->eth->r_cntrl = 0x05ee0024;	/*0x05ee0004;FIXME */
-	}
 
-	if (fec->xcv_type != SEVENWIRE) {
-		/*
-		 * Set MII_SPEED = (1/(mii_speed * 2)) * System Clock
-		 * and do not drop the Preamble.
-		 */
-		fec->eth->mii_speed = (((get_ipb_clock() >> 20) / 5) << 1);	/* No MII for 7-wire mode */
-	}
+	/*
+	 * Frame length=1518; MII mode;
+	 */
+	fec->eth->r_cntrl = 0x05ee0024;	/*0x05ee0004;FIXME */
+
+	/*
+	 * Set MII_SPEED = (1/(mii_speed * 2)) * System Clock
+	 * and do not drop the Preamble.
+	 */
+	fec->eth->mii_speed = (((get_ipb_clock() >> 20) / 5) << 1);	/* No MII for 7-wire mode */
 
 	/*
 	 * Set Opcode/Pause Duration Register
@@ -406,10 +398,8 @@ static int mpc5xxx_fec_open(struct eth_device *edev)
 	 */
 	SDMA_TASK_ENABLE(FEC_RECV_TASK_NO);
 
-	if (fec->xcv_type != SEVENWIRE) {
-		return phy_device_connect(edev, &fec->miibus, CONFIG_PHY_ADDR,
-				 NULL, fec->phy_flags, fec->interface);
-	}
+	return phy_device_connect(edev, &fec->miibus, CONFIG_PHY_ADDR,
+			 NULL, fec->phy_flags, fec->interface);
 
 	return 0;
 }
@@ -511,6 +501,7 @@ static int mpc5xxx_fec_send(struct eth_device *dev, void *eth_data,
 	 */
 	mpc5xxx_fec_priv *fec = (mpc5xxx_fec_priv *)dev->priv;
 	volatile FEC_TBD *pTbd;
+	uint16_t phyStatus;
 
 #ifdef DEBUG_FIFO
 	debug_fifo("tbd status: 0x%04x\n", fec->tbdBase[0].status);
@@ -548,10 +539,7 @@ static int mpc5xxx_fec_send(struct eth_device *dev, void *eth_data,
 	/*
 	 * Kick the MII i/f
 	 */
-	if (fec->xcv_type != SEVENWIRE) {
-		uint16_t phyStatus;
-		phyStatus = fec5xxx_miibus_read(&fec->miibus, 0, 0x1);
-	}
+	phyStatus = fec5xxx_miibus_read(&fec->miibus, 0, 0x1);
 
 	/*
 	 * Enable SmartDMA transmit task
@@ -676,31 +664,27 @@ int mpc5xxx_fec_probe(struct device_d *dev)
 
 	loadtask(0, 2);
 
-	if (fec->xcv_type != SEVENWIRE) {
-		fec->miibus.read = fec5xxx_miibus_read;
-		fec->miibus.write = fec5xxx_miibus_write;
-		switch (pdata->xcv_type) {
-		case RMII:
-			fec->interface = PHY_INTERFACE_MODE_RMII;
-			break;
-		case RGMII:
-			fec->interface = PHY_INTERFACE_MODE_RGMII;
-			break;
-		case MII10:
-			fec->phy_flags = PHYLIB_FORCE_10;
-		case MII100:
-			fec->interface = PHY_INTERFACE_MODE_MII;
-			break;
-		case SEVENWIRE:
-			fec->interface = PHY_INTERFACE_MODE_NA;
-			break;
-		}
-		fec->miibus.priv = fec;
-		fec->miibus.parent = dev;
-
-		mdiobus_register(&fec->miibus);
+	fec->miibus.read = fec5xxx_miibus_read;
+	fec->miibus.write = fec5xxx_miibus_write;
+	switch (pdata->xcv_type) {
+	case RMII:
+		fec->interface = PHY_INTERFACE_MODE_RMII;
+		break;
+	case RGMII:
+		fec->interface = PHY_INTERFACE_MODE_RGMII;
+		break;
+	case MII10:
+		fec->phy_flags = PHYLIB_FORCE_10;
+	case MII100:
+		fec->interface = PHY_INTERFACE_MODE_MII;
+		break;
 	}
 
+	fec->miibus.priv = fec;
+	fec->miibus.parent = dev;
+
+	mdiobus_register(&fec->miibus);
+
 	eth_register(edev);
 	return 0;
 }
diff --git a/include/fec.h b/include/fec.h
index 94cb6ed..80904dc 100644
--- a/include/fec.h
+++ b/include/fec.h
@@ -27,7 +27,6 @@
  * Supported phy types on this platform
  */
 typedef enum {
-	SEVENWIRE,
 	MII10,
 	MII100,
 	RMII,
-- 
1.8.2.rc2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [PATCH 2/2] net: fec: use standard phy type defines
  2013-03-09 11:03 [PATCH] net: fec: Use standard phy type defines Sascha Hauer
  2013-03-09 11:03 ` [PATCH 1/2] net: fec: drop sevenwire support Sascha Hauer
@ 2013-03-09 11:03 ` Sascha Hauer
  2013-03-10 13:17 ` [PATCH] net: fec: Use " Jean-Christophe PLAGNIOL-VILLARD
  2 siblings, 0 replies; 7+ messages in thread
From: Sascha Hauer @ 2013-03-09 11:03 UTC (permalink / raw)
  To: barebox

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/boards/ccxmx51/ccxmx51.c                 |  2 +-
 arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c |  2 +-
 arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c |  2 +-
 arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c |  2 +-
 arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c |  2 +-
 arch/arm/boards/freescale-mx25-3-stack/3stack.c   |  2 +-
 arch/arm/boards/freescale-mx28-evk/mx28-evk.c     |  2 +-
 arch/arm/boards/freescale-mx35-3-stack/3stack.c   |  2 +-
 arch/arm/boards/freescale-mx51-pdk/board.c        |  2 +-
 arch/arm/boards/freescale-mx53-loco/board.c       |  2 +-
 arch/arm/boards/freescale-mx53-smd/board.c        |  2 +-
 arch/arm/boards/freescale-mx6-arm2/board.c        |  2 +-
 arch/arm/boards/freescale-mx6-sabrelite/board.c   |  2 +-
 arch/arm/boards/freescale-mx6-sabresd/board.c     |  2 +-
 arch/arm/boards/guf-cupid/board.c                 |  2 +-
 arch/arm/boards/guf-neso/board.c                  |  2 +-
 arch/arm/boards/guf-vincell/board.c               |  2 +-
 arch/arm/boards/imx27ads/imx27ads.c               |  2 +-
 arch/arm/boards/karo-tx25/board.c                 |  2 +-
 arch/arm/boards/karo-tx28/tx28-stk5.c             |  2 +-
 arch/arm/boards/karo-tx51/tx51.c                  |  2 +-
 arch/arm/boards/karo-tx53/board.c                 |  2 +-
 arch/arm/boards/pcm038/pcm038.c                   |  2 +-
 arch/arm/boards/pcm043/pcm043.c                   |  2 +-
 arch/arm/boards/phycard-i.MX27/pca100.c           |  2 +-
 arch/arm/boards/tqma53/board.c                    |  2 +-
 arch/ppc/boards/pcm030/pcm030.c                   |  2 +-
 drivers/net/fec_imx.c                             | 21 ++++-----------------
 drivers/net/fec_imx.h                             |  1 -
 drivers/net/fec_mpc5200.c                         | 15 +--------------
 drivers/net/fec_mpc5200.h                         |  1 -
 include/fec.h                                     | 12 +-----------
 32 files changed, 33 insertions(+), 71 deletions(-)

diff --git a/arch/arm/boards/ccxmx51/ccxmx51.c b/arch/arm/boards/ccxmx51/ccxmx51.c
index b1c579b..90ed600 100644
--- a/arch/arm/boards/ccxmx51/ccxmx51.c
+++ b/arch/arm/boards/ccxmx51/ccxmx51.c
@@ -81,7 +81,7 @@ struct imx_nand_platform_data nand_info = {
 };
 
 static struct fec_platform_data fec_info = {
-	.xcv_type	= MII100,
+	.xcv_type	= PHY_INTERFACE_MODE_MII,
 	.phy_addr	= 7,
 };
 
diff --git a/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c b/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c
index 98c9b43..b7d8258 100644
--- a/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c
+++ b/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c
@@ -47,7 +47,7 @@
 #include <asm/barebox-arm-head.h>
 
 static struct fec_platform_data fec_info = {
-	.xcv_type	= RMII,
+	.xcv_type	= PHY_INTERFACE_MODE_RMII,
 	.phy_addr	= 0,
 };
 
diff --git a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c
index d690581..4176d63 100644
--- a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c
+++ b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c
@@ -47,7 +47,7 @@
 #include <mach/devices-imx27.h>
 
 static struct fec_platform_data fec_info = {
-	.xcv_type = MII100,
+	.xcv_type = PHY_INTERFACE_MODE_MII,
 	.phy_addr = 1,
 };
 
diff --git a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c
index 2c96007..e406fe8 100644
--- a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c
+++ b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c
@@ -52,7 +52,7 @@
 #include <mach/devices-imx35.h>
 
 static struct fec_platform_data fec_info = {
-	.xcv_type	= MII100,
+	.xcv_type	= PHY_INTERFACE_MODE_MII,
 	.phy_addr	= 0,
 };
 
diff --git a/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c b/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c
index fdbd051..5e77f90 100644
--- a/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c
+++ b/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c
@@ -39,7 +39,7 @@
 #include <mach/devices-imx51.h>
 
 static struct fec_platform_data fec_info = {
-	.xcv_type = MII100,
+	.xcv_type = PHY_INTERFACE_MODE_MII,
 };
 
 struct imx_nand_platform_data nand_info = {
diff --git a/arch/arm/boards/freescale-mx25-3-stack/3stack.c b/arch/arm/boards/freescale-mx25-3-stack/3stack.c
index 4d048be..27a39b7 100644
--- a/arch/arm/boards/freescale-mx25-3-stack/3stack.c
+++ b/arch/arm/boards/freescale-mx25-3-stack/3stack.c
@@ -104,7 +104,7 @@ struct imx_flash_header __flash_header_section flash_header = {
 unsigned long __image_len_section barebox_len = DCD_BAREBOX_SIZE;
 
 static struct fec_platform_data fec_info = {
-	.xcv_type	= RMII,
+	.xcv_type	= PHY_INTERFACE_MODE_RMII,
 	.phy_addr	= 1,
 };
 
diff --git a/arch/arm/boards/freescale-mx28-evk/mx28-evk.c b/arch/arm/boards/freescale-mx28-evk/mx28-evk.c
index 2e866a3..364b6ee 100644
--- a/arch/arm/boards/freescale-mx28-evk/mx28-evk.c
+++ b/arch/arm/boards/freescale-mx28-evk/mx28-evk.c
@@ -172,7 +172,7 @@ static void __init mx28_evk_fec_reset(void)
 
 /* PhyAD[0..2]=0, RMIISEL=1 */
 static struct fec_platform_data fec_info = {
-	.xcv_type = RMII,
+	.xcv_type = PHY_INTERFACE_MODE_RMII,
 	.phy_addr = 0,
 };
 
diff --git a/arch/arm/boards/freescale-mx35-3-stack/3stack.c b/arch/arm/boards/freescale-mx35-3-stack/3stack.c
index e1cb73c..791a3ed 100644
--- a/arch/arm/boards/freescale-mx35-3-stack/3stack.c
+++ b/arch/arm/boards/freescale-mx35-3-stack/3stack.c
@@ -60,7 +60,7 @@
 #define MX35PDK_BOARD_REV_2		1
 
 static struct fec_platform_data fec_info = {
-	.xcv_type	= MII100,
+	.xcv_type	= PHY_INTERFACE_MODE_MII,
 	.phy_addr	= 0x1F,
 };
 
diff --git a/arch/arm/boards/freescale-mx51-pdk/board.c b/arch/arm/boards/freescale-mx51-pdk/board.c
index 831ed0e..db34056 100644
--- a/arch/arm/boards/freescale-mx51-pdk/board.c
+++ b/arch/arm/boards/freescale-mx51-pdk/board.c
@@ -43,7 +43,7 @@
 #include <mach/imx-flash-header.h>
 
 static struct fec_platform_data fec_info = {
-	.xcv_type = MII100,
+	.xcv_type = PHY_INTERFACE_MODE_MII,
 };
 
 static iomux_v3_cfg_t f3s_pads[] = {
diff --git a/arch/arm/boards/freescale-mx53-loco/board.c b/arch/arm/boards/freescale-mx53-loco/board.c
index 5846725..e041de6 100644
--- a/arch/arm/boards/freescale-mx53-loco/board.c
+++ b/arch/arm/boards/freescale-mx53-loco/board.c
@@ -47,7 +47,7 @@
 #include <asm/mmu.h>
 
 static struct fec_platform_data fec_info = {
-	.xcv_type = RMII,
+	.xcv_type = PHY_INTERFACE_MODE_RMII,
 };
 
 static iomux_v3_cfg_t loco_pads[] = {
diff --git a/arch/arm/boards/freescale-mx53-smd/board.c b/arch/arm/boards/freescale-mx53-smd/board.c
index 64ba7f2..d7f6e8b 100644
--- a/arch/arm/boards/freescale-mx53-smd/board.c
+++ b/arch/arm/boards/freescale-mx53-smd/board.c
@@ -41,7 +41,7 @@
 #include <asm/mmu.h>
 
 static struct fec_platform_data fec_info = {
-	.xcv_type = RMII,
+	.xcv_type = PHY_INTERFACE_MODE_RMII,
 };
 
 static iomux_v3_cfg_t smd_pads[] = {
diff --git a/arch/arm/boards/freescale-mx6-arm2/board.c b/arch/arm/boards/freescale-mx6-arm2/board.c
index ce9874d..538ab7f 100644
--- a/arch/arm/boards/freescale-mx6-arm2/board.c
+++ b/arch/arm/boards/freescale-mx6-arm2/board.c
@@ -122,7 +122,7 @@ static void mx6_rgmii_rework(struct phy_device *dev)
 }
 
 static struct fec_platform_data fec_info = {
-	.xcv_type = RGMII,
+	.xcv_type = PHY_INTERFACE_MODE_RGMII,
 	.phy_init = mx6_rgmii_rework,
 	.phy_addr = 0,
 };
diff --git a/arch/arm/boards/freescale-mx6-sabrelite/board.c b/arch/arm/boards/freescale-mx6-sabrelite/board.c
index 2a12786..2afaae3 100644
--- a/arch/arm/boards/freescale-mx6-sabrelite/board.c
+++ b/arch/arm/boards/freescale-mx6-sabrelite/board.c
@@ -147,7 +147,7 @@ static void mx6_rgmii_rework(struct phy_device *dev)
 }
 
 static struct fec_platform_data fec_info = {
-	.xcv_type = RGMII,
+	.xcv_type = PHY_INTERFACE_MODE_RGMII,
 	.phy_init = mx6_rgmii_rework,
 	.phy_addr = 6,
 };
diff --git a/arch/arm/boards/freescale-mx6-sabresd/board.c b/arch/arm/boards/freescale-mx6-sabresd/board.c
index 1cdb0aa..e41dc77 100644
--- a/arch/arm/boards/freescale-mx6-sabresd/board.c
+++ b/arch/arm/boards/freescale-mx6-sabresd/board.c
@@ -159,7 +159,7 @@ static int ar8031_phy_fixup(struct phy_device *dev)
 }
 
 static struct fec_platform_data fec_info = {
-	.xcv_type = RGMII,
+	.xcv_type = PHY_INTERFACE_MODE_RGMII,
 	.phy_addr = 1,
 };
 
diff --git a/arch/arm/boards/guf-cupid/board.c b/arch/arm/boards/guf-cupid/board.c
index 839b415..67a4b1d 100644
--- a/arch/arm/boards/guf-cupid/board.c
+++ b/arch/arm/boards/guf-cupid/board.c
@@ -43,7 +43,7 @@
 #include <mach/devices-imx35.h>
 
 static struct fec_platform_data fec_info = {
-	.xcv_type = MII100,
+	.xcv_type = PHY_INTERFACE_MODE_MII,
 };
 
 struct imx_nand_platform_data nand_info = {
diff --git a/arch/arm/boards/guf-neso/board.c b/arch/arm/boards/guf-neso/board.c
index 086d96b..00e0d21 100644
--- a/arch/arm/boards/guf-neso/board.c
+++ b/arch/arm/boards/guf-neso/board.c
@@ -51,7 +51,7 @@
 #define BACKLIGHT_POWER_GPIO (GPIO_PORTE + 5)
 
 static struct fec_platform_data fec_info = {
-	.xcv_type = MII100,
+	.xcv_type = PHY_INTERFACE_MODE_MII,
 	.phy_addr = 31,
 };
 
diff --git a/arch/arm/boards/guf-vincell/board.c b/arch/arm/boards/guf-vincell/board.c
index 1020bce..f53a8e8 100644
--- a/arch/arm/boards/guf-vincell/board.c
+++ b/arch/arm/boards/guf-vincell/board.c
@@ -47,7 +47,7 @@
 #include <asm/mmu.h>
 
 static struct fec_platform_data fec_info = {
-	.xcv_type = RMII,
+	.xcv_type = PHY_INTERFACE_MODE_RMII,
 };
 
 static iomux_v3_cfg_t vincell_pads[] = {
diff --git a/arch/arm/boards/imx27ads/imx27ads.c b/arch/arm/boards/imx27ads/imx27ads.c
index d07d553..fc8cf4a 100644
--- a/arch/arm/boards/imx27ads/imx27ads.c
+++ b/arch/arm/boards/imx27ads/imx27ads.c
@@ -32,7 +32,7 @@
 #include <mach/devices-imx27.h>
 
 static struct fec_platform_data fec_info = {
-	.xcv_type = MII100,
+	.xcv_type = PHY_INTERFACE_MODE_MII,
 	.phy_addr = 1,
 };
 
diff --git a/arch/arm/boards/karo-tx25/board.c b/arch/arm/boards/karo-tx25/board.c
index e581886..b2f6856 100644
--- a/arch/arm/boards/karo-tx25/board.c
+++ b/arch/arm/boards/karo-tx25/board.c
@@ -41,7 +41,7 @@
 #include <asm/mmu.h>
 
 static struct fec_platform_data fec_info = {
-	.xcv_type	= RMII,
+	.xcv_type	= PHY_INTERFACE_MODE_RMII,
 	.phy_addr	= 0x1f,
 };
 
diff --git a/arch/arm/boards/karo-tx28/tx28-stk5.c b/arch/arm/boards/karo-tx28/tx28-stk5.c
index 766e77b..a0109d6 100644
--- a/arch/arm/boards/karo-tx28/tx28-stk5.c
+++ b/arch/arm/boards/karo-tx28/tx28-stk5.c
@@ -38,7 +38,7 @@ static struct mxs_mci_platform_data mci_pdata = {
 
 /* PhyAD[0..2]=0, RMIISEL=1 */
 static struct fec_platform_data fec_info = {
-	.xcv_type = RMII,
+	.xcv_type = PHY_INTERFACE_MODE_RMII,
 	.phy_addr = 0,
 };
 
diff --git a/arch/arm/boards/karo-tx51/tx51.c b/arch/arm/boards/karo-tx51/tx51.c
index 6c2b14b..d1407a8 100644
--- a/arch/arm/boards/karo-tx51/tx51.c
+++ b/arch/arm/boards/karo-tx51/tx51.c
@@ -46,7 +46,7 @@
     IOMUX_PAD(0x6c0, 0x2c0, 4, 0x098c, 1, 0)
 
 static struct fec_platform_data fec_info = {
-	.xcv_type = MII100,
+	.xcv_type = PHY_INTERFACE_MODE_MII,
 };
 
 struct imx_nand_platform_data nand_info = {
diff --git a/arch/arm/boards/karo-tx53/board.c b/arch/arm/boards/karo-tx53/board.c
index 8a69e99..76c1834 100644
--- a/arch/arm/boards/karo-tx53/board.c
+++ b/arch/arm/boards/karo-tx53/board.c
@@ -41,7 +41,7 @@
 #include <asm/mmu.h>
 
 static struct fec_platform_data fec_info = {
-	.xcv_type = RMII,
+	.xcv_type = PHY_INTERFACE_MODE_RMII,
 };
 
 static iomux_v3_cfg_t tx53_pads[] = {
diff --git a/arch/arm/boards/pcm038/pcm038.c b/arch/arm/boards/pcm038/pcm038.c
index 587ace8..ef40228 100644
--- a/arch/arm/boards/pcm038/pcm038.c
+++ b/arch/arm/boards/pcm038/pcm038.c
@@ -46,7 +46,7 @@
 #include "pll.h"
 
 static struct fec_platform_data fec_info = {
-	.xcv_type = MII100,
+	.xcv_type = PHY_INTERFACE_MODE_MII,
 	.phy_addr = 1,
 };
 
diff --git a/arch/arm/boards/pcm043/pcm043.c b/arch/arm/boards/pcm043/pcm043.c
index 04418fb..e81e903 100644
--- a/arch/arm/boards/pcm043/pcm043.c
+++ b/arch/arm/boards/pcm043/pcm043.c
@@ -46,7 +46,7 @@
 #include <mach/generic.h>
 
 static struct fec_platform_data fec_info = {
-	.xcv_type = MII100,
+	.xcv_type = PHY_INTERFACE_MODE_MII,
 };
 
 struct imx_nand_platform_data nand_info = {
diff --git a/arch/arm/boards/phycard-i.MX27/pca100.c b/arch/arm/boards/phycard-i.MX27/pca100.c
index 1a21c8a..fb286db 100644
--- a/arch/arm/boards/phycard-i.MX27/pca100.c
+++ b/arch/arm/boards/phycard-i.MX27/pca100.c
@@ -40,7 +40,7 @@
 #include <mach/devices-imx27.h>
 
 static struct fec_platform_data fec_info = {
-	.xcv_type = MII100,
+	.xcv_type = PHY_INTERFACE_MODE_MII,
 	.phy_addr = 1,
 };
 
diff --git a/arch/arm/boards/tqma53/board.c b/arch/arm/boards/tqma53/board.c
index 03cb8ea..2f9d7e6 100644
--- a/arch/arm/boards/tqma53/board.c
+++ b/arch/arm/boards/tqma53/board.c
@@ -40,7 +40,7 @@
 #include <mach/imx5.h>
 
 static struct fec_platform_data fec_info = {
-	.xcv_type = RMII,
+	.xcv_type = PHY_INTERFACE_MODE_RMII,
 };
 
 static iomux_v3_cfg_t tqma53_pads[] = {
diff --git a/arch/ppc/boards/pcm030/pcm030.c b/arch/ppc/boards/pcm030/pcm030.c
index ae7f7f8..f9bed79 100644
--- a/arch/ppc/boards/pcm030/pcm030.c
+++ b/arch/ppc/boards/pcm030/pcm030.c
@@ -35,7 +35,7 @@
 #include <fs.h>
 
 static struct fec_platform_data fec_info = {
-	.xcv_type = MII100,
+	.xcv_type = PHY_INTERFACE_MODE_MII,
 };
 
 static int devices_init (void)
diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c
index d18c062..37d88cd 100644
--- a/drivers/net/fec_imx.c
+++ b/drivers/net/fec_imx.c
@@ -307,7 +307,7 @@ static int fec_init(struct eth_device *dev)
 	writel(((fec_clk_get_rate(fec) >> 20) / 5) << 1,
 			fec->regs + FEC_MII_SPEED);
 
-	if (fec->xcv_type == RMII) {
+	if (fec->interface == PHY_INTERFACE_MODE_RMII) {
 		if (fec_is_imx28(fec) || fec_is_imx6(fec)) {
 			rcntl |= FEC_R_CNTRL_RMII_MODE | FEC_R_CNTRL_FCE |
 				FEC_R_CNTRL_NO_LGTH_CHECK;
@@ -325,7 +325,7 @@ static int fec_init(struct eth_device *dev)
 		}
 	}
 
-	if (fec->xcv_type == RGMII)
+	if (fec->interface == PHY_INTERFACE_MODE_RGMII)
 		rcntl |= 1 << 6;
 
 	writel(rcntl, fec->regs + FEC_R_CNTRL);
@@ -686,11 +686,11 @@ static int fec_probe(struct device_d *dev)
 	fec_alloc_receive_packets(fec, FEC_RBD_NUM, FEC_MAX_PKT_SIZE);
 
 	if (pdata) {
-		fec->xcv_type = pdata->xcv_type;
+		fec->interface = pdata->xcv_type;
 		fec->phy_init = pdata->phy_init;
 		fec->phy_addr = pdata->phy_addr;
 	} else {
-		fec->xcv_type = MII100;
+		fec->interface = PHY_INTERFACE_MODE_MII;
 		fec->phy_addr = -1;
 	}
 
@@ -698,19 +698,6 @@ static int fec_probe(struct device_d *dev)
 
 	fec->miibus.read = fec_miibus_read;
 	fec->miibus.write = fec_miibus_write;
-	switch (fec->xcv_type) {
-	case RMII:
-		fec->interface = PHY_INTERFACE_MODE_RMII;
-		break;
-	case RGMII:
-		fec->interface = PHY_INTERFACE_MODE_RGMII;
-		break;
-	case MII10:
-		fec->phy_flags = PHYLIB_FORCE_10;
-	case MII100:
-		fec->interface = PHY_INTERFACE_MODE_MII;
-		break;
-	}
 
 	fec->miibus.priv = fec;
 	fec->miibus.parent = dev;
diff --git a/drivers/net/fec_imx.h b/drivers/net/fec_imx.h
index 29aea85..0921b52 100644
--- a/drivers/net/fec_imx.h
+++ b/drivers/net/fec_imx.h
@@ -135,7 +135,6 @@ enum fec_type {
 struct fec_priv {
 	struct eth_device edev;
 	void __iomem *regs;
-	xceiver_type xcv_type;			/* transceiver type          */
 	struct buffer_descriptor __iomem *rbd_base;	/* RBD ring                  */
 	int rbd_index;				/* next receive BD to read   */
 	struct buffer_descriptor __iomem *tbd_base;	/* TBD ring                  */
diff --git a/drivers/net/fec_mpc5200.c b/drivers/net/fec_mpc5200.c
index bdb4e8b..162f1b0 100644
--- a/drivers/net/fec_mpc5200.c
+++ b/drivers/net/fec_mpc5200.c
@@ -660,25 +660,12 @@ int mpc5xxx_fec_probe(struct device_d *dev)
 	fec->tbdBase = (FEC_TBD *)FEC_BD_BASE;
 	fec->rbdBase = (FEC_RBD *)(FEC_BD_BASE + FEC_TBD_NUM * sizeof(FEC_TBD));
 
-	fec->xcv_type = pdata->xcv_type;
+	fec->interface = pdata->xcv_type;
 
 	loadtask(0, 2);
 
 	fec->miibus.read = fec5xxx_miibus_read;
 	fec->miibus.write = fec5xxx_miibus_write;
-	switch (pdata->xcv_type) {
-	case RMII:
-		fec->interface = PHY_INTERFACE_MODE_RMII;
-		break;
-	case RGMII:
-		fec->interface = PHY_INTERFACE_MODE_RGMII;
-		break;
-	case MII10:
-		fec->phy_flags = PHYLIB_FORCE_10;
-	case MII100:
-		fec->interface = PHY_INTERFACE_MODE_MII;
-		break;
-	}
 
 	fec->miibus.priv = fec;
 	fec->miibus.parent = dev;
diff --git a/drivers/net/fec_mpc5200.h b/drivers/net/fec_mpc5200.h
index 20ac607..f07ae0c 100644
--- a/drivers/net/fec_mpc5200.h
+++ b/drivers/net/fec_mpc5200.h
@@ -252,7 +252,6 @@ typedef struct {
 
 typedef struct {
 	ethernet_regs *eth;
-	xceiver_type xcv_type;		/* transceiver type */
 	FEC_RBD *rbdBase;		/* RBD ring */
 	FEC_TBD *tbdBase;		/* TBD ring */
 	uint16_t rbdIndex;		/* next receive BD to read */
diff --git a/include/fec.h b/include/fec.h
index 80904dc..699761a 100644
--- a/include/fec.h
+++ b/include/fec.h
@@ -24,21 +24,11 @@
 #include <linux/phy.h>
 
 /*
- * Supported phy types on this platform
- */
-typedef enum {
-	MII10,
-	MII100,
-	RMII,
-	RGMII,
-} xceiver_type;
-
-/*
  * Define the phy connected externally for FEC drivers
  * (like MPC52xx and i.MX27)
  */
 struct fec_platform_data {
-        xceiver_type	xcv_type;
+	phy_interface_t	xcv_type;
 	int		phy_addr;
 	void 		(*phy_init)(struct phy_device *dev);
 };
-- 
1.8.2.rc2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] net: fec: drop sevenwire support
  2013-03-09 11:03 ` [PATCH 1/2] net: fec: drop sevenwire support Sascha Hauer
@ 2013-03-09 16:56   ` Alexander Aring
  2013-03-09 19:10     ` Sascha Hauer
  0 siblings, 1 reply; 7+ messages in thread
From: Alexander Aring @ 2013-03-09 16:56 UTC (permalink / raw)
  To: Sascha Hauer; +Cc: barebox

Hi Sascha,

some nitpick...

On Sat, Mar 09, 2013 at 12:03:26PM +0100, Sascha Hauer wrote:
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  drivers/net/fec_imx.c     | 75 ++++++++++++++++++++-----------------------
>  drivers/net/fec_mpc5200.c | 82 +++++++++++++++++++----------------------------
>  include/fec.h             |  1 -
>  3 files changed, 67 insertions(+), 91 deletions(-)
> 
> diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c
> index 578000a..d18c062 100644
> --- a/drivers/net/fec_imx.c
> +++ b/drivers/net/fec_imx.c
> @@ -298,15 +298,14 @@ static int fec_init(struct eth_device *dev)
>  	 * Set FEC-Lite receive control register(R_CNTRL):
>  	 */
>  	rcntl = FEC_R_CNTRL_MAX_FL(1518);
> -	if (fec->xcv_type != SEVENWIRE) {
> -		rcntl |= FEC_R_CNTRL_MII_MODE;
> -		/*
> -		 * Set MII_SPEED = (1/(mii_speed * 2)) * System Clock
> -		 * and do not drop the Preamble.
> -		 */
> -		writel(((fec_clk_get_rate(fec) >> 20) / 5) << 1,
> -				fec->regs + FEC_MII_SPEED);
> -	}
> +
> +	rcntl |= FEC_R_CNTRL_MII_MODE;
> +	/*
> +	 * Set MII_SPEED = (1/(mii_speed * 2)) * System Clock
> +	 * and do not drop the Preamble.
> +	 */
> +	writel(((fec_clk_get_rate(fec) >> 20) / 5) << 1,
> +			fec->regs + FEC_MII_SPEED);
>  
>  	if (fec->xcv_type == RMII) {
>  		if (fec_is_imx28(fec) || fec_is_imx6(fec)) {
> @@ -385,16 +384,14 @@ static int fec_open(struct eth_device *edev)
>  	int ret;
>  	u32 ecr;
>  
> -	if (fec->xcv_type != SEVENWIRE) {
> -		ret = phy_device_connect(edev, &fec->miibus, fec->phy_addr,
> -					 fec_update_linkspeed, fec->phy_flags,
> -					 fec->interface);
> -		if (ret)
> -			return ret;
> +	ret = phy_device_connect(edev, &fec->miibus, fec->phy_addr,
> +				 fec_update_linkspeed, fec->phy_flags,
> +				 fec->interface);
> +	if (ret)
> +		return ret;
>  
> -		if (fec->phy_init)
> -			fec->phy_init(edev->phydev);
> -	}
> +	if (fec->phy_init)
> +		fec->phy_init(edev->phydev);
>  
>  	/*
>  	 * Initialize RxBD/TxBD rings
> @@ -699,31 +696,27 @@ static int fec_probe(struct device_d *dev)
>  
>  	fec_init(edev);
>  
> -	if (fec->xcv_type != SEVENWIRE) {
> -		fec->miibus.read = fec_miibus_read;
> -		fec->miibus.write = fec_miibus_write;
> -		switch (fec->xcv_type) {
> -		case RMII:
> -			fec->interface = PHY_INTERFACE_MODE_RMII;
> -			break;
> -		case RGMII:
> -			fec->interface = PHY_INTERFACE_MODE_RGMII;
> -			break;
> -		case MII10:
> -			fec->phy_flags = PHYLIB_FORCE_10;
> -		case MII100:
> -			fec->interface = PHY_INTERFACE_MODE_MII;
> -			break;
> -		case SEVENWIRE:
> -			fec->interface = PHY_INTERFACE_MODE_NA;
> -			break;
> -		}
> -		fec->miibus.priv = fec;
> -		fec->miibus.parent = dev;
> -
> -		mdiobus_register(&fec->miibus);
> +	fec->miibus.read = fec_miibus_read;
> +	fec->miibus.write = fec_miibus_write;
> +	switch (fec->xcv_type) {
> +	case RMII:
> +		fec->interface = PHY_INTERFACE_MODE_RMII;
> +		break;
> +	case RGMII:
> +		fec->interface = PHY_INTERFACE_MODE_RGMII;
> +		break;
> +	case MII10:
> +		fec->phy_flags = PHYLIB_FORCE_10;
> +	case MII100:
> +		fec->interface = PHY_INTERFACE_MODE_MII;
> +		break;
>  	}
>  
> +	fec->miibus.priv = fec;
> +	fec->miibus.parent = dev;
> +
> +	mdiobus_register(&fec->miibus);
> +
>  	eth_register(edev);
>  	return 0;
>  
> diff --git a/drivers/net/fec_mpc5200.c b/drivers/net/fec_mpc5200.c
> index 9ef5350..bdb4e8b 100644
> --- a/drivers/net/fec_mpc5200.c
> +++ b/drivers/net/fec_mpc5200.c
> @@ -294,25 +294,17 @@ static int mpc5xxx_fec_init(struct eth_device *dev)
>  	/*
>  	 * Set FEC-Lite receive control register(R_CNTRL):
>  	 */
> -	if (fec->xcv_type == SEVENWIRE) {
> -		/*
> -		 * Frame length=1518; 7-wire mode
> -		 */
> -		fec->eth->r_cntrl = 0x05ee0020;	/*0x05ee0000;FIXME */
> -	} else {
> -		/*
> -		 * Frame length=1518; MII mode;
> -		 */
> -		fec->eth->r_cntrl = 0x05ee0024;	/*0x05ee0004;FIXME */
> -	}
>  
> -	if (fec->xcv_type != SEVENWIRE) {
> -		/*
> -		 * Set MII_SPEED = (1/(mii_speed * 2)) * System Clock
> -		 * and do not drop the Preamble.
> -		 */
> -		fec->eth->mii_speed = (((get_ipb_clock() >> 20) / 5) << 1);	/* No MII for 7-wire mode */
> -	}
> +	/*
> +	 * Frame length=1518; MII mode;
> +	 */
> +	fec->eth->r_cntrl = 0x05ee0024;	/*0x05ee0004;FIXME */
> +
> +	/*
> +	 * Set MII_SPEED = (1/(mii_speed * 2)) * System Clock
> +	 * and do not drop the Preamble.
> +	 */
> +	fec->eth->mii_speed = (((get_ipb_clock() >> 20) / 5) << 1);	/* No MII for 7-wire mode */
>  
>  	/*
>  	 * Set Opcode/Pause Duration Register
> @@ -406,10 +398,8 @@ static int mpc5xxx_fec_open(struct eth_device *edev)
>  	 */
>  	SDMA_TASK_ENABLE(FEC_RECV_TASK_NO);
>  
> -	if (fec->xcv_type != SEVENWIRE) {
> -		return phy_device_connect(edev, &fec->miibus, CONFIG_PHY_ADDR,
> -				 NULL, fec->phy_flags, fec->interface);
> -	}
> +	return phy_device_connect(edev, &fec->miibus, CONFIG_PHY_ADDR,
> +			 NULL, fec->phy_flags, fec->interface);
>  
>  	return 0;

This return will never use in this function.

Alex

>  }
> @@ -511,6 +501,7 @@ static int mpc5xxx_fec_send(struct eth_device *dev, void *eth_data,
>  	 */
>  	mpc5xxx_fec_priv *fec = (mpc5xxx_fec_priv *)dev->priv;
>  	volatile FEC_TBD *pTbd;
> +	uint16_t phyStatus;
>  
>  #ifdef DEBUG_FIFO
>  	debug_fifo("tbd status: 0x%04x\n", fec->tbdBase[0].status);
> @@ -548,10 +539,7 @@ static int mpc5xxx_fec_send(struct eth_device *dev, void *eth_data,
>  	/*
>  	 * Kick the MII i/f
>  	 */
> -	if (fec->xcv_type != SEVENWIRE) {
> -		uint16_t phyStatus;
> -		phyStatus = fec5xxx_miibus_read(&fec->miibus, 0, 0x1);
> -	}
> +	phyStatus = fec5xxx_miibus_read(&fec->miibus, 0, 0x1);
>  
>  	/*
>  	 * Enable SmartDMA transmit task
> @@ -676,31 +664,27 @@ int mpc5xxx_fec_probe(struct device_d *dev)
>  
>  	loadtask(0, 2);
>  
> -	if (fec->xcv_type != SEVENWIRE) {
> -		fec->miibus.read = fec5xxx_miibus_read;
> -		fec->miibus.write = fec5xxx_miibus_write;
> -		switch (pdata->xcv_type) {
> -		case RMII:
> -			fec->interface = PHY_INTERFACE_MODE_RMII;
> -			break;
> -		case RGMII:
> -			fec->interface = PHY_INTERFACE_MODE_RGMII;
> -			break;
> -		case MII10:
> -			fec->phy_flags = PHYLIB_FORCE_10;
> -		case MII100:
> -			fec->interface = PHY_INTERFACE_MODE_MII;
> -			break;
> -		case SEVENWIRE:
> -			fec->interface = PHY_INTERFACE_MODE_NA;
> -			break;
> -		}
> -		fec->miibus.priv = fec;
> -		fec->miibus.parent = dev;
> -
> -		mdiobus_register(&fec->miibus);
> +	fec->miibus.read = fec5xxx_miibus_read;
> +	fec->miibus.write = fec5xxx_miibus_write;
> +	switch (pdata->xcv_type) {
> +	case RMII:
> +		fec->interface = PHY_INTERFACE_MODE_RMII;
> +		break;
> +	case RGMII:
> +		fec->interface = PHY_INTERFACE_MODE_RGMII;
> +		break;
> +	case MII10:
> +		fec->phy_flags = PHYLIB_FORCE_10;
> +	case MII100:
> +		fec->interface = PHY_INTERFACE_MODE_MII;
> +		break;
>  	}
>  
> +	fec->miibus.priv = fec;
> +	fec->miibus.parent = dev;
> +
> +	mdiobus_register(&fec->miibus);
> +
>  	eth_register(edev);
>  	return 0;
>  }
> diff --git a/include/fec.h b/include/fec.h
> index 94cb6ed..80904dc 100644
> --- a/include/fec.h
> +++ b/include/fec.h
> @@ -27,7 +27,6 @@
>   * Supported phy types on this platform
>   */
>  typedef enum {
> -	SEVENWIRE,
>  	MII10,
>  	MII100,
>  	RMII,
> -- 
> 1.8.2.rc2
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] net: fec: drop sevenwire support
  2013-03-09 16:56   ` Alexander Aring
@ 2013-03-09 19:10     ` Sascha Hauer
  0 siblings, 0 replies; 7+ messages in thread
From: Sascha Hauer @ 2013-03-09 19:10 UTC (permalink / raw)
  To: Alexander Aring; +Cc: barebox

On Sat, Mar 09, 2013 at 05:56:26PM +0100, Alexander Aring wrote:
> Hi Sascha,
> 
> some nitpick...
> > +	return phy_device_connect(edev, &fec->miibus, CONFIG_PHY_ADDR,
> > +			 NULL, fec->phy_flags, fec->interface);
> >  
> >  	return 0;
> 
> This return will never use in this function.
> 

Fixed, thanks

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] net: fec: Use standard phy type defines
  2013-03-09 11:03 [PATCH] net: fec: Use standard phy type defines Sascha Hauer
  2013-03-09 11:03 ` [PATCH 1/2] net: fec: drop sevenwire support Sascha Hauer
  2013-03-09 11:03 ` [PATCH 2/2] net: fec: use standard phy type defines Sascha Hauer
@ 2013-03-10 13:17 ` Jean-Christophe PLAGNIOL-VILLARD
  2013-03-11  7:53   ` Sascha Hauer
  2 siblings, 1 reply; 7+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-03-10 13:17 UTC (permalink / raw)
  To: Sascha Hauer; +Cc: barebox

On 12:03 Sat 09 Mar     , Sascha Hauer wrote:
> I've never seen a board using sevenwire, so remove this from
> the fec driver. Also, since we now have standard phy type
> defines in include/linux/phy.h, use them in the fec platform_data
> instead of a fec specific enum.

drop the phy_init too

we have register_fixup for this now
> 
> Sascha
> 
> ----------------------------------------------------------------
> Sascha Hauer (2):
>       net: fec: drop sevenwire support
>       net: fec: use standard phy type defines
> 
>  arch/arm/boards/ccxmx51/ccxmx51.c                 |  2 +-
>  arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c |  2 +-
>  arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c |  2 +-
>  arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c |  2 +-
>  arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c |  2 +-
>  arch/arm/boards/freescale-mx25-3-stack/3stack.c   |  2 +-
>  arch/arm/boards/freescale-mx28-evk/mx28-evk.c     |  2 +-
>  arch/arm/boards/freescale-mx35-3-stack/3stack.c   |  2 +-
>  arch/arm/boards/freescale-mx51-pdk/board.c        |  2 +-
>  arch/arm/boards/freescale-mx53-loco/board.c       |  2 +-
>  arch/arm/boards/freescale-mx53-smd/board.c        |  2 +-
>  arch/arm/boards/freescale-mx6-arm2/board.c        |  2 +-
>  arch/arm/boards/freescale-mx6-sabrelite/board.c   |  2 +-
>  arch/arm/boards/freescale-mx6-sabresd/board.c     |  2 +-
>  arch/arm/boards/guf-cupid/board.c                 |  2 +-
>  arch/arm/boards/guf-neso/board.c                  |  2 +-
>  arch/arm/boards/guf-vincell/board.c               |  2 +-
>  arch/arm/boards/imx27ads/imx27ads.c               |  2 +-
>  arch/arm/boards/karo-tx25/board.c                 |  2 +-
>  arch/arm/boards/karo-tx28/tx28-stk5.c             |  2 +-
>  arch/arm/boards/karo-tx51/tx51.c                  |  2 +-
>  arch/arm/boards/karo-tx53/board.c                 |  2 +-
>  arch/arm/boards/pcm038/pcm038.c                   |  2 +-
>  arch/arm/boards/pcm043/pcm043.c                   |  2 +-
>  arch/arm/boards/phycard-i.MX27/pca100.c           |  2 +-
>  arch/arm/boards/tqma53/board.c                    |  2 +-
>  arch/ppc/boards/pcm030/pcm030.c                   |  2 +-
>  drivers/net/fec_imx.c                             | 70 ++++++++--------------
>  drivers/net/fec_imx.h                             |  1 -
>  drivers/net/fec_mpc5200.c                         | 71 +++++++----------------
>  drivers/net/fec_mpc5200.h                         |  1 -
>  include/fec.h                                     | 13 +----
>  32 files changed, 74 insertions(+), 136 deletions(-)
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] net: fec: Use standard phy type defines
  2013-03-10 13:17 ` [PATCH] net: fec: Use " Jean-Christophe PLAGNIOL-VILLARD
@ 2013-03-11  7:53   ` Sascha Hauer
  0 siblings, 0 replies; 7+ messages in thread
From: Sascha Hauer @ 2013-03-11  7:53 UTC (permalink / raw)
  To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox

On Sun, Mar 10, 2013 at 02:17:57PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 12:03 Sat 09 Mar     , Sascha Hauer wrote:
> > I've never seen a board using sevenwire, so remove this from
> > the fec driver. Also, since we now have standard phy type
> > defines in include/linux/phy.h, use them in the fec platform_data
> > instead of a fec specific enum.
> 
> drop the phy_init too

Can do in a later patch.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-03-11  7:53 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-09 11:03 [PATCH] net: fec: Use standard phy type defines Sascha Hauer
2013-03-09 11:03 ` [PATCH 1/2] net: fec: drop sevenwire support Sascha Hauer
2013-03-09 16:56   ` Alexander Aring
2013-03-09 19:10     ` Sascha Hauer
2013-03-09 11:03 ` [PATCH 2/2] net: fec: use standard phy type defines Sascha Hauer
2013-03-10 13:17 ` [PATCH] net: fec: Use " Jean-Christophe PLAGNIOL-VILLARD
2013-03-11  7:53   ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox