From: Luka Perkov Date: Sun, 4 Aug 2013 14:20:15 +0000 (+0000) Subject: imx6: sync usb chipidea with upstream X-Git-Tag: reboot~9573 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f5b9555cdc26534b6a107ef6c27440b21e1f1e0e;p=oweals%2Fopenwrt.git imx6: sync usb chipidea with upstream Signed-off-by: Luka Perkov SVN-Revision: 37686 --- diff --git a/target/linux/imx6/patches-3.10/0001-usb-chipidea-improve-kconfig.patch b/target/linux/imx6/patches-3.10/0001-usb-chipidea-improve-kconfig.patch index 2956bd9898..da46405f73 100644 --- a/target/linux/imx6/patches-3.10/0001-usb-chipidea-improve-kconfig.patch +++ b/target/linux/imx6/patches-3.10/0001-usb-chipidea-improve-kconfig.patch @@ -59,8 +59,6 @@ Signed-off-by: Greg Kroah-Hartman drivers/usb/chipidea/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/drivers/usb/chipidea/Kconfig b/drivers/usb/chipidea/Kconfig -index b2df442..eb2aa2e 100644 --- a/drivers/usb/chipidea/Kconfig +++ b/drivers/usb/chipidea/Kconfig @@ -12,15 +12,15 @@ if USB_CHIPIDEA @@ -82,6 +80,3 @@ index b2df442..eb2aa2e 100644 select USB_EHCI_ROOT_HUB_TT help Say Y here to enable host controller functionality of the --- -1.8.3.3 - diff --git a/target/linux/imx6/patches-3.10/0002-usb-chipidea-enable-to-build-host-support-as-module.patch b/target/linux/imx6/patches-3.10/0002-usb-chipidea-enable-to-build-host-support-as-module.patch deleted file mode 100644 index e2db7ca4f7..0000000000 --- a/target/linux/imx6/patches-3.10/0002-usb-chipidea-enable-to-build-host-support-as-module.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f4087fcf07cce987f5ce3c42d6aee87b7b4f82b8 Mon Sep 17 00:00:00 2001 -From: Luka Perkov -Date: Sun, 28 Jul 2013 20:33:01 +0200 -Subject: [PATCH] usb: chipidea: enable to build host support as module - -USB_CHIPIDEA_HOST does not need to depend on USB=y, USB_CHIPIDEA_HOST will work -just fine even if USB=m is used. The depends line can be safely removed since -USB_CHIPIDEA already depends on USB. - -Tested on Gateworks imx6 Ventana board (gw-5400-a). - -Signed-off-by: Luka Perkov ---- - drivers/usb/chipidea/Kconfig | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/drivers/usb/chipidea/Kconfig b/drivers/usb/chipidea/Kconfig -index eb2aa2e..c9477e3 100644 ---- a/drivers/usb/chipidea/Kconfig -+++ b/drivers/usb/chipidea/Kconfig -@@ -19,7 +19,6 @@ config USB_CHIPIDEA_UDC - - config USB_CHIPIDEA_HOST - bool "ChipIdea host controller" -- depends on USB=y - depends on USB_EHCI_HCD=y || USB_CHIPIDEA=m - select USB_EHCI_ROOT_HUB_TT - help --- -1.8.3.3 - diff --git a/target/linux/imx6/patches-3.10/0002-usb-chipidea-fix-the-build-error-with-randconfig.patch b/target/linux/imx6/patches-3.10/0002-usb-chipidea-fix-the-build-error-with-randconfig.patch new file mode 100644 index 0000000000..b921dfd9e0 --- /dev/null +++ b/target/linux/imx6/patches-3.10/0002-usb-chipidea-fix-the-build-error-with-randconfig.patch @@ -0,0 +1,44 @@ +From 972a6c5d56b42d6dd326867d5974ffa58383ec53 Mon Sep 17 00:00:00 2001 +From: Peter Chen +Date: Mon, 29 Jul 2013 13:09:57 +0300 +Subject: [PATCH] usb: chipidea: fix the build error with randconfig + +Using below configs, the compile will have error: +ERROR: "ehci_init_driver" undefined! + +.config: +CONFIG_USB_CHIPIDEA=m +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_CHIPIDEA_DEBUG=y + +The reason is chipidea host uses symbol from ehci, but ehci +is not compiled. Let the chipidea host depend on +ehci even it is built as module. + +Signed-off-by: Peter Chen +Signed-off-by: Alexander Shishkin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/chipidea/Kconfig | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/usb/chipidea/Kconfig ++++ b/drivers/usb/chipidea/Kconfig +@@ -12,7 +12,7 @@ if USB_CHIPIDEA + + config USB_CHIPIDEA_UDC + bool "ChipIdea device controller" +- depends on USB_GADGET=y || USB_CHIPIDEA=m ++ depends on USB_GADGET=y || (USB_CHIPIDEA=m && USB_GADGET=m) + help + Say Y here to enable device controller functionality of the + ChipIdea driver. +@@ -20,7 +20,7 @@ config USB_CHIPIDEA_UDC + config USB_CHIPIDEA_HOST + bool "ChipIdea host controller" + depends on USB=y +- depends on USB_EHCI_HCD=y || USB_CHIPIDEA=m ++ depends on USB_EHCI_HCD=y || (USB_CHIPIDEA=m && USB_EHCI_HCD=m) + select USB_EHCI_ROOT_HUB_TT + help + Say Y here to enable host controller functionality of the diff --git a/target/linux/imx6/patches-3.10/0003-usb-chipidea-enable-to-build-host-support-as-module.patch b/target/linux/imx6/patches-3.10/0003-usb-chipidea-enable-to-build-host-support-as-module.patch new file mode 100644 index 0000000000..9d922536eb --- /dev/null +++ b/target/linux/imx6/patches-3.10/0003-usb-chipidea-enable-to-build-host-support-as-module.patch @@ -0,0 +1,26 @@ +From f51ac206b1ca27d240fe7fde6975496d558f51df Mon Sep 17 00:00:00 2001 +From: Luka Perkov +Date: Sun, 4 Aug 2013 03:10:59 +0200 +Subject: [PATCH] usb: chipidea: enable to build host support as module + +USB_CHIPIDEA_HOST does not need to depend on USB=y, USB_CHIPIDEA_HOST will work +just fine even if USB=m is used. The depends line can be safely removed since +USB_CHIPIDEA already depends on USB. + +Tested on Gateworks imx6 Ventana board (gw-5400-a). + +Signed-off-by: Luka Perkov +--- + drivers/usb/chipidea/Kconfig | 1 - + 1 file changed, 1 deletion(-) + +--- a/drivers/usb/chipidea/Kconfig ++++ b/drivers/usb/chipidea/Kconfig +@@ -19,7 +19,6 @@ config USB_CHIPIDEA_UDC + + config USB_CHIPIDEA_HOST + bool "ChipIdea host controller" +- depends on USB=y + depends on USB_EHCI_HCD=y || (USB_CHIPIDEA=m && USB_EHCI_HCD=m) + select USB_EHCI_ROOT_HUB_TT + help