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

Commit 907184d0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: host: make USB_ARCH_HAS_?HCI obsolete"

parents 13205636 f5480e57

drivers/usb/Kconfig

+7 −62
Original line number Diff line number Diff line
@@ -2,59 +2,15 @@ 
# USB device configuration

#



# many non-PCI SOC chips embed OHCI

# These are unused now, remove them once they are no longer selected

config USB_ARCH_HAS_OHCI

	boolean

	# ARM:

	default y if SA1111

	default y if ARCH_OMAP

	default y if ARCH_S3C24XX

	default y if PXA27x

	default y if PXA3xx

	default y if ARCH_EP93XX

	default y if ARCH_AT91

	default y if MFD_TC6393XB

	default y if ARCH_W90X900

	default y if ARCH_DAVINCI_DA8XX

	default y if ARCH_CNS3XXX

	default y if PLAT_SPEAR

	default y if ARCH_EXYNOS

	# PPC:

	default y if STB03xxx

	default y if PPC_MPC52xx

	# MIPS:

	default y if MIPS_ALCHEMY

	default y if MACH_JZ4740

	# more:

	default PCI



# some non-PCI hcds implement EHCI

	bool



config USB_ARCH_HAS_EHCI

	boolean

	default y if FSL_SOC

	default y if PPC_MPC512x

	default y if ARCH_IXP4XX

	default y if ARCH_W90X900

	default y if ARCH_AT91

	default y if ARCH_MXC

	default y if ARCH_MXS

	default y if ARCH_OMAP3

	default y if ARCH_CNS3XXX

	default y if ARCH_VT8500

	default y if PLAT_SPEAR

	default y if PLAT_S5P

	default y if ARCH_MSM

	default y if MICROBLAZE

	default y if SPARC_LEON

	default y if ARCH_MMP

	default y if MACH_LOONGSON1

	default y if PLAT_ORION

	default PCI



# some non-PCI HCDs implement xHCI

	bool



config USB_ARCH_HAS_XHCI

	boolean

	default PCI

	bool



menuconfig USB_SUPPORT

	bool "USB support"
@@ -71,19 +27,8 @@ config USB_COMMON 
	default y

	depends on USB || USB_GADGET



# Host-side USB depends on having a host controller

# NOTE:  dummy_hcd is always an option, but it's ignored here ...

# NOTE:  SL-811 option should be board-specific ...

config USB_ARCH_HAS_HCD

	boolean

	default y if USB_ARCH_HAS_OHCI

	default y if USB_ARCH_HAS_EHCI

	default y if USB_ARCH_HAS_XHCI

	default y if PCMCIA && !M32R			# sl811_cs

	default y if ARM				# SL-811

	default y if BLACKFIN				# SL-811

	default y if SUPERH				# r8a66597-hcd

	default PCI

	def_bool y



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

config USB

drivers/usb/host/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ config USB_C67X00_HCD 


config USB_XHCI_HCD

	tristate "xHCI HCD (USB 3.0) support"

	depends on USB_ARCH_HAS_XHCI

	---help---

	  The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0

	  "SuperSpeed" host controller hardware.
@@ -54,7 +53,6 @@ endif # USB_XHCI_HCD 


config USB_EHCI_HCD

	tristate "EHCI HCD (USB 2.0) support"

	depends on USB_ARCH_HAS_EHCI

	---help---

	  The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0

	  "high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware.
@@ -403,7 +401,6 @@ config USB_ISP1362_HCD 


config USB_OHCI_HCD

	tristate "OHCI HCD support"

	depends on USB_ARCH_HAS_OHCI

	select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3

	depends on USB_ISP1301 || !ARCH_LPC32XX

	---help---