From: Linus Walleij <linus.walleij@linaro.org>
Date: Wed, 31 May 2023 21:21:07 +0000 (+0200)
Subject: kernel: Package the new FOTG210 module properly
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=33abdc07fbc1e6fb2e0d946187ff88c5270d76a6;p=openwrt%2Fstaging%2Fpepe2k.git

kernel: Package the new FOTG210 module properly

When using the Gemini, we apply patches that create a single
module that support both host and device mode these days.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
(move module to gemini target, keep both 6.1+2-ish + 5.15 module
CONFIG and files around until 5.15 is dropped)
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
---

diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 721e17f970..644365ed19 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -331,17 +331,6 @@ define KernelPackage/usb-bcma
 endef
 $(eval $(call KernelPackage,usb-bcma))
 
-define KernelPackage/usb-fotg210
-  TITLE:=Support for FOTG210 USB host controllers
-  DEPENDS:=@USB_SUPPORT @TARGET_gemini
-  KCONFIG:=CONFIG_USB_FOTG210_HCD
-  FILES:= \
-	$(if $(CONFIG_USB_FOTG210_HCD),$(LINUX_DIR)/drivers/usb/host/fotg210-hcd.ko)
-  AUTOLOAD:=$(call AutoLoad,50,fotg210-hcd,1)
-  $(call AddDepends/usb)
-endef
-$(eval $(call KernelPackage,usb-fotg210))
-
 define KernelPackage/usb-ssb
   TITLE:=Support for SSB USB controllers
   DEPENDS:=@USB_SUPPORT @TARGET_bcm47xx
diff --git a/target/linux/gemini/modules.mk b/target/linux/gemini/modules.mk
new file mode 100644
index 0000000000..104ad90279
--- /dev/null
+++ b/target/linux/gemini/modules.mk
@@ -0,0 +1,14 @@
+define KernelPackage/usb-fotg210
+  TITLE:=Support for FOTG210 USB host and device controllers
+  DEPENDS:=@USB_SUPPORT @TARGET_gemini
+  KCONFIG:=CONFIG_USB_FOTG210 \
+	CONFIG_USB_FOTG210_HCD
+  FILES:=$(if $(CONFIG_USB_FOTG210_HCD),$(LINUX_DIR)/drivers/usb/host/fotg210-hcd.ko@lt6.1) \
+	$(if $(CONFIG_USB_FOTG210),$(LINUX_DIR)/drivers/usb/fotg210/fotg210.ko@ge6.1)
+  AUTOLOAD:=$(call AutoLoad,50, \
+	$(if $(CONFIG_USB_FOTG210_HCD),fotg210-hcd@lt6.1) \
+	$(if $(CONFIG_USB_FOTG210),fotg210@ge6.1),1)
+  $(call AddDepends/usb)
+endef
+
+$(eval $(call KernelPackage,usb-fotg210))