Commit 68d10458 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-v5.12-rc1' of... 

Merge tag 'usb-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next

Peter writes:

In v5.12-rc1, it adds cdnsp drivers for Cadence USB3 Family,
it is different UDC driver with current cdns3 driver.

* tag 'usb-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb: (23 commits)
  usb: cdnsp: Removes some useless trace events
  usb: cdns3: Add support for TI's AM64 SoC
  usb: cdnsp: fixes undefined reference to cdns_remove
  usb: cdns3: Adds missing __iomem markers
  usb: cdnsp: Fix for undefined reference to `usb_hcd_is_primary_hcd'
  usb: cdnsp: Fixes for sparse warnings
  usb: cdns3: Fixes for sparse warnings
  usb: cdnsp: fix error handling in cdnsp_mem_init()
  usb: cdns3: Removes xhci_cdns3_suspend_quirk from host-export.h
  usb: cdnsp: Removes some not useful function arguments
  usb: cdns3: fix warning when USB_CDNS_HOST is not set
  usb: cdns3: fix build when PM_SLEEP is not set
  usb: cdnsp: Mark cdnsp_gadget_ops with static keyword
  MAINTAINERS: add Cadence USBSSP DRD IP driver entry
  usb: cdns3: Change file names for cdns3 driver.
  usb: cdnsp: Add tracepoints for CDNSP driver
  usb: cdnsp: cdns3 Add main part of Cadence USBSSP DRD Driver
  usb: cdnsp: Device side header file for CDNSP driver
  usb: cdns3: Changed type of gadget_dev in cdns structure
  usb: cdns3: Refactoring names in reusable code
  ...
parents d8c84903 1ee18ded

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -3889,6 +3889,15 @@ S: Maintained 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git

F:	Documentation/devicetree/bindings/usb/cdns,usb3.yaml

F:	drivers/usb/cdns3/

X:	drivers/usb/cdns3/cdnsp*









CADENCE USBSSP DRD IP DRIVER









M:	Pawel Laszczak <pawell@cadence.com>









L:	linux-usb@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git









F:	drivers/usb/cdns3/









X:	drivers/usb/cdns3/cdns3*

















CADET FM/AM RADIO RECEIVER DRIVER









M:	Hans Verkuil <hverkuil@xs4all.nl>
































drivers/usb/Makefile



+2
−0






























Original line number
Diff line number
Diff line







@@ -13,7 +13,9 @@ obj-$(CONFIG_USB_DWC3)		+= dwc3/







obj-$(CONFIG_USB_DWC2)		+= dwc2/









obj-$(CONFIG_USB_ISP1760)	+= isp1760/



















obj-$(CONFIG_USB_CDNS_SUPPORT)	+= cdns3/









obj-$(CONFIG_USB_CDNS3)		+= cdns3/









obj-$(CONFIG_USB_CDNSP_PCI)	+= cdns3/



















obj-$(CONFIG_USB_MON)		+= mon/









obj-$(CONFIG_USB_MTU3)		+= mtu3/
































drivers/usb/cdns3/Kconfig



+58
−2






























Original line number
Diff line number
Diff line









config USB_CDNS3









	tristate "Cadence USB3 Dual-Role Controller"









config USB_CDNS_SUPPORT









	tristate "Cadence USB Support"









	depends on USB_SUPPORT && (USB || USB_GADGET) && HAS_DMA









	select USB_XHCI_PLATFORM if USB_XHCI_HCD









	select USB_ROLE_SWITCH









	help









	  Say Y here if your system has a Cadence USBSS or USBSSP









	  dual-role controller.









	  It supports: dual-role switch, Host-only, and Peripheral-only.



















config USB_CDNS_HOST









	bool



















if USB_CDNS_SUPPORT



















config USB_CDNS3









	tristate "Cadence USB3 Dual-Role Controller"









	depends on USB_CDNS_SUPPORT









	help









	  Say Y here if your system has a Cadence USB3 dual-role controller.









	  It supports: dual-role switch, Host-only, and Peripheral-only.



















	  If you choose to build this driver is a dynamically linked









	  as module, the module will be called cdns3.ko.









endif



















if USB_CDNS3


















@@ -25,6 +39,7 @@ config USB_CDNS3_GADGET







config USB_CDNS3_HOST









	bool "Cadence USB3 host controller"









	depends on USB=y || USB=USB_CDNS3









	select USB_CDNS_HOST









	help









	  Say Y here to enable host controller functionality of the









	  Cadence driver.








@@ -64,3 +79,44 @@ config USB_CDNS3_IMX







	  For example, imx8qm and imx8qxp.



















endif



















if USB_CDNS_SUPPORT



















config USB_CDNSP_PCI









	tristate "Cadence CDNSP Dual-Role Controller"









	depends on USB_CDNS_SUPPORT && USB_PCI && ACPI









	help









	  Say Y here if your system has a Cadence CDNSP dual-role controller.









	  It supports: dual-role switch Host-only, and Peripheral-only.



















	  If you choose to build this driver is a dynamically linked









	  module, the module will be called cdnsp.ko.









endif



















if USB_CDNSP_PCI



















config USB_CDNSP_GADGET









	bool "Cadence CDNSP device controller"









	depends on USB_GADGET=y || USB_GADGET=USB_CDNSP_PCI









	help









	  Say Y here to enable device controller functionality of the









	  Cadence CDNSP-DEV driver.



















	  Cadence CDNSP Device Controller in device mode is









	  very similar to XHCI controller. Therefore some algorithms









	  used has been taken from host driver.









	  This controller supports FF, HS, SS and SSP mode.









	  It doesn't support LS.



















config USB_CDNSP_HOST









	bool "Cadence CDNSP host controller"









	depends on USB=y || USB=USB_CDNSP_PCI









	select USB_CDNS_HOST









	help









	  Say Y here to enable host controller functionality of the









	  Cadence driver.



















	  Host controller is compliant with XHCI so it uses









	  standard XHCI driver.



















endif
























drivers/usb/cdns3/Makefile



+34
−9






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0









# define_trace.h needs to know how to find our header









CFLAGS_trace.o				:= -I$(src)









CFLAGS_cdns3-trace.o				:= -I$(src)









CFLAGS_cdnsp-trace.o				:= -I$(src)



















cdns3-y					:= core.o drd.o









cdns-usb-common-y				:= core.o drd.o









cdns3-y						:= cdns3-plat.o



















ifeq ($(CONFIG_USB),m)









obj-m						+= cdns-usb-common.o









obj-m						+= cdns3.o









else









obj-$(CONFIG_USB_CDNS_SUPPORT)			+= cdns-usb-common.o









obj-$(CONFIG_USB_CDNS3)				+= cdns3.o









cdns3-$(CONFIG_USB_CDNS3_GADGET)	+= gadget.o ep0.o









endif



















cdns-usb-common-$(CONFIG_USB_CDNS_HOST) 	+= host.o









cdns3-$(CONFIG_USB_CDNS3_GADGET)		+= cdns3-gadget.o cdns3-ep0.o



















ifneq ($(CONFIG_USB_CDNS3_GADGET),)









cdns3-$(CONFIG_TRACING)			+= trace.o









cdns3-$(CONFIG_TRACING)				+= cdns3-trace.o









endif



















cdns3-$(CONFIG_USB_CDNS3_HOST)		+= host.o



















obj-$(CONFIG_USB_CDNS3_PCI_WRAP)		+= cdns3-pci-wrap.o









obj-$(CONFIG_USB_CDNS3_TI)			+= cdns3-ti.o









obj-$(CONFIG_USB_CDNS3_IMX)			+= cdns3-imx.o



















cdnsp-udc-pci-y					:= cdnsp-pci.o



















ifdef CONFIG_USB_CDNSP_PCI









ifeq ($(CONFIG_USB),m)









obj-m						+= cdnsp-udc-pci.o









else









obj-$(CONFIG_USB_CDNSP_PCI) 			+= cdnsp-udc-pci.o









endif









endif



















cdnsp-udc-pci-$(CONFIG_USB_CDNSP_GADGET)	+= cdnsp-ring.o cdnsp-gadget.o \









						   cdnsp-mem.o cdnsp-ep0.o



















ifneq ($(CONFIG_USB_CDNSP_GADGET),)









cdnsp-udc-pci-$(CONFIG_TRACING)			+= cdnsp-trace.o









endif