From 26eab97b41da45353300d447870fe1c7fbfe7542 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Sun, 23 Sep 2012 20:34:55 +0200
Subject: [PATCH] net fec_mpc5200: Use same platform_data as i.MX fec driver

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/ppc/boards/pcm030/pcm030.c          |  5 ++---
 arch/ppc/mach-mpc5xxx/include/mach/fec.h | 14 --------------
 drivers/net/fec_mpc5200.c                |  4 ++--
 3 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 arch/ppc/mach-mpc5xxx/include/mach/fec.h

diff --git a/arch/ppc/boards/pcm030/pcm030.c b/arch/ppc/boards/pcm030/pcm030.c
index ba6aa4318..89083e91d 100644
--- a/arch/ppc/boards/pcm030/pcm030.c
+++ b/arch/ppc/boards/pcm030/pcm030.c
@@ -30,8 +30,7 @@
 #include <common.h>
 #include <driver.h>
 #include <init.h>
-#include <mach/mpc5xxx.h>
-#include <mach/fec.h>
+#include <fec.h>
 #include <types.h>
 #include <partition.h>
 #include <memory.h>
@@ -39,7 +38,7 @@
 #include <linux/stat.h>
 #include <fs.h>
 
-static struct mpc5xxx_fec_platform_data fec_info = {
+static struct fec_platform_data fec_info = {
 	.xcv_type = MII100,
 };
 
diff --git a/arch/ppc/mach-mpc5xxx/include/mach/fec.h b/arch/ppc/mach-mpc5xxx/include/mach/fec.h
deleted file mode 100644
index a3e04b4e9..000000000
--- a/arch/ppc/mach-mpc5xxx/include/mach/fec.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __INCLUDE_ASM_ARCH_FEC_H
-#define __INCLUDE_ASM_ARCH_FEC_H
-
-struct mpc5xxx_fec_platform_data {
-        ulong  xcv_type;
-};
-
-typedef enum {
-	SEVENWIRE,			/* 7-wire       */
-	MII10,				/* MII 10Mbps   */
-	MII100				/* MII 100Mbps  */
-} xceiver_type;
-
-#endif /* __INCLUDE_ASM_ARCH_FEC_H */
diff --git a/drivers/net/fec_mpc5200.c b/drivers/net/fec_mpc5200.c
index c3f2099b0..6c2da3eba 100644
--- a/drivers/net/fec_mpc5200.c
+++ b/drivers/net/fec_mpc5200.c
@@ -10,11 +10,11 @@
 #include <mach/mpc5xxx.h>
 #include <malloc.h>
 #include <net.h>
+#include <fec.h>
 #include <init.h>
 #include <miidev.h>
 #include <driver.h>
 #include <mach/sdma.h>
-#include <mach/fec.h>
 #include <mach/clocks.h>
 #include <miidev.h>
 #include "fec_mpc5200.h"
@@ -657,7 +657,7 @@ static int mpc5xxx_fec_recv(struct eth_device *dev)
 
 int mpc5xxx_fec_probe(struct device_d *dev)
 {
-	struct mpc5xxx_fec_platform_data *pdata = (struct mpc5xxx_fec_platform_data *)dev->platform_data;
+	struct fec_platform_data *pdata = dev->platform_data;
 	struct eth_device *edev;
 	mpc5xxx_fec_priv *fec;