Skip to contentSkip to conversation

Update fec_8xx to new platform device model

PATCH In review Pantelis Antoniou 2 participants 2 messages Apr 7, 2005 – Apr 8, 2005 Network drivers

lore
Share & tools
lore

Pantelis Antoniou

author
#0 lore raw

PATCH 1/1 Update fec_8xx to new platform device model

Hi all

The following patch updates the in-tree fec_8xx driver to use the new platform device model.

Regards

Pantelis

drivers/net/Makefile +3 -0
diff -Nur --exclude=RCS --exclude=CVS --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet linux-2.5/drivers/net/Makefile linux-2.5-intracom/drivers/net/Makefile
@@ -194,3 +194,6 @@
 obj-$(CONFIG_ETRAX_ETHERNET) += cris/
 
 obj-$(CONFIG_NETCONSOLE) += netconsole.o
+
+obj-$(CONFIG_FEC_8XX) += fec_8xx/ mii.o
+
drivers/net/fec_8xx/Kconfig +1 -1
diff -Nur --exclude=RCS --exclude=CVS --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet linux-2.5/drivers/net/fec_8xx/Kconfig linux-2.5-intracom/drivers/net/fec_8xx/Kconfig
@@ -1,6 +1,6 @@
 config FEC_8XX
 	tristate "Motorola 8xx FEC driver"
-	depends on NET_ETHERNET && 8xx && (NETTA || NETPHONE)
+	depends on NET_ETHERNET && 8xx
 	select MII
 
 config FEC_8XX_GENERIC_PHY
drivers/net/fec_8xx/Makefile +0 -5
diff -Nur --exclude=RCS --exclude=CVS --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet linux-2.5/drivers/net/fec_8xx/Makefile linux-2.5-intracom/drivers/net/fec_8xx/Makefile
@@ -5,8 +5,3 @@
 obj-$(CONFIG_FEC_8XX) += fec_8xx.o
 
 fec_8xx-objs := fec_main.o fec_mii.o
-
-# the platform instantatiation objects
-ifeq ($(CONFIG_NETTA),y)
-fec_8xx-objs	+= fec_8xx-netta.o
-endif
drivers/net/fec_8xx/fec_8xx-netta.c +0 -153

153 lines not on this page · raw message

drivers/net/fec_8xx/fec_8xx.h +1 -16
diff -Nur --exclude=RCS --exclude=CVS --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet linux-2.5/drivers/net/fec_8xx/fec_8xx.h linux-2.5-intracom/drivers/net/fec_8xx/fec_8xx.h
@@ -3,8 +3,8 @@
 
 #include <linux/mii.h>
 #include <linux/netdevice.h>
-
 #include <linux/types.h>
+#include <linux/fec_8xx_pd.h>
 
 /* HW info */
 

@@ -83,21 +83,6 @@
 #define PKT_MAXBLR_SIZE		((PKT_MAXBUF_SIZE+3) & ~3)
 /* This is needed so that invalidate_xxx wont invalidate too much */
 #define ENET_RX_FRSIZE		L1_CACHE_ALIGN(PKT_MAXBUF_SIZE)
-
-/* platform interface */
-
-struct fec_platform_info {
-	int fec_no;		/* FEC index                  */
-	int use_mdio;		/* use external MII           */
-	int phy_addr;		/* the phy address            */
-	int fec_irq, phy_irq;	/* the irq for the controller */
-	int rx_ring, tx_ring;	/* number of buffers on rx    */
-	int sys_clk;		/* system clock               */
-	__u8 macaddr[6];	/* mac address                */
-	int rx_copybreak;	/* limit we copy small frames */
-	int use_napi;		/* use NAPI                   */
-	int napi_weight;	/* NAPI weight                */
-};
 
 /* forward declaration */
 struct fec;
drivers/net/fec_8xx/fec_main.c +104 -50

290 lines not on this page · raw message

include/linux/fec_8xx_pd.h +22 -0
diff -Nur --exclude=RCS --exclude=CVS --exclude=SCCS --exclude=BitKeeper --exclude=ChangeSet linux-2.5/include/linux/fec_8xx_pd.h linux-2.5-intracom/include/linux/fec_8xx_pd.h
@@ -0,0 +1,22 @@
+#ifndef FEC_8XX_PD_H
+#define FEC_8XX_PD_H
+
+#include <asm/types.h>
+
+#define MPC8XX_FEC_NAME	"FEC"
+
+/* XXX */
+struct fec_platform_info {
+	int fec_no;		/* FEC index                  */
+	int use_mdio;		/* use external MII           */
+	int phy_addr;		/* the phy address            */
+	int fec_irq, phy_irq;	/* the irq for the controller */
+	int rx_ring, tx_ring;	/* number of buffers on rx    */
+	int sys_clk;		/* system clock               */
+	__u8 macaddr[6];	/* mac address                */
+	int rx_copybreak;	/* limit we copy small frames */
+	int use_napi;		/* use NAPI                   */
+	int napi_weight;	/* NAPI weight                */
+};
+
+#endif
Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · Pantelis Antoniou

Hi all

The following patch updates the in-tree fec_8xx driver to use the new platform device model.

Acked-by Tom Rini <[email protected]>
Signature · 2 lines
Tom Rini
http://gate.crashing.org/~trini/