Merge tag 'gpio-v5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...

[sfrench/cifs-2.6.git] / drivers / gpio / Kconfig

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index acd40eb51c4603b99cfbc74a0880b51ca3a61267..e4fee216d5a46c832e676c612523c2f8ff7e7263 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -62,16 +62,12 @@ config GPIO_SYSFS
        bool "/sys/class/gpio/... (sysfs interface)"
        depends on SYSFS
        help
-         Say Y here to add a sysfs interface for GPIOs.
+         Say Y here to add the legacy sysfs interface for GPIOs.
 
-         This is mostly useful to work around omissions in a system's
-         kernel support.  Those are common in custom and semicustom
-         hardware assembled using standard kernels with a minimum of
-         custom patches.  In those cases, userspace code may import
-         a given GPIO from the kernel, if no kernel driver requested it.
-
-         Kernel drivers may also request that a particular GPIO be
-         exported to userspace; this can be useful when debugging.
+         This ABI is deprecated. If you want to use GPIO from userspace,
+         use the character device /dev/gpiochipN with the appropriate
+         ioctl() operations instead. The character device is always
+         available.
 
 config GPIO_GENERIC
        depends on HAS_IOMEM # Only for IOMEM drivers
@@ -178,7 +174,7 @@ config GPIO_CLPS711X
 config GPIO_DAVINCI
        bool "TI Davinci/Keystone GPIO support"
        default y if ARCH_DAVINCI
-       depends on ARM && (ARCH_DAVINCI || ARCH_KEYSTONE)
+       depends on (ARM || ARM64) && (ARCH_DAVINCI || ARCH_KEYSTONE || ARCH_K3)
        help
          Say yes here to enable GPIO support for TI Davinci/Keystone SoCs.
 
@@ -493,7 +489,8 @@ config GPIO_STA2X11
 
 config GPIO_STP_XWAY
        bool "XWAY STP GPIOs"
-       depends on SOC_XWAY
+       depends on SOC_XWAY || COMPILE_TEST
+       depends on OF_GPIO
        help
          This enables support for the Serial To Parallel (STP) unit found on
          XWAY SoC. The STP allows the SoC to drive a shift registers cascade,
@@ -602,7 +599,6 @@ config GPIO_XGENE_SB
 
 config GPIO_XILINX
        tristate "Xilinx GPIO support"
-       depends on OF_GPIO
        help
          Say yes here to support the Xilinx FPGA GPIO device