Skip to content

Commit 9dbdac0

Browse files
abujdosogregkh
authored andcommitted
staging: octeon-usb: move driver out of staging
The Octeon usb driver has been in staging for a long time and used in Ubiquiti routers for a while now. It's been built and then tested on real hardware with several usb devices and it is proven to be stable and ready to be moved to its proper place in the kernel tree. Move it to drivers/usb/host and adjust its Makefile, Kconfig and defconfig dependencies. Many thanks to the developers who made it happen. Signed-off-by: Artur Bujdoso <[email protected]> Link: https://lore.kernel.org/r/Yo0HBIlSXOBM+//9@crux Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent a111daf commit 9dbdac0

File tree

10 files changed

+12
-25
lines changed

10 files changed

+12
-25
lines changed

arch/mips/configs/cavium_octeon_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ CONFIG_RTC_CLASS=y
134134
CONFIG_RTC_DRV_DS1307=y
135135
CONFIG_STAGING=y
136136
CONFIG_OCTEON_ETHERNET=y
137-
CONFIG_OCTEON_USB=y
137+
CONFIG_USB_OCTEON_HCD=y
138138
# CONFIG_IOMMU_SUPPORT is not set
139139
CONFIG_RAS=y
140140
CONFIG_EXT4_FS=y

drivers/staging/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ source "drivers/staging/rts5208/Kconfig"
4242

4343
source "drivers/staging/octeon/Kconfig"
4444

45-
source "drivers/staging/octeon-usb/Kconfig"
46-
4745
source "drivers/staging/vt6655/Kconfig"
4846

4947
source "drivers/staging/vt6656/Kconfig"

drivers/staging/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ obj-$(CONFIG_R8712U) += rtl8712/
1111
obj-$(CONFIG_R8188EU) += r8188eu/
1212
obj-$(CONFIG_RTS5208) += rts5208/
1313
obj-$(CONFIG_OCTEON_ETHERNET) += octeon/
14-
obj-$(CONFIG_OCTEON_USB) += octeon-usb/
1514
obj-$(CONFIG_VT6655) += vt6655/
1615
obj-$(CONFIG_VT6656) += vt6656/
1716
obj-$(CONFIG_VME_BUS) += vme_user/

drivers/staging/octeon-usb/Kconfig

Lines changed: 0 additions & 11 deletions
This file was deleted.

drivers/staging/octeon-usb/Makefile

Lines changed: 0 additions & 2 deletions
This file was deleted.

drivers/staging/octeon-usb/TODO

Lines changed: 0 additions & 8 deletions
This file was deleted.

drivers/usb/host/Kconfig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,16 @@ config USB_EHCI_MV
306306
Dova, Armada 370 and Armada XP. See "Support for Marvell EBU
307307
on-chip EHCI USB controller" for those.
308308

309+
config USB_OCTEON_HCD
310+
tristate "Cavium Networks Octeon USB support"
311+
depends on CAVIUM_OCTEON_SOC && USB
312+
help
313+
This driver supports USB host controller on some Cavium
314+
Networks' products in the Octeon family.
315+
316+
To compile this driver as a module, choose M here. The module
317+
will be called octeon-hcd.
318+
309319
config USB_CNS3XXX_EHCI
310320
bool "Cavium CNS3XXX EHCI Module (DEPRECATED)"
311321
depends on ARCH_CNS3XXX || COMPILE_TEST

drivers/usb/host/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ obj-$(CONFIG_USB_OHCI_HCD_S3C2410) += ohci-s3c2410.o
6363
obj-$(CONFIG_USB_OHCI_HCD_LPC32XX) += ohci-nxp.o
6464
obj-$(CONFIG_USB_OHCI_HCD_PXA27X) += ohci-pxa27x.o
6565
obj-$(CONFIG_USB_OHCI_HCD_DAVINCI) += ohci-da8xx.o
66+
obj-$(CONFIG_USB_OCTEON_HCD) += octeon-hcd.o
6667

6768
obj-$(CONFIG_USB_UHCI_HCD) += uhci-hcd.o
6869
obj-$(CONFIG_USB_FHCI_HCD) += fhci.o

0 commit comments

Comments
 (0)