target/linux/imx6/patches-3.10/0003-usb-chipidea-improve-kconfig-2.0.patch

   1 From: Lothar Waßmann <LW@KARO-electronics.de>
   2 Subject: [PATCH] usb: chipidea: improve kconfig 2.0
   3
   4 This patch provides a cleaner solution to the problem described in
   5 commit 20a677fd ("usb: chipidea: improve kconfig").
   6
   7 The goal to be achieved is to force USB_CHIPIDEA=m if either
   8 USB_EHCI_HCD=m or USB_GADGET=m.
   9 If both are 'y' USB_CHIPIDEA may be selected to be 'm' or 'y'.
  10
  11 The old patch had the drawback, that USB_CHIPIDEA could be chosen as
  12 'y' though USB_EHCI_HCD or USB_GADGET (or both) were 'm' leading to a
  13 situation where USB_CHIPIDEA_HOST or USB_CHIPIDEA_UDC vanished from
  14 the config options producing a compilable but dysfunctional driver.
  15
  16 Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
  17 Reviewed-by: Peter Chen <peter.chen@freescale.com>
  18 Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
  19 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  20 ---
  21  drivers/usb/chipidea/Kconfig | 7 +++----
  22  1 file changed, 3 insertions(+), 4 deletions(-)
  23
  24 --- a/drivers/usb/chipidea/Kconfig
  25 +++ b/drivers/usb/chipidea/Kconfig
  26 @@ -1,6 +1,6 @@
  27  config USB_CHIPIDEA
  28         tristate "ChipIdea Highspeed Dual Role Controller"
  29 -       depends on USB || USB_GADGET
  30 +       depends on (USB_EHCI_HCD && USB_GADGET) || (USB_EHCI_HCD && !USB_GADGET) || (!USB_EHCI_HCD && USB_GADGET)
  31         help
  32           Say Y here if your system has a dual role high speed USB
  33           controller based on ChipIdea silicon IP. Currently, only the
  34 @@ -12,15 +12,14 @@ if USB_CHIPIDEA
  35
  36  config USB_CHIPIDEA_UDC
  37         bool "ChipIdea device controller"
  38 -       depends on USB_GADGET=y || (USB_CHIPIDEA=m && USB_GADGET=m)
  39 +       depends on USB_GADGET
  40         help
  41           Say Y here to enable device controller functionality of the
  42           ChipIdea driver.
  43
  44  config USB_CHIPIDEA_HOST
  45         bool "ChipIdea host controller"
  46 -       depends on USB=y
  47 -       depends on USB_EHCI_HCD=y || (USB_CHIPIDEA=m && USB_EHCI_HCD=m)
  48 +       depends on USB_EHCI_HCD
  49         select USB_EHCI_ROOT_HUB_TT
  50         help
  51           Say Y here to enable host controller functionality of the