Skip to content

Commit 8b3332c

Browse files
committed
Revert "eth: remove the DLink/Sundance (ST201) driver"
This reverts commit 8401a10. I got a report from an (anonymous) Sundance user: Ethernet controller: Sundance Technology Inc / IC Plus Corp IC Plus IP100A Integrated 10/100 Ethernet MAC + PHY (rev 31) Revert the driver back in. Make following changes: - update Denis's email address in MAINTAINERS - adjust to timer API renames: - del_timer_sync() -> timer_delete_sync() - from_timer() -> timer_container_of() Fixes: 8401a10 ("eth: remove the DLink/Sundance (ST201) driver") Reviewed-by: Simon Horman <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent ddbf0e7 commit 8b3332c

File tree

6 files changed

+2014
-0
lines changed

6 files changed

+2014
-0
lines changed

MAINTAINERS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24252,6 +24252,12 @@ S: Maintained
2425224252
F: Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml
2425324253
F: drivers/input/keyboard/sun4i-lradc-keys.c
2425424254

24255+
SUNDANCE NETWORK DRIVER
24256+
M: Denis Kirjanov <[email protected]>
24257+
24258+
S: Maintained
24259+
F: drivers/net/ethernet/dlink/sundance.c
24260+
2425524261
SUNPLUS ETHERNET DRIVER
2425624262
M: Wells Lu <[email protected]>
2425724263

arch/mips/configs/mtx1_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ CONFIG_DM9102=m
273273
CONFIG_ULI526X=m
274274
CONFIG_PCMCIA_XIRCOM=m
275275
CONFIG_DL2K=m
276+
CONFIG_SUNDANCE=m
276277
CONFIG_PCMCIA_FMVJ18X=m
277278
CONFIG_E100=m
278279
CONFIG_E1000=m

arch/powerpc/configs/ppc6xx_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,7 @@ CONFIG_DM9102=m
433433
CONFIG_ULI526X=m
434434
CONFIG_PCMCIA_XIRCOM=m
435435
CONFIG_DL2K=m
436+
CONFIG_SUNDANCE=m
436437
CONFIG_S2IO=m
437438
CONFIG_FEC_MPC52xx=m
438439
CONFIG_GIANFAR=m

drivers/net/ethernet/dlink/Kconfig

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,24 @@ config DL2K
3232
To compile this driver as a module, choose M here: the
3333
module will be called dl2k.
3434

35+
config SUNDANCE
36+
tristate "Sundance Alta support"
37+
depends on PCI
38+
select CRC32
39+
select MII
40+
help
41+
This driver is for the Sundance "Alta" chip.
42+
More specific information and updates are available from
43+
<http://www.scyld.com/network/sundance.html>.
44+
45+
config SUNDANCE_MMIO
46+
bool "Use MMIO instead of PIO"
47+
depends on SUNDANCE
48+
help
49+
Enable memory-mapped I/O for interaction with Sundance NIC registers.
50+
Do NOT enable this by default, PIO (enabled when MMIO is disabled)
51+
is known to solve bugs on certain chips.
52+
53+
If unsure, say N.
54+
3555
endif # NET_VENDOR_DLINK

drivers/net/ethernet/dlink/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
#
55

66
obj-$(CONFIG_DL2K) += dl2k.o
7+
obj-$(CONFIG_SUNDANCE) += sundance.o

0 commit comments

Comments
 (0)