Kconfig: tegra: Migrate TEGRA_KEYBOARD
Migrate TEGRA_KEYBOARD from headers to Kconfig, only the seaboard uses it but we
drop CONFIG_KEYBOARD as the driver doesn't use the legacy drv_keyboard_init.
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Cc: Tom Warren <twarren@nvidia.com>
Cc: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index 304a292..aa46f06 100644
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -23,6 +23,7 @@
CONFIG_DEFAULT_DEVICE_TREE="tegra20-seaboard"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_SYS_I2C_TEGRA=y
+CONFIG_TEGRA_KEYBOARD=y
CONFIG_SPL_DM=y
CONFIG_DM_PMIC=y
CONFIG_DM_REGULATOR=y
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 7afdafe..a3bdd9f 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -73,6 +73,12 @@
variable 'keymap' to "de" to select German. Keyboard repeat is
handled by the keyboard itself.
+config TEGRA_KEYBOARD
+ bool "NVIDIA Tegra internal matrix keyboard controller support"
+ help
+ A matrix keyboard connected directly to the internal keyboard
+ controller on Tegra SoCs.
+
config TWL4030_INPUT
bool "Enable TWL4030 Input controller"
help
diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index c5fa9cc..5df013b 100644
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -31,10 +31,6 @@
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
-/* Enable keyboard */
-#define CONFIG_TEGRA_KEYBOARD
-#define CONFIG_KEYBOARD
-
/* NAND support */
#define CONFIG_TEGRA_NAND
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 4c7602a..2c323b6 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4393,7 +4393,6 @@
CONFIG_TEGRA_ENABLE_UARTD
CONFIG_TEGRA_ENABLE_UARTE
CONFIG_TEGRA_GPU
-CONFIG_TEGRA_KEYBOARD
CONFIG_TEGRA_LP0
CONFIG_TEGRA_NAND
CONFIG_TEGRA_PMU