chipidea: introduce specific Kconfig options for glue drivers

This patch introduces USB_CHIPIDEA_PCI and USB_CHIPIDEA_OF Kconfig options, one
per each specific glue driver. This is needed to provide different dependencies
they have.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/chipidea/Kconfig b/drivers/usb/chipidea/Kconfig
index 77b47d82c9a69d05d7985068fb956f961b6481f1..8b0edb9c62463c02faa653b1e8bf4c114893cdfd 100644 (file)
--- a/drivers/usb/chipidea/Kconfig
+++ b/drivers/usb/chipidea/Kconfig
@@ -10,6 +10,16 @@ config USB_CHIPIDEA
 
 if USB_CHIPIDEA
 
+config USB_CHIPIDEA_OF
+       tristate
+       depends on OF
+       default USB_CHIPIDEA
+
+config USB_CHIPIDEA_PCI
+       tristate
+       depends on PCI
+       default USB_CHIPIDEA
+
 config USB_CHIPIDEA_UDC
        bool "ChipIdea device controller"
        depends on USB_GADGET

diff --git a/drivers/usb/chipidea/Makefile b/drivers/usb/chipidea/Makefile
index 1fc86a2ca22d54c551eb9c09689d0b1318feaa5f..4decb12f25786221690c5adca6bb4448512039b1 100644 (file)
--- a/drivers/usb/chipidea/Makefile
+++ b/drivers/usb/chipidea/Makefile
@@ -14,11 +14,6 @@ obj-$(CONFIG_USB_CHIPIDEA)   += ci_hdrc_usb2.o
 obj-$(CONFIG_USB_CHIPIDEA)     += ci_hdrc_msm.o
 obj-$(CONFIG_USB_CHIPIDEA)     += ci_hdrc_zevio.o
 
-# PCI doesn't provide stubs, need to check
-ifneq ($(CONFIG_PCI),)
-       obj-$(CONFIG_USB_CHIPIDEA)      += ci_hdrc_pci.o
-endif
+obj-$(CONFIG_USB_CHIPIDEA_PCI) += ci_hdrc_pci.o
 
-ifneq ($(CONFIG_OF),)
-       obj-$(CONFIG_USB_CHIPIDEA)      += usbmisc_imx.o ci_hdrc_imx.o
-endif
+obj-$(CONFIG_USB_CHIPIDEA_OF)  += usbmisc_imx.o ci_hdrc_imx.o