staging: octeon-usb: move driver out of staging
PATCH v2 1/1 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.
---
Changes in v2:
- Write a better changelog.
arch/mips/configs/cavium_octeon_defconfig | 2 +-
drivers/staging/Kconfig | 2 --
drivers/staging/Makefile | 1 -
drivers/staging/octeon-usb/Kconfig | 11 -----------
drivers/staging/octeon-usb/Makefile | 2 --
drivers/staging/octeon-usb/TODO | 8 --------
drivers/usb/host/Kconfig | 10 ++++++++++
drivers/usb/host/Makefile | 1 +
drivers/{staging/octeon-usb => usb/host}/octeon-hcd.c | 0
drivers/{staging/octeon-usb => usb/host}/octeon-hcd.h | 0
10 files changed, 12 insertions(+), 25 deletions(-)
delete mode 100644 drivers/staging/octeon-usb/Kconfig
delete mode 100644 drivers/staging/octeon-usb/Makefile
delete mode 100644 drivers/staging/octeon-usb/TODO
rename drivers/{staging/octeon-usb => usb/host}/octeon-hcd.c (100%)
rename drivers/{staging/octeon-usb => usb/host}/octeon-hcd.h (100%)arch/mips/configs/cavium_octeon_defconfig +1 -1
@@ -134,7 +134,7 @@ CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_DS1307=y CONFIG_STAGING=y CONFIG_OCTEON_ETHERNET=y -CONFIG_OCTEON_USB=y +CONFIG_USB_OCTEON_HCD=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_RAS=y CONFIG_EXT4_FS=y
drivers/staging/Kconfig +0 -2
@@ -42,8 +42,6 @@ source "drivers/staging/rts5208/Kconfig" source "drivers/staging/octeon/Kconfig" -source "drivers/staging/octeon-usb/Kconfig" - source "drivers/staging/vt6655/Kconfig" source "drivers/staging/vt6656/Kconfig"
drivers/staging/Makefile +0 -1
@@ -11,7 +11,6 @@ obj-$(CONFIG_R8712U) += rtl8712/ obj-$(CONFIG_R8188EU) += r8188eu/ obj-$(CONFIG_RTS5208) += rts5208/ obj-$(CONFIG_OCTEON_ETHERNET) += octeon/ -obj-$(CONFIG_OCTEON_USB) += octeon-usb/ obj-$(CONFIG_VT6655) += vt6655/ obj-$(CONFIG_VT6656) += vt6656/ obj-$(CONFIG_VME_BUS) += vme_user/
drivers/staging/octeon-usb/Kconfig deleted +0 -11
@@ -1,11 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -config OCTEON_USB - tristate "Cavium Networks Octeon USB support" - depends on CAVIUM_OCTEON_SOC && USB - help - This driver supports USB host controller on some Cavium - Networks' products in the Octeon family. - - To compile this driver as a module, choose M here. The module - will be called octeon-hcd. -
drivers/staging/octeon-usb/Makefile deleted +0 -2
@@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -obj-${CONFIG_OCTEON_USB} := octeon-hcd.o
drivers/staging/octeon-usb/TODO deleted +0 -8
@@ -1,8 +0,0 @@ -This driver is functional and has been tested on EdgeRouter Lite, -D-Link DSR-1000N and EBH5600 evaluation board with USB mass storage. - -TODO: - - kernel coding style - - checkpatch warnings - -Contact: Aaro Koskinen <[email protected]>
drivers/usb/host/Kconfig +10 -0
@@ -306,6 +306,16 @@ config USB_EHCI_MV Dova, Armada 370 and Armada XP. See "Support for Marvell EBU on-chip EHCI USB controller" for those. +config USB_OCTEON_HCD + tristate "Cavium Networks Octeon USB support" + depends on CAVIUM_OCTEON_SOC && USB + help + This driver supports USB host controller on some Cavium + Networks' products in the Octeon family. + + To compile this driver as a module, choose M here. The module + will be called octeon-hcd. + config USB_CNS3XXX_EHCI bool "Cavium CNS3XXX EHCI Module (DEPRECATED)" depends on ARCH_CNS3XXX || COMPILE_TEST
drivers/usb/host/Makefile +1 -0
@@ -63,6 +63,7 @@ obj-$(CONFIG_USB_OHCI_HCD_S3C2410) += ohci-s3c2410.o obj-$(CONFIG_USB_OHCI_HCD_LPC32XX) += ohci-nxp.o obj-$(CONFIG_USB_OHCI_HCD_PXA27X) += ohci-pxa27x.o obj-$(CONFIG_USB_OHCI_HCD_DAVINCI) += ohci-da8xx.o +obj-$(CONFIG_USB_OCTEON_HCD) += octeon-hcd.o obj-$(CONFIG_USB_UHCI_HCD) += uhci-hcd.o obj-$(CONFIG_USB_FHCI_HCD) += fhci.o
drivers/usb/host/octeon-hcd.c renamed from drivers/staging/octeon-usb/octeon-hcd.c +0 -0
drivers/usb/host/octeon-hcd.h renamed from drivers/staging/octeon-usb/octeon-hcd.h +0 -0
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerQuoted 9 lines · Artur Bujdoso
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/hostand adjust itsMakefile,Kconfigand defconfig dependencies.
Quoted 6 lines
Many thanks to the developers who made it happen.
Signed-off-by Artur Bujdoso <[email protected]>---
Changes in v2:
- Write a better changelog.
I added this to a branch and then pulled it into both the staging.git and usb.git trees so that we have a common place to work off of. I'll take changes going forward in the usb.git tree only to the driver.
thanks,
greg k-h