From 1b906723ebea2319ba428ae708867273805ddd43 Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Thu, 1 Mar 2018 07:25:38 +0100 Subject: [PATCH] ipq40xx/ipq806x: move qcom-dwc3 usb driver to generic If the a kernel package exists within multiple targets an error/warning is shown. Signed-off-by: Mathias Kresin --- package/kernel/linux/modules/usb.mk | 36 +++++++++++++++++++++++++++++ target/linux/ipq40xx/modules.mk | 33 -------------------------- target/linux/ipq806x/modules.mk | 33 -------------------------- 3 files changed, 36 insertions(+), 66 deletions(-) delete mode 100644 target/linux/ipq40xx/modules.mk delete mode 100644 target/linux/ipq806x/modules.mk diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index 7392ce1197..be638520aa 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -71,6 +71,25 @@ 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/usb-gadget TITLE:=USB Gadget support KCONFIG:=CONFIG_USB_GADGET @@ -391,6 +410,23 @@ 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) + $(call AddDepends/usb) +endef + +define KernelPackage/usb-dwc3-of-simple/description + This driver provides generic platform glue for the integrated DesignWare + USB3 IP Core. +endef + + +$(eval $(call KernelPackage,usb-dwc3-of-simple)) + define KernelPackage/usb-acm TITLE:=Support for modems/isdn controllers KCONFIG:=CONFIG_USB_ACM diff --git a/target/linux/ipq40xx/modules.mk b/target/linux/ipq40xx/modules.mk deleted file mode 100644 index 43f3c9cfe7..0000000000 --- a/target/linux/ipq40xx/modules.mk +++ /dev/null @@ -1,33 +0,0 @@ -define KernelPackage/usb-dwc3-of-simple - TITLE:=DWC3 USB simple OF driver - DEPENDS:=+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) - $(call AddDepends/usb) -endef - -define KernelPackage/usb-dwc3-of-simple/description - This driver provides generic platform glue for the integrated DesignWare - USB3 IP Core. -endef - -$(eval $(call KernelPackage,usb-dwc3-of-simple)) - -define KernelPackage/usb-phy-qcom-dwc3 - TITLE:=DWC3 USB QCOM PHY driver - DEPENDS:=@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)) diff --git a/target/linux/ipq806x/modules.mk b/target/linux/ipq806x/modules.mk deleted file mode 100644 index 43f3c9cfe7..0000000000 --- a/target/linux/ipq806x/modules.mk +++ /dev/null @@ -1,33 +0,0 @@ -define KernelPackage/usb-dwc3-of-simple - TITLE:=DWC3 USB simple OF driver - DEPENDS:=+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) - $(call AddDepends/usb) -endef - -define KernelPackage/usb-dwc3-of-simple/description - This driver provides generic platform glue for the integrated DesignWare - USB3 IP Core. -endef - -$(eval $(call KernelPackage,usb-dwc3-of-simple)) - -define KernelPackage/usb-phy-qcom-dwc3 - TITLE:=DWC3 USB QCOM PHY driver - DEPENDS:=@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)) -- 2.25.1