Commit 422d97b8 authored by Chris Packham's avatar Chris Packham Committed by Greg Kroah-Hartman
Browse files

Revert "staging: octeon: delete driver" 



This reverts commit 710d7fbe.
Re-instate the code so subsequent commits can clean it up and get it
building properly.

Signed-off-by: default avatarChris Packham <chris.packham@alliedtelesis.co.nz>
Link: https://lore.kernel.org/r/20200205001116.14096-3-chris.packham@alliedtelesis.co.nz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 96b06c0a

drivers/staging/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ source "drivers/staging/rtl8188eu/Kconfig" 


source "drivers/staging/rts5208/Kconfig"



source "drivers/staging/octeon/Kconfig"



source "drivers/staging/octeon-usb/Kconfig"



source "drivers/staging/vt6655/Kconfig"

drivers/staging/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ obj-$(CONFIG_R8712U) += rtl8712/ 
obj-$(CONFIG_R8188EU)		+= rtl8188eu/

obj-$(CONFIG_RTS5208)		+= rts5208/

obj-$(CONFIG_NETLOGIC_XLR_NET)	+= netlogic/

obj-$(CONFIG_OCTEON_ETHERNET)	+= octeon/

obj-$(CONFIG_OCTEON_USB)	+= octeon-usb/

obj-$(CONFIG_VT6655)		+= vt6655/

obj-$(CONFIG_VT6656)		+= vt6656/

drivers/staging/octeon/Kconfig

0 → 100644
+16 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

config OCTEON_ETHERNET

	tristate "Cavium Networks Octeon Ethernet support"

	depends on CAVIUM_OCTEON_SOC || COMPILE_TEST

	depends on NETDEVICES

	depends on BROKEN

	select PHYLIB

	select MDIO_OCTEON

	help

	  This driver supports the builtin ethernet ports on Cavium

	  Networks' products in the Octeon family. This driver supports the

	  CN3XXX and CN5XXX Octeon processors.



	  To compile this driver as a module, choose M here.  The module

	  will be called octeon-ethernet.

drivers/staging/octeon/Makefile

0 → 100644
+19 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

#

# Copyright (C) 2005-2009 Cavium Networks

#



#

# Makefile for Cavium OCTEON on-board ethernet driver

#



obj-${CONFIG_OCTEON_ETHERNET} :=  octeon-ethernet.o



octeon-ethernet-y := ethernet.o

octeon-ethernet-y += ethernet-mdio.o

octeon-ethernet-y += ethernet-mem.o

octeon-ethernet-y += ethernet-rgmii.o

octeon-ethernet-y += ethernet-rx.o

octeon-ethernet-y += ethernet-sgmii.o

octeon-ethernet-y += ethernet-spi.o

octeon-ethernet-y += ethernet-tx.o

drivers/staging/octeon/TODO

0 → 100644
+9 −0
Original line number Diff line number Diff line 
This driver is functional and supports Ethernet on OCTEON+/OCTEON2/OCTEON3

chips at least up to CN7030.



TODO:

	- general code review and clean up

	- make driver self-contained instead of being split between staging and

	  arch/mips/cavium-octeon.



Contact: Aaro Koskinen <aaro.koskinen@iki.fi>

CRA Git | Maintained and supported by SUSTech CRA and CCSE