kernel: Fix usb-chipidea dependency on ulpi.ko for 4.19
authorPetr Štetiar <[email protected]>
Mon, 17 Dec 2018 23:19:30 +0000 (00:19 +0100)
committerHauke Mehrtens <[email protected]>
Tue, 18 Dec 2018 19:17:22 +0000 (20:17 +0100)
It seems, that since Linux 4.18-rc2 ci_hdrc depends on ulpi.

 commit a930d8bd94d8db7715d1af74299f710b1fb22fc8
 Author: Fabio Estevam <[email protected]>
 Date:   Wed Jul 4 10:09:58 2018 -0300

    usb: chipidea: Always build ULPI code

    Commit 03e6275ae381 ("usb: chipidea: Fix ULPI on imx51") causes a kernel
    hang on imx51 systems that use the ULPI interface and do not select the
    CONFIG_USB_CHIPIDEA_ULPI option.

    In order to avoid such potential misuse, let's always build the
    chipidea ULPI code into the final ci_hdrc object.

Signed-off-by: Petr Štetiar <[email protected]>
package/kernel/linux/modules/usb.mk

index 748e7ede8454cb81095d3ffab43a9b579a999e11..fafa9a021e10c3f965f0325e99db3375fa45c4ab 100644 (file)
@@ -1565,7 +1565,8 @@ define KernelPackage/usb-chipidea
   FILES:= \
        $(LINUX_DIR)/drivers/extcon/[email protected] \
        $(LINUX_DIR)/drivers/extcon/[email protected] \
-       $(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc.ko
+       $(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc.ko \
+       $(LINUX_DIR)/drivers/usb/common/[email protected]
   AUTOLOAD:=$(call AutoLoad,39,ci_hdrc,1)
   $(call AddDepends/usb)
 endef