Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c93e790 authored by yuan linyu's avatar yuan linyu Committed by Greg Kroah-Hartman
Browse files

usb: add CONFIG_USB_PCI for system have both PCI HW and non-PCI based USB HW 



a lot of embeded system SOC (e.g. freescale T2080) have both
PCI and USB modules. But USB module is controlled by registers directly,
it have no relationship with PCI module.

when say N here it will not build PCI related code in USB driver.

Signed-off-by: default avataryuan linyu <Linyu.Yuan@alcatel-sbell.com.cn>
Acked-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b5a6a4e5

drivers/usb/Kconfig

+11 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ config USB_COMMON 
config USB_ARCH_HAS_HCD

	def_bool y



# ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.

config USB

	tristate "Support for Host-side USB"

	depends on USB_ARCH_HAS_HCD
@@ -73,6 +72,17 @@ config USB 
	  To compile this driver as a module, choose M here: the

	  module will be called usbcore.



config USB_PCI

	bool "PCI based USB host interface"

	depends on PCI

	default y

	---help---

	  A lot of embeded system SOC (e.g. freescale T2080) have both

	  PCI and USB modules. But USB module is controlled by registers

	  directly, it have no relationship with PCI module.



	  When say N here it will not build PCI related code in USB driver.



if USB



source "drivers/usb/core/Kconfig"

drivers/usb/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ obj-$(CONFIG_USB_ISP1760) += isp1760/ 
obj-$(CONFIG_USB_MON)		+= mon/

obj-$(CONFIG_USB_MTU3)		+= mtu3/



obj-$(CONFIG_PCI)		+= host/

obj-$(CONFIG_USB_PCI)		+= host/

obj-$(CONFIG_USB_EHCI_HCD)	+= host/

obj-$(CONFIG_USB_ISP116X_HCD)	+= host/

obj-$(CONFIG_USB_OHCI_HCD)	+= host/

drivers/usb/chipidea/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ config USB_CHIPIDEA_OF 


config USB_CHIPIDEA_PCI

	tristate

	depends on PCI

	depends on USB_PCI

	depends on NOP_USB_XCEIV

	default USB_CHIPIDEA

drivers/usb/core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ usbcore-y += devio.o notify.o generic.o quirks.o devices.o 
usbcore-y += port.o



usbcore-$(CONFIG_OF)		+= of.o

usbcore-$(CONFIG_PCI)		+= hcd-pci.o

usbcore-$(CONFIG_USB_PCI)		+= hcd-pci.o

usbcore-$(CONFIG_ACPI)		+= usb-acpi.o



obj-$(CONFIG_USB)		+= usbcore.o

drivers/usb/dwc2/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ endchoice 


config USB_DWC2_PCI

	tristate "DWC2 PCI"

	depends on PCI

	depends on USB_PCI

	depends on USB_GADGET || !USB_GADGET

	default n

	select NOP_USB_XCEIV