leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cassini/niu/sun*: Move the Sun drivers

Browse Source 
Moves the Sun drivers into drivers/net/ethernet/sun/ and make
the necessary Kconfig and Makefile changes.

Oliver Hartkopp <socketcan@hartkopp.net> suggested removing the
sun* prefix on the driver names.  This type of change I will
leave up to the driver maintainers.

CC: Sam Creasey <sammy@sammy.net>
CC: Adrian Sun <asun@darksunrising.com>
CC: Benjamin Herrenscmidt <benh@kernel.crashing.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Jeff Kirsher 2011-05-12 23:04:46 -07:00
parent 8efc91254f
commit e689cf4a04
24 changed files with 102 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -6272,6 +6272,7 @@ S: Maintained
F: arch/m68k/kernel/*sun3*
F: arch/m68k/sun3*/
F: arch/m68k/include/asm/sun3*
F: drivers/net/ethernet/i825xx/sun3*
SUPERH
M: Paul Mundt <lethal@linux-sh.org>

66
drivers/net/Kconfig
View File

@ -363,64 +363,6 @@ config SH_ETH
This driver supporting CPUs are:
- SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757.
config HAPPYMEAL
tristate "Sun Happy Meal 10/100baseT support"
depends on SBUS || PCI
select CRC32
help
This driver supports the "hme" interface present on most Ultra
systems and as an option on older Sbus systems. This driver supports
both PCI and Sbus devices. This driver also supports the "qfe" quad
100baseT device available in both PCI and Sbus configurations.
To compile this driver as a module, choose M here: the module
will be called sunhme.
config SUNBMAC
tristate "Sun BigMAC 10/100baseT support (EXPERIMENTAL)"
depends on SBUS && EXPERIMENTAL
select CRC32
help
This driver supports the "be" interface available as an Sbus option.
This is Sun's older 100baseT Ethernet device.
To compile this driver as a module, choose M here: the module
will be called sunbmac.
config SUNQE
tristate "Sun QuadEthernet support"
depends on SBUS
select CRC32
help
This driver supports the "qe" 10baseT Ethernet device, available as
an Sbus option. Note that this is not the same as Quad FastEthernet
"qfe" which is supported by the Happy Meal driver instead.
To compile this driver as a module, choose M here: the module
will be called sunqe.
config SUNGEM
tristate "Sun GEM support"
depends on PCI
select CRC32
help
Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0. See also
<http://www.sun.com/products-n-solutions/hardware/docs/pdf/806-3985-10.pdf>.
config CASSINI
tristate "Sun Cassini support"
depends on PCI
select CRC32
help
Support for the Sun Cassini chip, aka Sun GigaSwift Ethernet. See also
<http://www.sun.com/products-n-solutions/hardware/docs/pdf/817-4341-10.pdf>
config SUNVNET
tristate "Sun Virtual Network support"
depends on SUN_LDOMS
help
Support for virtual network devices under Sun Logical Domains.
config BFIN_MAC
tristate "Blackfin on-chip MAC support"
depends on NET_ETHERNET && (BF516 || BF518 || BF526 || BF527 || BF536 || BF537)
@ -1603,14 +1545,6 @@ config MYRI10GE_DCA
driver. DCA is a method for warming the CPU cache before data
is used, with the intent of lessening the impact of cache misses.
config NIU
tristate "Sun Neptune 10Gbit Ethernet support"
depends on PCI
select CRC32
help
This enables support for cards based upon Sun's
Neptune chipset.
config PASEMI_MAC
tristate "PA Semi 1/10Gbit MAC"
depends on PPC_PASEMI && PCI && INET

10
drivers/net/Makefile
View File

@ -44,13 +44,6 @@ obj-$(CONFIG_PLIP) += plip.o
obj-$(CONFIG_ROADRUNNER) += rrunner.o
obj-$(CONFIG_HAPPYMEAL) += sunhme.o
obj-$(CONFIG_SUNQE) += sunqe.o
obj-$(CONFIG_SUNBMAC) += sunbmac.o
obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o
obj-$(CONFIG_CASSINI) += cassini.o
obj-$(CONFIG_SUNVNET) += sunvnet.o
obj-$(CONFIG_MACE) += mace.o
obj-$(CONFIG_BMAC) += bmac.o
@ -64,7 +57,7 @@ obj-$(CONFIG_NATSEMI) += natsemi.o
obj-$(CONFIG_NS83820) += ns83820.o
obj-$(CONFIG_FEALNX) += fealnx.o
spidernet-y += spider_net.o spider_net_ethtool.o
obj-$(CONFIG_SPIDER_NET) += spidernet.o sungem_phy.o
obj-$(CONFIG_SPIDER_NET) += spidernet.o ethernet/sun/sungem_phy.o
obj-$(CONFIG_GELIC_NET) += ps3_gelic.o
gelic_wireless-$(CONFIG_GELIC_WIRELESS) += ps3_gelic_wireless.o
ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y)
@ -207,7 +200,6 @@ obj-$(CONFIG_NETCONSOLE) += netconsole.o
obj-$(CONFIG_FS_ENET) += fs_enet/
obj-$(CONFIG_NIU) += niu.o
obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
obj-$(CONFIG_SFC) += sfc/

1
drivers/net/ethernet/Kconfig
View File

@ -21,5 +21,6 @@ source "drivers/net/ethernet/i825xx/Kconfig"
source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/racal/Kconfig"
source "drivers/net/ethernet/smsc/Kconfig"
source "drivers/net/ethernet/sun/Kconfig"
endif # ETHERNET

1
drivers/net/ethernet/Makefile
View File

@ -12,3 +12,4 @@ obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
obj-$(CONFIG_NET_VENDOR_SUN) += sun/

86
drivers/net/ethernet/sun/Kconfig Normal file
View File

@ -0,0 +1,86 @@
#
# Sun network device configuration
#
config NET_VENDOR_SUN
bool "Sun devices"
depends on SUN3 || SBUS || PCI || SUN_LDOMS
---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 doesn't directly affect the
kernel: saying N will just cause the configurator to skip all
the questions about Sun network interfaces. If you say Y, you will be
asked for your specific card in the following questions.
if NET_VENDOR_SUN
config HAPPYMEAL
tristate "Sun Happy Meal 10/100baseT support"
depends on (SBUS || PCI)
select CRC32
---help---
This driver supports the "hme" interface present on most Ultra
systems and as an option on older Sbus systems. This driver supports
both PCI and Sbus devices. This driver also supports the "qfe" quad
100baseT device available in both PCI and Sbus configurations.
To compile this driver as a module, choose M here: the module
will be called sunhme.
config SUNBMAC
tristate "Sun BigMAC 10/100baseT support (EXPERIMENTAL)"
depends on SBUS && EXPERIMENTAL
select CRC32
---help---
This driver supports the "be" interface available as an Sbus option.
This is Sun's older 100baseT Ethernet device.
To compile this driver as a module, choose M here: the module
will be called sunbmac.
config SUNQE
tristate "Sun QuadEthernet support"
depends on SBUS
select CRC32
---help---
This driver supports the "qe" 10baseT Ethernet device, available as
an Sbus option. Note that this is not the same as Quad FastEthernet
"qfe" which is supported by the Happy Meal driver instead.
To compile this driver as a module, choose M here: the module
will be called sunqe.
config SUNGEM
tristate "Sun GEM support"
depends on PCI
select CRC32
---help---
Support for the Sun GEM chip, aka Sun GigabitEthernet/P 2.0. See also
<http://www.sun.com/products-n-solutions/hardware/docs/pdf/806-3985-10.pdf>.
config CASSINI
tristate "Sun Cassini support"
depends on PCI
select CRC32
---help---
Support for the Sun Cassini chip, aka Sun GigaSwift Ethernet. See also
<http://www.sun.com/products-n-solutions/hardware/docs/pdf/817-4341-10.pdf>
config SUNVNET
tristate "Sun Virtual Network support"
depends on SUN_LDOMS
---help---
Support for virtual network devices under Sun Logical Domains.
config NIU
tristate "Sun Neptune 10Gbit Ethernet support"
depends on PCI
select CRC32
---help---
This enables support for cards based upon Sun's
Neptune chipset.
endif # NET_VENDOR_SUN

11
drivers/net/ethernet/sun/Makefile Normal file
View File

@ -0,0 +1,11 @@
#
# Makefile for the Sun network device drivers.
#
obj-$(CONFIG_HAPPYMEAL) += sunhme.o
obj-$(CONFIG_SUNQE) += sunqe.o
obj-$(CONFIG_SUNBMAC) += sunbmac.o
obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o
obj-$(CONFIG_CASSINI) += cassini.o
obj-$(CONFIG_SUNVNET) += sunvnet.o
obj-$(CONFIG_NIU) += niu.o

0
drivers/net/cassini.c → drivers/net/ethernet/sun/cassini.c
View File

0
drivers/net/cassini.h → drivers/net/ethernet/sun/cassini.h
View File

0
drivers/net/niu.c → drivers/net/ethernet/sun/niu.c
View File

0
drivers/net/niu.h → drivers/net/ethernet/sun/niu.h
View File

0
drivers/net/sunbmac.c → drivers/net/ethernet/sun/sunbmac.c
View File

0
drivers/net/sunbmac.h → drivers/net/ethernet/sun/sunbmac.h
View File

0
drivers/net/sungem.c → drivers/net/ethernet/sun/sungem.c
View File

0
drivers/net/sungem.h → drivers/net/ethernet/sun/sungem.h
View File

0
drivers/net/sungem_phy.c → drivers/net/ethernet/sun/sungem_phy.c
View File

0
drivers/net/sungem_phy.h → drivers/net/ethernet/sun/sungem_phy.h
View File

0
drivers/net/sunhme.c → drivers/net/ethernet/sun/sunhme.c
View File

0
drivers/net/sunhme.h → drivers/net/ethernet/sun/sunhme.h
View File

0
drivers/net/sunqe.c → drivers/net/ethernet/sun/sunqe.c
View File

0
drivers/net/sunqe.h → drivers/net/ethernet/sun/sunqe.h
View File

0
drivers/net/sunvnet.c → drivers/net/ethernet/sun/sunvnet.c
View File

0
drivers/net/sunvnet.h → drivers/net/ethernet/sun/sunvnet.h
View File

2
drivers/net/spider_net.h
View File

@ -27,7 +27,7 @@
#define VERSION "2.0 B"
#include "sungem_phy.h"
#include "./ethernet/sun/sungem_phy.h"
extern int spider_net_stop(struct net_device *netdev);
extern int spider_net_open(struct net_device *netdev);