diff options
| author | Lothar Waßmann <LW@KARO-electronics.de> | 2013-08-14 05:43:58 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-14 15:34:16 -0400 |
| commit | a0cfdc6bc73bc47b63b05b850cf66cf67f2487bf (patch) | |
| tree | f40902df4bda6a94e3ca2df22e62069bafb9a740 | |
| parent | 9d84d551169ae24830f7f47a04f57736805dae92 (diff) | |
usb: chipidea: improve kconfig 2.0
This patch provides a cleaner solution to the problem described in
commit 20a677fd ("usb: chipidea: improve kconfig").
The goal to be achieved is to force USB_CHIPIDEA=m if either
USB_EHCI_HCD=m or USB_GADGET=m.
If both are 'y' USB_CHIPIDEA may be selected to be 'm' or 'y'.
The old patch had the drawback, that USB_CHIPIDEA could be chosen as
'y' though USB_EHCI_HCD or USB_GADGET (or both) were 'm' leading to a
situation where USB_CHIPIDEA_HOST or USB_CHIPIDEA_UDC vanished from
the config options producing a compilable but dysfunctional driver.
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Reviewed-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/chipidea/Kconfig | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/chipidea/Kconfig b/drivers/usb/chipidea/Kconfig index d1bd8ef1f9c1..4a851e15e58c 100644 --- a/drivers/usb/chipidea/Kconfig +++ b/drivers/usb/chipidea/Kconfig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | config USB_CHIPIDEA | 1 | config USB_CHIPIDEA |
| 2 | tristate "ChipIdea Highspeed Dual Role Controller" | 2 | tristate "ChipIdea Highspeed Dual Role Controller" |
| 3 | depends on USB || USB_GADGET | 3 | depends on (USB_EHCI_HCD && USB_GADGET) || (USB_EHCI_HCD && !USB_GADGET) || (!USB_EHCI_HCD && USB_GADGET) |
| 4 | help | 4 | help |
| 5 | Say Y here if your system has a dual role high speed USB | 5 | Say Y here if your system has a dual role high speed USB |
| 6 | controller based on ChipIdea silicon IP. Currently, only the | 6 | controller based on ChipIdea silicon IP. Currently, only the |
| @@ -12,15 +12,14 @@ if USB_CHIPIDEA | |||
| 12 | 12 | ||
| 13 | config USB_CHIPIDEA_UDC | 13 | config USB_CHIPIDEA_UDC |
| 14 | bool "ChipIdea device controller" | 14 | bool "ChipIdea device controller" |
| 15 | depends on USB_GADGET=y || (USB_CHIPIDEA=m && USB_GADGET=m) | 15 | depends on USB_GADGET |
| 16 | help | 16 | help |
| 17 | Say Y here to enable device controller functionality of the | 17 | Say Y here to enable device controller functionality of the |
| 18 | ChipIdea driver. | 18 | ChipIdea driver. |
| 19 | 19 | ||
| 20 | config USB_CHIPIDEA_HOST | 20 | config USB_CHIPIDEA_HOST |
| 21 | bool "ChipIdea host controller" | 21 | bool "ChipIdea host controller" |
| 22 | depends on USB=y | 22 | depends on USB_EHCI_HCD |
| 23 | depends on USB_EHCI_HCD=y || (USB_CHIPIDEA=m && USB_EHCI_HCD=m) | ||
| 24 | select USB_EHCI_ROOT_HUB_TT | 23 | select USB_EHCI_ROOT_HUB_TT |
| 25 | help | 24 | help |
| 26 | Say Y here to enable host controller functionality of the | 25 | Say Y here to enable host controller functionality of the |