Merge tag 'v5.3-rc4' into next

[sfrench/cifs-2.6.git] / drivers / input / keyboard / Kconfig

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 7c4f19dab34fd89382eeb5757b5c223b81da1ee8..2e6d2887eec1f823f0ffab58afe3a902f63b2ad2 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -71,6 +71,24 @@ config KEYBOARD_AMIGA
 config ATARI_KBD_CORE
        bool
 
+config KEYBOARD_APPLESPI
+       tristate "Apple SPI keyboard and trackpad"
+       depends on ACPI && EFI
+       depends on SPI
+       depends on X86 || COMPILE_TEST
+       depends on LEDS_CLASS
+       select CRC16
+       help
+         Say Y here if you are running Linux on any Apple MacBook8,1 or later,
+         or any MacBookPro13,* or MacBookPro14,*.
+
+         You will also need to enable appropriate SPI master controllers:
+         spi_pxa2xx_platform and spi_pxa2xx_pci for MacBook8,1, and
+         spi_pxa2xx_platform and intel_lpss_pci for the rest.
+
+         To compile this driver as a module, choose M here: the
+         module will be called applespi.
+
 config KEYBOARD_ATARI
        tristate "Atari keyboard"
        depends on ATARI
@@ -715,17 +733,6 @@ config KEYBOARD_XTKBD
          To compile this driver as a module, choose M here: the
          module will be called xtkbd.
 
-config KEYBOARD_W90P910
-       tristate "W90P910 Matrix Keypad support"
-       depends on ARCH_W90X900
-       select INPUT_MATRIXKMAP
-       help
-         Say Y here to enable the matrix keypad on evaluation board
-         based on W90P910.
-
-         To compile this driver as a module, choose M here: the
-         module will be called w90p910_keypad.
-
 config KEYBOARD_CROS_EC
        tristate "ChromeOS EC keyboard"
        select INPUT_MATRIXKMAP