ENGR00119899 Add FEC iomux config and PHY reset.

FEC driver of 2.6.31 kernel remove pin iomux config and PHY reset,
which is in fec_gpio_active() needed for i.MX25 and i.MX35.

Signed-off-by: Li Jun <r65092@freescale.com>

1 files changed, 36 insertions, 1 deletions

diff --git a/arch/arm/mach-mx35/mx35_3stack.c b/arch/arm/mach-mx35/mx35_3stack.c
index 1f766d0d0a7a..9b4efdbb70d0 100644
--- a/arch/arm/mach-mx35/mx35_3stack.c
+++ b/arch/arm/mach-mx35/mx35_3stack.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
  */
 
 /*
@@ -516,6 +516,10 @@ static inline void mxc_init_enet(void)
 #endif
 
 #if defined(CONFIG_FEC) || defined(CONFIG_FEC_MODULE)
+extern void gpio_fec_active(void);
+extern void gpio_fec_inactive(void);
+static int fec_enable(void);
+static int fec_disable(void);
 static struct resource mxc_fec_resources[] = {
 	{
 		.start	= MXC_FEC_BASE_ADDR,
@@ -528,13 +532,44 @@ static struct resource mxc_fec_resources[] = {
 	},
 };
 
+static struct fec_platform_data mxc_fec_data = {
+	.init = fec_enable,
+	.uninit = fec_disable,
+};
+
 struct platform_device mxc_fec_device = {
 	.name = "fec",
 	.id = 0,
+	.dev = {
+		.release = mxc_nop_release,
+		.platform_data = &mxc_fec_data,
+	},
 	.num_resources = ARRAY_SIZE(mxc_fec_resources),
 	.resource = mxc_fec_resources,
 };
 
+static int fec_enable(void)
+{
+	mxc_fec_data.vddio_reg = regulator_get(&mxc_fec_device.dev, "VGEN1");
+
+	if (IS_ERR(mxc_fec_data.vddio_reg))
+		return -EINVAL;
+	regulator_enable(mxc_fec_data.vddio_reg);
+	gpio_fec_active();
+	return 0;
+}
+
+static int fec_disable(void)
+{
+	if (IS_ERR(mxc_fec_data.vddio_reg))
+		return -EINVAL;
+
+	gpio_fec_inactive();
+	regulator_disable(mxc_fec_data.vddio_reg);
+	regulator_put(mxc_fec_data.vddio_reg);
+	return 0;
+}
+
 static __init int mxc_init_fec(void)
 {
 	return platform_device_register(&mxc_fec_device);