diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-07-14 22:13:23 -0700 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-11 16:29:28 -0700 |
commit | b47da97728c045a8fd75f36e59ba08cddc8f2292 (patch) | |
tree | 71aa03f391344e9dcec4bee239f6d5c67a0fa361 /drivers/net | |
parent | d9fb9f384292d848ad9db386bcf97f1e06e60264 (diff) | |
download | op-kernel-dev-b47da97728c045a8fd75f36e59ba08cddc8f2292.zip op-kernel-dev-b47da97728c045a8fd75f36e59ba08cddc8f2292.tar.gz |
xscale: Move the Intel XScale IXP drivers
Move the Intel XScale IXP drivers into drivers/net/ethernet/xscale/
and make the necessary Kconfig and Makefile changes.
CC: Krzysztof Halasa <khc@pm.waw.pl>
CC: Lennert Buytenhek <kernel@wantstofly.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/Kconfig | 2 | ||||
-rw-r--r-- | drivers/net/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/arm/Kconfig | 8 | ||||
-rw-r--r-- | drivers/net/arm/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/Kconfig | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/xscale/Kconfig | 31 | ||||
-rw-r--r-- | drivers/net/ethernet/xscale/Makefile | 6 | ||||
-rw-r--r-- | drivers/net/ethernet/xscale/ixp2000/Kconfig (renamed from drivers/net/ixp2000/Kconfig) | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/xscale/ixp2000/Makefile (renamed from drivers/net/ixp2000/Makefile) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/xscale/ixp2000/caleb.c (renamed from drivers/net/ixp2000/caleb.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/xscale/ixp2000/caleb.h (renamed from drivers/net/ixp2000/caleb.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/xscale/ixp2000/enp2611.c (renamed from drivers/net/ixp2000/enp2611.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/xscale/ixp2000/ixp2400-msf.c (renamed from drivers/net/ixp2000/ixp2400-msf.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/xscale/ixp2000/ixp2400-msf.h (renamed from drivers/net/ixp2000/ixp2400-msf.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/xscale/ixp2000/ixp2400_rx.uc (renamed from drivers/net/ixp2000/ixp2400_rx.uc) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/xscale/ixp2000/ixp2400_rx.ucode (renamed from drivers/net/ixp2000/ixp2400_rx.ucode) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/xscale/ixp2000/ixp2400_tx.uc (renamed from drivers/net/ixp2000/ixp2400_tx.uc) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/xscale/ixp2000/ixp2400_tx.ucode (renamed from drivers/net/ixp2000/ixp2400_tx.ucode) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/xscale/ixp2000/ixpdev.c (renamed from drivers/net/ixp2000/ixpdev.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/xscale/ixp2000/ixpdev.h (renamed from drivers/net/ixp2000/ixpdev.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/xscale/ixp2000/ixpdev_priv.h (renamed from drivers/net/ixp2000/ixpdev_priv.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/xscale/ixp2000/pm3386.c (renamed from drivers/net/ixp2000/pm3386.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/xscale/ixp2000/pm3386.h (renamed from drivers/net/ixp2000/pm3386.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/xscale/ixp4xx_eth.c (renamed from drivers/net/arm/ixp4xx_eth.c) | 0 |
25 files changed, 40 insertions, 13 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 8b1fae8..7f09cd5 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -989,8 +989,6 @@ config IP1000 To compile this driver as a module, choose M here: the module will be called ipg. This is recommended. -source "drivers/net/ixp2000/Kconfig" - config HAMACHI tristate "Packet Engines Hamachi GNIC-II support" depends on PCI diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 843edb3..ffcb609 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -166,7 +166,6 @@ obj-$(CONFIG_NET_TULIP) += tulip/ obj-$(CONFIG_HAMRADIO) += hamradio/ obj-$(CONFIG_IRDA) += irda/ obj-$(CONFIG_ETRAX_ETHERNET) += cris/ -obj-$(CONFIG_ENP2611_MSF_NET) += ixp2000/ obj-$(CONFIG_NETCONSOLE) += netconsole.o diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig index 7848b5f..4320e88 100644 --- a/drivers/net/arm/Kconfig +++ b/drivers/net/arm/Kconfig @@ -34,14 +34,6 @@ config EP93XX_ETH This is a driver for the ethernet hardware included in EP93xx CPUs. Say Y if you are building a kernel for EP93xx based devices. -config IXP4XX_ETH - tristate "Intel IXP4xx Ethernet support" - depends on ARM && ARCH_IXP4XX && IXP4XX_NPE && IXP4XX_QMGR - select PHYLIB - help - Say Y here if you want to use built-in Ethernet ports - on IXP4xx processor. - config W90P910_ETH tristate "Nuvoton w90p910 Ethernet support" depends on ARM && ARCH_W90X900 diff --git a/drivers/net/arm/Makefile b/drivers/net/arm/Makefile index 6cca728b..5a0f141 100644 --- a/drivers/net/arm/Makefile +++ b/drivers/net/arm/Makefile @@ -7,5 +7,4 @@ obj-$(CONFIG_ARM_ETHER3) += ether3.o obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o obj-$(CONFIG_ARM_KS8695_ETHER) += ks8695net.o obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o -obj-$(CONFIG_IXP4XX_ETH) += ixp4xx_eth.o obj-$(CONFIG_W90P910_ETH) += w90p910_ether.o diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index efc3665..45d3eff 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -23,6 +23,7 @@ source "drivers/net/ethernet/neterion/Kconfig" source "drivers/net/ethernet/ibm/Kconfig" source "drivers/net/ethernet/intel/Kconfig" source "drivers/net/ethernet/i825xx/Kconfig" +source "drivers/net/ethernet/xscale/Kconfig" source "drivers/net/ethernet/mellanox/Kconfig" source "drivers/net/ethernet/myricom/Kconfig" source "drivers/net/ethernet/natsemi/Kconfig" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 668ca92..09536de 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -15,6 +15,7 @@ obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/ obj-$(CONFIG_NET_VENDOR_IBM) += ibm/ obj-$(CONFIG_NET_VENDOR_INTEL) += intel/ obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/ +obj-$(CONFIG_NET_VENDOR_XSCALE) += xscale/ obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/ obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/ obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/ diff --git a/drivers/net/ethernet/xscale/Kconfig b/drivers/net/ethernet/xscale/Kconfig new file mode 100644 index 0000000..6bbcc54 --- /dev/null +++ b/drivers/net/ethernet/xscale/Kconfig @@ -0,0 +1,31 @@ +# +# Intel XScale IXP device configuration +# + +config NET_VENDOR_XSCALE + bool "Intel XScale IXP devices" + depends on NET_VENDOR_INTEL && ((ARM && ARCH_IXP4XX && \ + IXP4XX_NPE && IXP4XX_QMGR) || ARCH_ENP2611) + ---help--- + If you have a network (Ethernet) card belonging to this class, say Y + and read the Ethernet-HOWTO, available from + <http://www.tldp.org/docs.html#howto>. + + Note that the answer to this question does not directly affect the + kernel: saying N will just cause the configurator to skip all + the questions about XSacle IXP devices. If you say Y, you will be + asked for your specific card in the following questions. + +if NET_VENDOR_XSCALE + +config IXP4XX_ETH + tristate "Intel IXP4xx Ethernet support" + depends on ARM && ARCH_IXP4XX && IXP4XX_NPE && IXP4XX_QMGR + select PHYLIB + ---help--- + Say Y here if you want to use built-in Ethernet ports + on IXP4xx processor. + +source "drivers/net/ethernet/xscale/ixp2000/Kconfig" + +endif # NET_VENDOR_XSCALE diff --git a/drivers/net/ethernet/xscale/Makefile b/drivers/net/ethernet/xscale/Makefile new file mode 100644 index 0000000..b195b9d --- /dev/null +++ b/drivers/net/ethernet/xscale/Makefile @@ -0,0 +1,6 @@ +# +# Makefile for the Intel XScale IXP device drivers. +# + +obj-$(CONFIG_ENP2611_MSF_NET) += ixp2000/ +obj-$(CONFIG_IXP4XX_ETH) += ixp4xx_eth.o diff --git a/drivers/net/ixp2000/Kconfig b/drivers/net/ethernet/xscale/ixp2000/Kconfig index 2fec241..58dbc5b 100644 --- a/drivers/net/ixp2000/Kconfig +++ b/drivers/net/ethernet/xscale/ixp2000/Kconfig @@ -1,6 +1,6 @@ config ENP2611_MSF_NET tristate "Radisys ENP2611 MSF network interface support" depends on ARCH_ENP2611 - help + ---help--- This is a driver for the MSF network interface unit in the IXP2400 on the Radisys ENP2611 platform. diff --git a/drivers/net/ixp2000/Makefile b/drivers/net/ethernet/xscale/ixp2000/Makefile index fd38351..fd38351 100644 --- a/drivers/net/ixp2000/Makefile +++ b/drivers/net/ethernet/xscale/ixp2000/Makefile diff --git a/drivers/net/ixp2000/caleb.c b/drivers/net/ethernet/xscale/ixp2000/caleb.c index 7dea5b9..7dea5b9 100644 --- a/drivers/net/ixp2000/caleb.c +++ b/drivers/net/ethernet/xscale/ixp2000/caleb.c diff --git a/drivers/net/ixp2000/caleb.h b/drivers/net/ethernet/xscale/ixp2000/caleb.h index e93a1ef..e93a1ef 100644 --- a/drivers/net/ixp2000/caleb.h +++ b/drivers/net/ethernet/xscale/ixp2000/caleb.h diff --git a/drivers/net/ixp2000/enp2611.c b/drivers/net/ethernet/xscale/ixp2000/enp2611.c index 34a6cfd..34a6cfd 100644 --- a/drivers/net/ixp2000/enp2611.c +++ b/drivers/net/ethernet/xscale/ixp2000/enp2611.c diff --git a/drivers/net/ixp2000/ixp2400-msf.c b/drivers/net/ethernet/xscale/ixp2000/ixp2400-msf.c index f5ffd7e..f5ffd7e 100644 --- a/drivers/net/ixp2000/ixp2400-msf.c +++ b/drivers/net/ethernet/xscale/ixp2000/ixp2400-msf.c diff --git a/drivers/net/ixp2000/ixp2400-msf.h b/drivers/net/ethernet/xscale/ixp2000/ixp2400-msf.h index 3ac1af2..3ac1af2 100644 --- a/drivers/net/ixp2000/ixp2400-msf.h +++ b/drivers/net/ethernet/xscale/ixp2000/ixp2400-msf.h diff --git a/drivers/net/ixp2000/ixp2400_rx.uc b/drivers/net/ethernet/xscale/ixp2000/ixp2400_rx.uc index 42a73e35..42a73e35 100644 --- a/drivers/net/ixp2000/ixp2400_rx.uc +++ b/drivers/net/ethernet/xscale/ixp2000/ixp2400_rx.uc diff --git a/drivers/net/ixp2000/ixp2400_rx.ucode b/drivers/net/ethernet/xscale/ixp2000/ixp2400_rx.ucode index e8aee2f..e8aee2f 100644 --- a/drivers/net/ixp2000/ixp2400_rx.ucode +++ b/drivers/net/ethernet/xscale/ixp2000/ixp2400_rx.ucode diff --git a/drivers/net/ixp2000/ixp2400_tx.uc b/drivers/net/ethernet/xscale/ixp2000/ixp2400_tx.uc index d090d18..d090d18 100644 --- a/drivers/net/ixp2000/ixp2400_tx.uc +++ b/drivers/net/ethernet/xscale/ixp2000/ixp2400_tx.uc diff --git a/drivers/net/ixp2000/ixp2400_tx.ucode b/drivers/net/ethernet/xscale/ixp2000/ixp2400_tx.ucode index a433e24..a433e24 100644 --- a/drivers/net/ixp2000/ixp2400_tx.ucode +++ b/drivers/net/ethernet/xscale/ixp2000/ixp2400_tx.ucode diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ethernet/xscale/ixp2000/ixpdev.c index e122493..e122493 100644 --- a/drivers/net/ixp2000/ixpdev.c +++ b/drivers/net/ethernet/xscale/ixp2000/ixpdev.c diff --git a/drivers/net/ixp2000/ixpdev.h b/drivers/net/ethernet/xscale/ixp2000/ixpdev.h index 391ece6..391ece6 100644 --- a/drivers/net/ixp2000/ixpdev.h +++ b/drivers/net/ethernet/xscale/ixp2000/ixpdev.h diff --git a/drivers/net/ixp2000/ixpdev_priv.h b/drivers/net/ethernet/xscale/ixp2000/ixpdev_priv.h index 86aa08e..86aa08e 100644 --- a/drivers/net/ixp2000/ixpdev_priv.h +++ b/drivers/net/ethernet/xscale/ixp2000/ixpdev_priv.h diff --git a/drivers/net/ixp2000/pm3386.c b/drivers/net/ethernet/xscale/ixp2000/pm3386.c index e08d3f9..e08d3f9 100644 --- a/drivers/net/ixp2000/pm3386.c +++ b/drivers/net/ethernet/xscale/ixp2000/pm3386.c diff --git a/drivers/net/ixp2000/pm3386.h b/drivers/net/ethernet/xscale/ixp2000/pm3386.h index cc4183d..cc4183d 100644 --- a/drivers/net/ixp2000/pm3386.h +++ b/drivers/net/ethernet/xscale/ixp2000/pm3386.h diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c index de51e84..de51e84 100644 --- a/drivers/net/arm/ixp4xx_eth.c +++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c |