pinctrl: Do not depend in GPIOLIB, select it

Instead of depends on GPIOLIB and having to run around in
Kconfig menus looking for why your device is not available,
simply select it from the pin control drivers that need it.

The Kconfig for GPIOLIB is improved, selectable and this
should "just work".

Cc: Phil Reid <preid@electromag.com.au>
Cc: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Cc: Peter Rosin <peda@axentia.se>
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 8da29e9e1bb2d7171597b6076108439c4875c05c..034822c7144d1f956996bdb069b0135fe5c87790 100644 (file)
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -97,7 +97,7 @@ config PINCTRL_AT91PIO4
 
 config PINCTRL_AMD
        tristate "AMD GPIO pin control"
-       depends on GPIOLIB
+       select GPIOLIB
        select GPIOLIB_IRQCHIP
        select PINCONF
        select GENERIC_PINCONF
@@ -156,6 +156,7 @@ config PINCTRL_MCP23S08
        tristate "Microchip MCP23xxx I/O expander"
        depends on SPI_MASTER || I2C
        depends on I2C || I2C=n
+       select GPIOLIB
        select GPIOLIB_IRQCHIP
        select REGMAP_I2C if I2C
        select REGMAP_SPI if SPI_MASTER
@@ -224,10 +225,11 @@ config PINCTRL_SIRF
 
 config PINCTRL_SX150X
        bool "Semtech SX150x I2C GPIO expander pinctrl driver"
-       depends on GPIOLIB && I2C=y
+       depends on I2C=y
        select PINMUX
        select PINCONF
        select GENERIC_PINCONF
+       select GPIOLIB
        select GPIOLIB_IRQCHIP
        select REGMAP
        help

diff --git a/drivers/pinctrl/intel/Kconfig b/drivers/pinctrl/intel/Kconfig
index f30720a752f34b341c8c43359315a47385eb8ae0..7fb1b9937c398f5e6221fd350b0c1318da9328c0 100644 (file)
--- a/drivers/pinctrl/intel/Kconfig
+++ b/drivers/pinctrl/intel/Kconfig
@@ -5,7 +5,8 @@ if (X86 || COMPILE_TEST)
 
 config PINCTRL_BAYTRAIL
        bool "Intel Baytrail GPIO pin control"
-       depends on GPIOLIB && ACPI
+       depends on ACPI
+       select GPIOLIB
        select GPIOLIB_IRQCHIP
        select PINMUX
        select PINCONF