aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/linux
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2018-01-20 10:09:07 +0100
committerMathias Kresin <dev@kresin.me>2018-02-20 19:25:17 +0100
commit6112abf186bfe6dabd440a9d1f8f071178cce9a2 (patch)
tree006ae0771360af1df59cef6f41c4579a77757ece /package/kernel/linux
parent04cb1e0fd20196e2e6ec5f8864f5d694f134cbc1 (diff)
downloadupstream-6112abf186bfe6dabd440a9d1f8f071178cce9a2.tar.gz
upstream-6112abf186bfe6dabd440a9d1f8f071178cce9a2.tar.bz2
upstream-6112abf186bfe6dabd440a9d1f8f071178cce9a2.zip
kernel: enable CONFIG_USB_PCI for PCI usb modules
With upstream commit 2c93e790e825 ("usb: add CONFIG_USB_PCI for system have both PCI HW and non-PCI based USB HW") the CONFIG_USB_PCI was introduced. The option is disabled by default in our generic kernel 4.14 config, hence we need to set the option for all related kernel modules. Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'package/kernel/linux')
-rw-r--r--package/kernel/linux/modules/usb.mk15
1 files changed, 12 insertions, 3 deletions
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 08e3bf699e..7392ce1197 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -187,6 +187,7 @@ $(eval $(call KernelPackage,usb-gadget-mass-storage))
define KernelPackage/usb-uhci
TITLE:=Support for UHCI controllers
KCONFIG:= \
+ CONFIG_USB_PCI=y \
CONFIG_USB_UHCI_ALT \
CONFIG_USB_UHCI_HCD
FILES:=$(LINUX_DIR)/drivers/usb/host/uhci-hcd.ko
@@ -236,7 +237,9 @@ $(eval $(call KernelPackage,usb-ohci,1))
define KernelPackage/usb-ohci-pci
TITLE:=Support for PCI OHCI controllers
DEPENDS:=@PCI_SUPPORT +kmod-usb-ohci
- KCONFIG:=CONFIG_USB_OHCI_HCD_PCI
+ KCONFIG:= \
+ CONFIG_USB_PCI=y \
+ CONFIG_USB_OHCI_HCD_PCI
FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-pci.ko
AUTOLOAD:=$(call AutoLoad,51,ohci-pci,1)
$(call AddDepends/usb)
@@ -324,7 +327,9 @@ $(eval $(call KernelPackage,usb2))
define KernelPackage/usb2-pci
TITLE:=Support for PCI USB2 controllers
DEPENDS:=@PCI_SUPPORT +kmod-usb2
- KCONFIG:=CONFIG_USB_EHCI_PCI
+ KCONFIG:= \
+ CONFIG_USB_PCI=y \
+ CONFIG_USB_EHCI_PCI
FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-pci.ko
AUTOLOAD:=$(call AutoLoad,42,ehci-pci,1)
$(call AddDepends/usb)
@@ -341,6 +346,7 @@ define KernelPackage/usb-dwc2
TITLE:=DWC2 USB controller driver
DEPENDS:=+USB_GADGET_SUPPORT:kmod-usb-gadget
KCONFIG:= \
+ CONFIG_USB_PCI=y \
CONFIG_USB_DWC2 \
CONFIG_USB_DWC2_PCI \
CONFIG_USB_DWC2_PLATFORM \
@@ -1499,6 +1505,7 @@ define KernelPackage/usb3
+TARGET_bcm53xx:kmod-usb-bcma \
+TARGET_bcm53xx:kmod-phy-bcm-ns-usb3
KCONFIG:= \
+ CONFIG_USB_PCI=y \
CONFIG_USB_XHCI_HCD \
CONFIG_USB_XHCI_PCI \
CONFIG_USB_XHCI_PLATFORM \
@@ -1520,7 +1527,9 @@ $(eval $(call KernelPackage,usb3))
define KernelPackage/usb-net2280
TITLE:=Support for NetChip 228x PCI USB peripheral controller
- KCONFIG:= CONFIG_USB_NET2280
+ KCONFIG:= \
+ CONFIG_USB_PCI=y \
+ CONFIG_USB_NET2280
DEPENDS:=@PCI_SUPPORT +kmod-usb-gadget
FILES:=$(LINUX_DIR)/drivers/usb/gadget/udc/net2280.ko
AUTOLOAD:=$(call AutoLoad,46,net2280)