X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fkernel%2Flinux%2Fmodules%2Fusb.mk;h=87ec0ae080a6f99e91e85b207b925e48ac16b7dc;hb=6362a04725b859ac306e54359b14ea2612af28db;hp=748e7ede8454cb81095d3ffab43a9b579a999e11;hpb=87e1894d59bf2272e93ae26692eefc9826997709;p=openwrt%2Fstaging%2Fwigyori.git diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index 748e7ede84..87ec0ae080 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -39,7 +39,6 @@ endef define KernelPackage/usb-ledtrig-usbport TITLE:=LED trigger for USB ports KCONFIG:=CONFIG_USB_LEDS_TRIGGER_USBPORT - DEPENDS:=@!LINUX_3_18 FILES:=$(LINUX_DIR)/drivers/usb/core/ledtrig-usbport.ko AUTOLOAD:=$(call AutoLoad,50,ledtrig-usbport) $(call AddDepends/usb) @@ -71,25 +70,6 @@ endef $(eval $(call KernelPackage,usb-phy-nop)) -define KernelPackage/usb-phy-qcom-dwc3 - TITLE:=DWC3 USB QCOM PHY driver - DEPENDS:=@TARGET_ipq40xx||@TARGET_ipq806x +kmod-usb-dwc3-of-simple - KCONFIG:= CONFIG_PHY_QCOM_DWC3 - FILES:= \ - $(LINUX_DIR)/drivers/phy/phy-qcom-dwc3.ko@lt4.13 \ - $(LINUX_DIR)/drivers/phy/qualcomm/phy-qcom-dwc3.ko@ge4.13 - AUTOLOAD:=$(call AutoLoad,45,phy-qcom-dwc3,1) - $(call AddDepends/usb) -endef - -define KernelPackage/usb-phy-qcom-dwc3/description - This driver provides support for the integrated DesignWare - USB3 IP Core within the QCOM SoCs. -endef - -$(eval $(call KernelPackage,usb-phy-qcom-dwc3)) - - define KernelPackage/phy-ath79-usb TITLE:=Support for ATH79 USB PHY KCONFIG:=CONFIG_PHY_AR7100_USB \ @@ -237,6 +217,22 @@ endef $(eval $(call KernelPackage,usb-gadget-mass-storage)) +define KernelPackage/usb-gadget-cdc-composite + TITLE:= USB CDC Composite (Ethernet + ACM) + KCONFIG:=CONFIG_USB_CDC_COMPOSITE + DEPENDS:=+kmod-usb-gadget +kmod-usb-lib-composite \ + +kmod-usb-gadget-eth +kmod-usb-gadget-serial + FILES:= $(LINUX_DIR)/drivers/usb/gadget/legacy/g_cdc.ko + $(call AddDepends/usb) +endef + +define KernelPackage/usb-gadget-cdc-composite/description + Kernel support for the USB CDC Composite gadget. + This appears as an ethernet + ACM serial gadget. +endef + +$(eval $(call KernelPackage,usb-gadget-cdc-composite)) + define KernelPackage/usb-uhci TITLE:=Support for UHCI controllers @@ -260,8 +256,8 @@ define KernelPackage/usb-ohci TITLE:=Support for OHCI controllers DEPENDS:= \ +TARGET_bcm53xx:kmod-usb-bcma \ - +TARGET_brcm47xx:kmod-usb-bcma \ - +TARGET_brcm47xx:kmod-usb-ssb + +TARGET_bcm47xx:kmod-usb-bcma \ + +TARGET_bcm47xx:kmod-usb-ssb KCONFIG:= \ CONFIG_USB_OHCI \ CONFIG_USB_OHCI_HCD \ @@ -308,7 +304,7 @@ $(eval $(call KernelPackage,usb-ohci-pci)) define KernelPackage/usb-bcma TITLE:=Support for BCMA USB controllers - DEPENDS:=@USB_SUPPORT @TARGET_brcm47xx||TARGET_bcm53xx + DEPENDS:=@USB_SUPPORT @TARGET_bcm47xx||TARGET_bcm53xx HIDDEN:=1 KCONFIG:=CONFIG_USB_HCD_BCMA FILES:= \ @@ -331,7 +327,7 @@ $(eval $(call KernelPackage,usb-fotg210)) define KernelPackage/usb-ssb TITLE:=Support for SSB USB controllers - DEPENDS:=@USB_SUPPORT @TARGET_brcm47xx + DEPENDS:=@USB_SUPPORT @TARGET_bcm47xx HIDDEN:=1 KCONFIG:=CONFIG_USB_HCD_SSB FILES:= \ @@ -356,8 +352,8 @@ $(eval $(call KernelPackage,usb-ehci)) define KernelPackage/usb2 TITLE:=Support for USB2 controllers DEPENDS:=\ - +TARGET_brcm47xx:kmod-usb-bcma \ - +TARGET_brcm47xx:kmod-usb-ssb \ + +TARGET_bcm47xx:kmod-usb-bcma \ + +TARGET_bcm47xx:kmod-usb-ssb \ +TARGET_bcm53xx:kmod-usb-bcma \ +TARGET_bcm53xx:kmod-phy-bcm-ns-usb2 \ +TARGET_ath79:kmod-phy-ath79-usb \ @@ -379,7 +375,13 @@ define KernelPackage/usb2 ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/host/ehci-atmel.ko),) FILES+=$(LINUX_DIR)/drivers/usb/host/ehci-atmel.ko endif - AUTOLOAD:=$(call AutoLoad,40,ehci-hcd ehci-platform ehci-orion ehci-atmel,1) + ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/host/ehci-fsl.ko),) + FILES+=$(LINUX_DIR)/drivers/usb/host/ehci-fsl.ko + endif + ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/host/fsl-mph-dr-of.ko),) + FILES+=$(LINUX_DIR)/drivers/usb/host/fsl-mph-dr-of.ko + endif + AUTOLOAD:=$(call AutoLoad,40,ehci-hcd ehci-platform ehci-orion ehci-atmel ehci-fsl fsl-mph-dr-of,1) $(call AddDepends/usb) endef @@ -421,9 +423,8 @@ define KernelPackage/usb-dwc2 CONFIG_USB_DWC2_TRACK_MISSED_SOFS=n \ CONFIG_USB_DWC2_DEBUG_PERIODIC=n FILES:= \ - $(LINUX_DIR)/drivers/usb/dwc2/dwc2.ko \ - $(LINUX_DIR)/drivers/usb/dwc2/dwc2_platform.ko@lt4.3 - AUTOLOAD:=$(call AutoLoad,54,dwc2 dwc2_platform@lt4.3,1) + $(LINUX_DIR)/drivers/usb/dwc2/dwc2.ko + AUTOLOAD:=$(call AutoLoad,54,dwc2,1) $(call AddDepends/usb) endef @@ -457,22 +458,24 @@ endef $(eval $(call KernelPackage,usb-dwc3)) -define KernelPackage/usb-dwc3-of-simple - TITLE:=DWC3 USB simple OF driver - DEPENDS:=@TARGET_ipq40xx||@TARGET_ipq806x +kmod-usb-dwc3 - KCONFIG:= CONFIG_USB_DWC3_OF_SIMPLE - FILES:= $(LINUX_DIR)/drivers/usb/dwc3/dwc3-of-simple.ko - AUTOLOAD:=$(call AutoLoad,53,dwc3-of-simple,1) +define KernelPackage/usb-dwc3-qcom + TITLE:=DWC3 Qualcomm USB driver + DEPENDS:=@(TARGET_ipq40xx||TARGET_ipq806x) +kmod-usb-dwc3 + KCONFIG:= CONFIG_USB_DWC3_QCOM + FILES:= $(LINUX_DIR)/drivers/usb/dwc3/dwc3-qcom.ko + AUTOLOAD:=$(call AutoLoad,53,dwc3-qcom,1) $(call AddDepends/usb) endef -define KernelPackage/usb-dwc3-of-simple/description - This driver provides generic platform glue for the integrated DesignWare - USB3 IP Core. +define KernelPackage/usb-dwc3-qcom/description + Some Qualcomm SoCs use DesignWare Core IP for USB2/3 functionality. + This driver also handles Qscratch wrapper which is needed for + peripheral mode support. endef -$(eval $(call KernelPackage,usb-dwc3-of-simple)) +$(eval $(call KernelPackage,usb-dwc3-qcom)) + define KernelPackage/usb-acm TITLE:=Support for modems/isdn controllers @@ -895,6 +898,7 @@ define KernelPackage/usb-serial-wwan TITLE:=Support for GSM and CDMA modems KCONFIG:=CONFIG_USB_SERIAL_WWAN FILES:=$(LINUX_DIR)/drivers/usb/serial/usb_wwan.ko + HIDDEN:=1 AUTOLOAD:=$(call AutoProbe,usb_wwan) $(call AddDepends/usb-serial) endef @@ -908,11 +912,10 @@ $(eval $(call KernelPackage,usb-serial-wwan)) define KernelPackage/usb-serial-option TITLE:=Support for Option HSDPA modems - DEPENDS:=+kmod-usb-serial-wwan KCONFIG:=CONFIG_USB_SERIAL_OPTION FILES:=$(LINUX_DIR)/drivers/usb/serial/option.ko AUTOLOAD:=$(call AutoProbe,option) - $(call AddDepends/usb-serial) + $(call AddDepends/usb-serial,+kmod-usb-serial-wwan) endef define KernelPackage/usb-serial-option/description @@ -1097,7 +1100,7 @@ $(eval $(call KernelPackage,usb-net)) define AddDepends/usb-net SUBMENU:=$(USB_MENU) - DEPENDS+=kmod-usb-net $(1) + DEPENDS+=+kmod-usb-net $(1) endef @@ -1358,7 +1361,7 @@ define KernelPackage/usb-net-cdc-mbim endef define KernelPackage/usb-net-cdc-mbim/description - Kernel module for Option USB High Speed Mobile Devices + Kernel module for CDC MBIM (Mobile Broadband Interface Model) devices endef $(eval $(call KernelPackage,usb-net-cdc-mbim)) @@ -1555,7 +1558,7 @@ $(eval $(call KernelPackage,usbip-server)) define KernelPackage/usb-chipidea TITLE:=Host and device support for Chipidea controllers - DEPENDS:=+USB_GADGET_SUPPORT:kmod-usb-gadget @TARGET_ar71xx||TARGET_ath79 +kmod-usb-ehci +kmod-usb-phy-nop + DEPENDS:=+USB_GADGET_SUPPORT:kmod-usb-gadget @TARGET_ath79 +kmod-usb-ehci +kmod-usb-phy-nop KCONFIG:= \ CONFIG_EXTCON \ CONFIG_USB_CHIPIDEA \ @@ -1563,9 +1566,10 @@ define KernelPackage/usb-chipidea CONFIG_USB_CHIPIDEA_UDC=y \ CONFIG_USB_CHIPIDEA_DEBUG=y FILES:= \ - $(LINUX_DIR)/drivers/extcon/extcon.ko@lt4.9 \ - $(LINUX_DIR)/drivers/extcon/extcon-core.ko@ge4.9 \ - $(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc.ko + $(LINUX_DIR)/drivers/extcon/extcon-core.ko \ + $(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc.ko \ + $(LINUX_DIR)/drivers/usb/common/ulpi.ko \ + $(LINUX_DIR)/drivers/usb/roles/roles.ko@ge5.0 AUTOLOAD:=$(call AutoLoad,39,ci_hdrc,1) $(call AddDepends/usb) endef @@ -1587,8 +1591,7 @@ define KernelPackage/usb-chipidea2 CONFIG_USB_CHIPIDEA_UDC=y \ CONFIG_USB_CHIPIDEA_DEBUG=y FILES:= \ - $(LINUX_DIR)/drivers/extcon/extcon.ko@lt4.9 \ - $(LINUX_DIR)/drivers/extcon/extcon-core.ko@ge4.9 \ + $(LINUX_DIR)/drivers/extcon/extcon-core.ko \ $(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc_usb2.ko AUTOLOAD:=$(call AutoLoad,39,ci_hdrc_usb2,1) $(call AddDepends/usb) @@ -1632,7 +1635,6 @@ define KernelPackage/usb3 CONFIG_USB_XHCI_HCD \ CONFIG_USB_XHCI_PCI \ CONFIG_USB_XHCI_PLATFORM \ - CONFIG_USB_XHCI_MVEBU=y \ CONFIG_USB_XHCI_MTK \ CONFIG_USB_XHCI_HCD_DEBUGGING=n FILES:= \