Convert selectors of GENERIC_GPIO to GPIOLIB
GENERIC_GPIO is now equivalent to GPIOLIB and features that depended on GENERIC_GPIO can now depend on GPIOLIB to allow removal of this option. Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
parent
a2523d3cda
commit
76ec9d18b8
25 changed files with 52 additions and 52 deletions
|
@ -156,7 +156,7 @@ source "mm/Kconfig"
|
|||
|
||||
config LEDS
|
||||
def_bool y
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
|
||||
config ALIGNMENT_TRAP
|
||||
def_bool y
|
||||
|
|
|
@ -16,7 +16,7 @@ comment "Extcon Device Drivers"
|
|||
|
||||
config EXTCON_GPIO
|
||||
tristate "GPIO extcon support"
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
help
|
||||
Say Y here to enable GPIO based extcon support. Note that GPIO
|
||||
extcon supports single state per extcon instance.
|
||||
|
|
|
@ -363,7 +363,7 @@ config I2C_BLACKFIN_TWI_CLK_KHZ
|
|||
|
||||
config I2C_CBUS_GPIO
|
||||
tristate "CBUS I2C driver"
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
help
|
||||
Support for CBUS access using I2C API. Mostly relevant for Nokia
|
||||
Internet Tablets (770, N800 and N810).
|
||||
|
@ -436,7 +436,7 @@ config I2C_EG20T
|
|||
|
||||
config I2C_GPIO
|
||||
tristate "GPIO-based bitbanging I2C"
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
select I2C_ALGOBIT
|
||||
help
|
||||
This is a very simple bitbanging I2C driver utilizing the
|
||||
|
|
|
@ -7,7 +7,7 @@ menu "Multiplexer I2C Chip support"
|
|||
|
||||
config I2C_MUX_GPIO
|
||||
tristate "GPIO-based I2C multiplexer"
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
help
|
||||
If you say yes to this option, support will be included for a
|
||||
GPIO based I2C multiplexer. This driver provides access to
|
||||
|
|
|
@ -175,7 +175,7 @@ config KEYBOARD_EP93XX
|
|||
|
||||
config KEYBOARD_GPIO
|
||||
tristate "GPIO Buttons"
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
help
|
||||
This driver implements support for buttons connected
|
||||
to GPIO pins of various CPUs (and some other chips).
|
||||
|
@ -190,7 +190,7 @@ config KEYBOARD_GPIO
|
|||
|
||||
config KEYBOARD_GPIO_POLLED
|
||||
tristate "Polled GPIO buttons"
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
select INPUT_POLLDEV
|
||||
help
|
||||
This driver implements support for buttons connected
|
||||
|
@ -241,7 +241,7 @@ config KEYBOARD_TCA8418
|
|||
|
||||
config KEYBOARD_MATRIX
|
||||
tristate "GPIO driven matrix keypad support"
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
select INPUT_MATRIXKMAP
|
||||
help
|
||||
Enable support for GPIO driven matrix keypad.
|
||||
|
|
|
@ -214,7 +214,7 @@ config INPUT_APANEL
|
|||
config INPUT_GP2A
|
||||
tristate "Sharp GP2AP002A00F I2C Proximity/Opto sensor driver"
|
||||
depends on I2C
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
help
|
||||
Say Y here if you have a Sharp GP2AP002A00F proximity/als combo-chip
|
||||
hooked to an I2C bus.
|
||||
|
@ -224,7 +224,7 @@ config INPUT_GP2A
|
|||
|
||||
config INPUT_GPIO_TILT_POLLED
|
||||
tristate "Polled GPIO tilt switch"
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
select INPUT_POLLDEV
|
||||
help
|
||||
This driver implements support for tilt switches connected
|
||||
|
@ -472,7 +472,7 @@ config INPUT_PWM_BEEPER
|
|||
|
||||
config INPUT_GPIO_ROTARY_ENCODER
|
||||
tristate "Rotary encoders connected to GPIO pins"
|
||||
depends on GPIOLIB && GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
help
|
||||
Say Y here to add support for rotary encoders connected to GPIO lines.
|
||||
Check file:Documentation/input/rotary-encoder.txt for more
|
||||
|
@ -484,7 +484,7 @@ config INPUT_GPIO_ROTARY_ENCODER
|
|||
config INPUT_RB532_BUTTON
|
||||
tristate "Mikrotik Routerboard 532 button interface"
|
||||
depends on MIKROTIK_RB532
|
||||
depends on GPIOLIB && GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
select INPUT_POLLDEV
|
||||
help
|
||||
Say Y here if you want support for the S1 button built into
|
||||
|
|
|
@ -295,7 +295,7 @@ config MOUSE_VSXXXAA
|
|||
|
||||
config MOUSE_GPIO
|
||||
tristate "GPIO mouse"
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
select INPUT_POLLDEV
|
||||
help
|
||||
This driver simulates a mouse on GPIO lines of various CPUs (and some
|
||||
|
|
|
@ -173,7 +173,7 @@ config LEDS_PCA9532_GPIO
|
|||
config LEDS_GPIO
|
||||
tristate "LED Support for GPIO connected LEDs"
|
||||
depends on LEDS_CLASS
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
help
|
||||
This option enables support for the LEDs connected to GPIO
|
||||
outputs. To be useful the particular board must have LEDs
|
||||
|
@ -352,7 +352,7 @@ config LEDS_INTEL_SS4200
|
|||
config LEDS_LT3593
|
||||
tristate "LED driver for LT3593 controllers"
|
||||
depends on LEDS_CLASS
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
help
|
||||
This option enables support for LEDs driven by a Linear Technology
|
||||
LT3593 controller. This controller uses a special one-wire pulse
|
||||
|
@ -421,7 +421,7 @@ config LEDS_ASIC3
|
|||
|
||||
config LEDS_RENESAS_TPU
|
||||
bool "LED support for Renesas TPU"
|
||||
depends on LEDS_CLASS=y && HAVE_CLK && GENERIC_GPIO
|
||||
depends on LEDS_CLASS=y && HAVE_CLK && GPIOLIB
|
||||
help
|
||||
This option enables build of the LED TPU platform driver,
|
||||
suitable to drive any TPU channel on newer Renesas SoCs.
|
||||
|
|
|
@ -419,7 +419,7 @@ config MTD_BFIN_ASYNC
|
|||
|
||||
config MTD_GPIO_ADDR
|
||||
tristate "GPIO-assisted Flash Chip Support"
|
||||
depends on GENERIC_GPIO || GPIOLIB
|
||||
depends on GPIOLIB
|
||||
depends on MTD_COMPLEX_MAPPINGS
|
||||
help
|
||||
Map driver which allows flashes to be partially physically addressed
|
||||
|
|
|
@ -89,7 +89,7 @@ config MTD_NAND_H1900
|
|||
|
||||
config MTD_NAND_GPIO
|
||||
tristate "GPIO NAND Flash driver"
|
||||
depends on GENERIC_GPIO && ARM
|
||||
depends on GPIOLIB && ARM
|
||||
help
|
||||
This enables a GPIO based NAND flash driver.
|
||||
|
||||
|
|
|
@ -126,7 +126,7 @@ config MDIO_BITBANG
|
|||
|
||||
config MDIO_GPIO
|
||||
tristate "Support for GPIO lib-based bitbanged MDIO buses"
|
||||
depends on MDIO_BITBANG && GENERIC_GPIO
|
||||
depends on MDIO_BITBANG && GPIOLIB
|
||||
---help---
|
||||
Supports GPIO lib-based MDIO busses.
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ if ARCH_SHMOBILE || SUPERH
|
|||
|
||||
config PINCTRL_SH_PFC
|
||||
# XXX move off the gpio dependency
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
select GPIO_SH_PFC if ARCH_REQUIRE_GPIOLIB
|
||||
select PINMUX
|
||||
select PINCONF
|
||||
|
@ -34,19 +34,19 @@ config PINCTRL_PFC_R8A7779
|
|||
config PINCTRL_PFC_SH7203
|
||||
def_bool y
|
||||
depends on CPU_SUBTYPE_SH7203
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
select PINCTRL_SH_PFC
|
||||
|
||||
config PINCTRL_PFC_SH7264
|
||||
def_bool y
|
||||
depends on CPU_SUBTYPE_SH7264
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
select PINCTRL_SH_PFC
|
||||
|
||||
config PINCTRL_PFC_SH7269
|
||||
def_bool y
|
||||
depends on CPU_SUBTYPE_SH7269
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
select PINCTRL_SH_PFC
|
||||
|
||||
config PINCTRL_PFC_SH7372
|
||||
|
@ -62,55 +62,55 @@ config PINCTRL_PFC_SH73A0
|
|||
config PINCTRL_PFC_SH7720
|
||||
def_bool y
|
||||
depends on CPU_SUBTYPE_SH7720
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
select PINCTRL_SH_PFC
|
||||
|
||||
config PINCTRL_PFC_SH7722
|
||||
def_bool y
|
||||
depends on CPU_SUBTYPE_SH7722
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
select PINCTRL_SH_PFC
|
||||
|
||||
config PINCTRL_PFC_SH7723
|
||||
def_bool y
|
||||
depends on CPU_SUBTYPE_SH7723
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
select PINCTRL_SH_PFC
|
||||
|
||||
config PINCTRL_PFC_SH7724
|
||||
def_bool y
|
||||
depends on CPU_SUBTYPE_SH7724
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
select PINCTRL_SH_PFC
|
||||
|
||||
config PINCTRL_PFC_SH7734
|
||||
def_bool y
|
||||
depends on CPU_SUBTYPE_SH7734
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
select PINCTRL_SH_PFC
|
||||
|
||||
config PINCTRL_PFC_SH7757
|
||||
def_bool y
|
||||
depends on CPU_SUBTYPE_SH7757
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
select PINCTRL_SH_PFC
|
||||
|
||||
config PINCTRL_PFC_SH7785
|
||||
def_bool y
|
||||
depends on CPU_SUBTYPE_SH7785
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
select PINCTRL_SH_PFC
|
||||
|
||||
config PINCTRL_PFC_SH7786
|
||||
def_bool y
|
||||
depends on CPU_SUBTYPE_SH7786
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
select PINCTRL_SH_PFC
|
||||
|
||||
config PINCTRL_PFC_SHX3
|
||||
def_bool y
|
||||
depends on CPU_SUBTYPE_SHX3
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
select PINCTRL_SH_PFC
|
||||
|
||||
endif
|
||||
|
|
|
@ -66,7 +66,7 @@ config REGULATOR_USERSPACE_CONSUMER
|
|||
|
||||
config REGULATOR_GPIO
|
||||
tristate "GPIO regulator support"
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
help
|
||||
This driver provides support for regulators that can be
|
||||
controlled via gpios.
|
||||
|
|
|
@ -61,7 +61,7 @@ config SPI_ALTERA
|
|||
|
||||
config SPI_ATH79
|
||||
tristate "Atheros AR71XX/AR724X/AR913X SPI controller driver"
|
||||
depends on ATH79 && GENERIC_GPIO
|
||||
depends on ATH79 && GPIOLIB
|
||||
select SPI_BITBANG
|
||||
help
|
||||
This enables support for the SPI controller present on the
|
||||
|
@ -163,7 +163,7 @@ config SPI_FALCON
|
|||
|
||||
config SPI_GPIO
|
||||
tristate "GPIO-based bitbanging SPI Master"
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
select SPI_BITBANG
|
||||
help
|
||||
This simple GPIO bitbanging SPI master uses the arch-neutral GPIO
|
||||
|
@ -240,7 +240,7 @@ config SPI_FSL_ESPI
|
|||
|
||||
config SPI_OC_TINY
|
||||
tristate "OpenCores tiny SPI"
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
select SPI_BITBANG
|
||||
help
|
||||
This is the driver for OpenCores tiny SPI master controller.
|
||||
|
@ -430,7 +430,7 @@ config SPI_TOPCLIFF_PCH
|
|||
|
||||
config SPI_TXX9
|
||||
tristate "Toshiba TXx9 SPI controller"
|
||||
depends on GENERIC_GPIO && CPU_TX49XX
|
||||
depends on GPIOLIB && CPU_TX49XX
|
||||
help
|
||||
SPI driver for Toshiba TXx9 MIPS SoCs
|
||||
|
||||
|
|
|
@ -54,7 +54,7 @@ config ANDROID_TIMED_OUTPUT
|
|||
|
||||
config ANDROID_TIMED_GPIO
|
||||
tristate "Android timed gpio driver"
|
||||
depends on GENERIC_GPIO && ANDROID_TIMED_OUTPUT
|
||||
depends on GPIOLIB && ANDROID_TIMED_OUTPUT
|
||||
default n
|
||||
|
||||
config ANDROID_LOW_MEMORY_KILLER
|
||||
|
|
|
@ -61,7 +61,7 @@ config LIS3L02DQ
|
|||
depends on SPI
|
||||
select IIO_TRIGGER if IIO_BUFFER
|
||||
depends on !IIO_BUFFER || IIO_KFIFO_BUF
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
help
|
||||
Say yes here to build SPI support for the ST microelectronics
|
||||
accelerometer. The driver supplies direct access via sysfs files
|
||||
|
|
|
@ -73,7 +73,7 @@ config AD7780
|
|||
config AD7816
|
||||
tristate "Analog Devices AD7816/7/8 temperature sensor and ADC driver"
|
||||
depends on SPI
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
help
|
||||
Say yes here to build support for Analog Devices AD7816/7/8
|
||||
temperature sensors and ADC.
|
||||
|
|
|
@ -5,7 +5,7 @@ menu "Analog digital bi-direction converters"
|
|||
|
||||
config ADT7316
|
||||
tristate "Analog Devices ADT7316/7/8 ADT7516/7/9 temperature sensor, ADC and DAC driver"
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
help
|
||||
Say yes here to build support for Analog Devices ADT7316, ADT7317, ADT7318
|
||||
and ADT7516, ADT7517, ADT7519 temperature sensors, ADC and DAC.
|
||||
|
|
|
@ -13,7 +13,7 @@ config AD2S90
|
|||
config AD2S1200
|
||||
tristate "Analog Devices ad2s1200/ad2s1205 driver"
|
||||
depends on SPI
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
help
|
||||
Say yes here to build support for Analog Devices spi resolver
|
||||
to digital converters, ad2s1200 and ad2s1205, provides direct access
|
||||
|
@ -22,7 +22,7 @@ config AD2S1200
|
|||
config AD2S1210
|
||||
tristate "Analog Devices ad2s1210 driver"
|
||||
depends on SPI
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
help
|
||||
Say yes here to build support for Analog Devices spi resolver
|
||||
to digital converters, ad2s1210, provides direct access via sysfs.
|
||||
|
|
|
@ -14,7 +14,7 @@ config IIO_PERIODIC_RTC_TRIGGER
|
|||
|
||||
config IIO_GPIO_TRIGGER
|
||||
tristate "GPIO trigger"
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
help
|
||||
Provides support for using GPIO pins as IIO triggers.
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@ if USB || USB_GADGET
|
|||
#
|
||||
config USB_GPIO_VBUS
|
||||
tristate "GPIO based peripheral-only VBUS sensing 'transceiver'"
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
select USB_OTG_UTILS
|
||||
help
|
||||
Provides simple GPIO VBUS sensing for controllers with an
|
||||
|
|
|
@ -2481,7 +2481,7 @@ config FB_SSD1307
|
|||
tristate "Solomon SSD1307 framebuffer support"
|
||||
depends on FB && I2C
|
||||
depends on OF
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
select FB_SYS_FOPS
|
||||
select FB_SYS_FILLRECT
|
||||
select FB_SYS_COPYAREA
|
||||
|
|
|
@ -36,14 +36,14 @@ config LCD_CORGI
|
|||
|
||||
config LCD_L4F00242T03
|
||||
tristate "Epson L4F00242T03 LCD"
|
||||
depends on SPI_MASTER && GENERIC_GPIO
|
||||
depends on SPI_MASTER && GPIOLIB
|
||||
help
|
||||
SPI driver for Epson L4F00242T03. This provides basic support
|
||||
for init and powering the LCD up/down through a sysfs interface.
|
||||
|
||||
config LCD_LMS283GF05
|
||||
tristate "Samsung LMS283GF05 LCD"
|
||||
depends on SPI_MASTER && GENERIC_GPIO
|
||||
depends on SPI_MASTER && GPIOLIB
|
||||
help
|
||||
SPI driver for Samsung LMS283GF05. This provides basic support
|
||||
for powering the LCD up/down through a sysfs interface.
|
||||
|
|
|
@ -50,7 +50,7 @@ config W1_MASTER_DS1WM
|
|||
|
||||
config W1_MASTER_GPIO
|
||||
tristate "GPIO 1-wire busmaster"
|
||||
depends on GENERIC_GPIO
|
||||
depends on GPIOLIB
|
||||
help
|
||||
Say Y here if you want to communicate with your 1-wire devices using
|
||||
GPIO pins. This driver uses the GPIO API to control the wire.
|
||||
|
|
|
@ -39,7 +39,7 @@ struct gpio {
|
|||
const char *label;
|
||||
};
|
||||
|
||||
#ifdef CONFIG_GENERIC_GPIO
|
||||
#ifdef CONFIG_GPIOLIB
|
||||
|
||||
#ifdef CONFIG_ARCH_HAVE_CUSTOM_GPIO_H
|
||||
#include <asm/gpio.h>
|
||||
|
@ -74,7 +74,7 @@ static inline int irq_to_gpio(unsigned int irq)
|
|||
|
||||
#endif /* ! CONFIG_ARCH_HAVE_CUSTOM_GPIO_H */
|
||||
|
||||
#else /* ! CONFIG_GENERIC_GPIO */
|
||||
#else /* ! CONFIG_GPIOLIB */
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/types.h>
|
||||
|
@ -226,7 +226,7 @@ gpiochip_remove_pin_ranges(struct gpio_chip *chip)
|
|||
WARN_ON(1);
|
||||
}
|
||||
|
||||
#endif /* ! CONFIG_GENERIC_GPIO */
|
||||
#endif /* ! CONFIG_GPIOLIB */
|
||||
|
||||
struct device;
|
||||
|
||||
|
|
Loading…
Reference in a new issue