domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

layerscape: unbreak ehci-fsl interaction with mpc85xx

Browse Source 
Both targets have their own idea of how to use ehci-fsl.
This patch reverts part of commit
68b8d3b079 ("kernel: usb: add FSL EHCI package") and moves
ehci-fsl back into kmod-usb2, while also making it hopefully
useable for the mpc85xx target.

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
This commit is contained in:
Christian Lamparter
2019-04-14 22:34:52 +02:00
parent 324e94f31b
commit d599890efd
2 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
package/kernel/linux/modules/usb.mk
View File

@@ -385,7 +385,8 @@ define KernelPackage/usb2
CONFIG_USB_EHCI_MXC=y \ CONFIG_USB_EHCI_MXC=y \
CONFIG_USB_OCTEON_EHCI=y \ CONFIG_USB_OCTEON_EHCI=y \
CONFIG_USB_EHCI_HCD_ORION=y \ CONFIG_USB_EHCI_HCD_ORION=y \
CONFIG_USB_EHCI_HCD_AT91=y CONFIG_USB_EHCI_HCD_AT91=y \
CONFIG_USB_EHCI_FSL
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/usb/host/ehci-platform.ko $(LINUX_DIR)/drivers/usb/host/ehci-platform.ko
ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/host/ehci-orion.ko),) ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/host/ehci-orion.ko),)
@@ -394,7 +395,13 @@ define KernelPackage/usb2
ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/host/ehci-atmel.ko),) ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/host/ehci-atmel.ko),)
FILES+=$(LINUX_DIR)/drivers/usb/host/ehci-atmel.ko FILES+=$(LINUX_DIR)/drivers/usb/host/ehci-atmel.ko
endif 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) $(call AddDepends/usb)
endef endef
@@ -405,26 +412,6 @@ endef
$(eval $(call KernelPackage,usb2)) $(eval $(call KernelPackage,usb2))
define KernelPackage/usb2-fsl
TITLE:=Support for Freescale USB2 controllers
DEPENDS:=+kmod-usb-ehci @TARGET_mpc85xx
KCONFIG:= \
CONFIG_USB_EHCI_HCD_PPC_OF=y \
CONFIG_USB_EHCI_FSL=y
FILES:= \
$(LINUX_DIR)/drivers/usb/host/ehci-fsl.ko \
$(LINUX_DIR)/drivers/usb/host/fsl-mph-dr-of.ko
AUTOLOAD:=$(call AutoLoad,42,ehci-fsl fsl-mph-dr-of,1)
$(call AddDepends/usb)
endef
define KernelPackage/usb2-fsl/description
Kernel support for Freescale USB2 (EHCI) controllers
endef
$(eval $(call KernelPackage,usb2-fsl))
define KernelPackage/usb2-pci define KernelPackage/usb2-pci
TITLE:=Support for PCI USB2 controllers TITLE:=Support for PCI USB2 controllers
DEPENDS:=@PCI_SUPPORT +kmod-usb2 DEPENDS:=@PCI_SUPPORT +kmod-usb2

2
target/linux/mpc85xx/Makefile
View File

@@ -22,6 +22,6 @@ include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += \ DEFAULT_PACKAGES += \
kmod-input-core kmod-input-gpio-keys kmod-button-hotplug \ kmod-input-core kmod-input-gpio-keys kmod-button-hotplug \
kmod-leds-gpio swconfig kmod-ath9k wpad-basic kmod-usb2-fsl kmod-leds-gpio swconfig kmod-ath9k wpad-basic kmod-usb2
$(eval $(call BuildTarget)) $(eval $(call BuildTarget))