mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-26 06:04:14 +08:00
5647ac0ad4
GENERIC_GPIO now synonymous with GPIOLIB. There are no longer any valid cases for enableing GENERIC_GPIO without GPIOLIB, even though it is possible to do so which has been causing confusion and breakage. This branch does the work to completely eliminate GENERIC_GPIO. However, it is not trivial to just create a branch to remove it. Over the course of the v3.9 cycle more code referencing GENERIC_GPIO has been added to linux-next that conflicts with this branch. The following must be done to resolve the conflicts when merging this branch into mainline: * "git grep CONFIG_GENERIC_GPIO" should return 0 hits. Matches should be replaced with CONFIG_GPIOLIB * "git grep '\bGENERIC_GPIO\b'" should return 1 hit in the Chinese documentation. * Selectors of GENERIC_GPIO should be turned into selectors of GPIOLIB * definitions of the option in architecture Kconfig code should be deleted. Stephen has 3 merge fixup patches[1] that do the above. They are currently applicable on mainline as of May 2nd. [1] http://www.mail-archive.com/linux-kernel@vger.kernel.org/msg428056.html -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJRifUnAAoJEEFnBt12D9kBs2YP/0U6+ia+xYvkVaJc28PDVIzn OReZNcJOYU8D5voxz0voaRD0EdcPwjbMu9Kp9aXMHlk4VxevF+8jCc/us0bIjtO1 VcB5VmSCIhMhxdnBlum11Mk7Vr5MCweyl9NBsypnPt8cl4obMBZHf2yzoodFktNb wtyYlOb6FALtc6iDbOO6dG3w9F7FAOLvskUFzdv89m8mupTsBu9jw9NqFDbJHOex rxq0Sdd+kWF/nkJVcV5Y6jIdletRlhpipefMJ9diexreHvwqh+c4kJEYZaXgB5+m ha95cPbReK1d+RqzM3A8d4irzSVSmq4k7ijI6QkFOr48+AH7XsgKv5so885LKzMN IIXg2Phm9i0H8+ecEvhcc4oIYBHJiEKK54Y0qUD9dqbFoDGPTCSqMHdSSMbpAY+J bIIXlVzj1En3PPNUJLPt8q8Qz6WxCT9mDST3QSGYnD4o90HT+1R9j92RxGL6McOq rUOyJDwmzFvpBvKK4raGdOU435M+ps2NPKKNIRaIGQPPY9rM1kN4YqvhXukEsC9L 3a3+3cQLh7iKxBHncxeQsJfethP1CPkJnzvF9r+ZZLf2rcPH4pbQIE2uO0XnX/nd 5/DKi0nGgAJ//GMMzdo3RiOA5zGFjIZ/KMvfhQldpP6qFJRhqdGi6FPlAcwr1z1n YnCByPwwlvfC4LTXFOGL =xodc -----END PGP SIGNATURE----- Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux Pull removal of GENERIC_GPIO from Grant Likely: "GENERIC_GPIO now synonymous with GPIOLIB. There are no longer any valid cases for enableing GENERIC_GPIO without GPIOLIB, even though it is possible to do so which has been causing confusion and breakage. This branch does the work to completely eliminate GENERIC_GPIO." * tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux: gpio: update gpio Chinese documentation Remove GENERIC_GPIO config option Convert selectors of GENERIC_GPIO to GPIOLIB blackfin: force use of gpiolib m68k: coldfire: use gpiolib mips: pnx833x: remove requirement for GENERIC_GPIO openrisc: default GENERIC_GPIO to false avr32: default GENERIC_GPIO to false xtensa: remove explicit selection of GENERIC_GPIO sh: replace CONFIG_GENERIC_GPIO by CONFIG_GPIOLIB powerpc: remove redundant GENERIC_GPIO selection unicore32: default GENERIC_GPIO to false unicore32: remove unneeded select GENERIC_GPIO arm: plat-orion: use GPIO driver on CONFIG_GPIOLIB arm: remove redundant GENERIC_GPIO selection mips: alchemy: require gpiolib mips: txx9: change GENERIC_GPIO to GPIOLIB mips: loongson: use GPIO driver on CONFIG_GPIOLIB mips: remove redundant GENERIC_GPIO select
63 lines
1.9 KiB
Plaintext
63 lines
1.9 KiB
Plaintext
#
|
|
# Multiplexer I2C chip drivers configuration
|
|
#
|
|
|
|
menu "Multiplexer I2C Chip support"
|
|
depends on I2C_MUX
|
|
|
|
config I2C_ARB_GPIO_CHALLENGE
|
|
tristate "GPIO-based I2C arbitration"
|
|
depends on GPIOLIB && OF
|
|
help
|
|
If you say yes to this option, support will be included for an
|
|
I2C multimaster arbitration scheme using GPIOs and a challenge &
|
|
response mechanism where masters have to claim the bus by asserting
|
|
a GPIO.
|
|
|
|
This driver can also be built as a module. If so, the module
|
|
will be called i2c-arb-gpio-challenge.
|
|
|
|
config I2C_MUX_GPIO
|
|
tristate "GPIO-based I2C multiplexer"
|
|
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
|
|
I2C busses connected through a MUX, which is controlled
|
|
through GPIO pins.
|
|
|
|
This driver can also be built as a module. If so, the module
|
|
will be called i2c-mux-gpio.
|
|
|
|
config I2C_MUX_PCA9541
|
|
tristate "NXP PCA9541 I2C Master Selector"
|
|
help
|
|
If you say yes here you get support for the NXP PCA9541
|
|
I2C Master Selector.
|
|
|
|
This driver can also be built as a module. If so, the module
|
|
will be called i2c-mux-pca9541.
|
|
|
|
config I2C_MUX_PCA954x
|
|
tristate "Philips PCA954x I2C Mux/switches"
|
|
help
|
|
If you say yes here you get support for the Philips PCA954x
|
|
I2C mux/switch devices.
|
|
|
|
This driver can also be built as a module. If so, the module
|
|
will be called i2c-mux-pca954x.
|
|
|
|
config I2C_MUX_PINCTRL
|
|
tristate "pinctrl-based I2C multiplexer"
|
|
depends on PINCTRL
|
|
help
|
|
If you say yes to this option, support will be included for an I2C
|
|
multiplexer that uses the pinctrl subsystem, i.e. pin multiplexing.
|
|
This is useful for SoCs whose I2C module's signals can be routed to
|
|
different sets of pins at run-time.
|
|
|
|
This driver can also be built as a module. If so, the module will be
|
|
called pinctrl-i2cmux.
|
|
|
|
endmenu
|