This converts the following to Kconfig: CONFIG_TWL4030_LED CONFIG_TWL4030_INPUT

This also removes dead references to: CONFIG_TWL4030_KEYPAD

Signed-off-by: Adam Ford aford173@gmail.com --- configs/cairo_defconfig | 1 + configs/cm_t35_defconfig | 1 + configs/devkit8000_defconfig | 1 + configs/nokia_rx51_defconfig | 1 + configs/omap3_beagle_defconfig | 1 + configs/omap3_ha_defconfig | 1 + configs/omap3_overo_defconfig | 1 + configs/omap3_pandora_defconfig | 1 + configs/omap3_zoom1_defconfig | 1 + configs/sniper_defconfig | 1 + configs/tao3530_defconfig | 1 + configs/tricorder_defconfig | 1 + configs/tricorder_flash_defconfig | 1 + drivers/input/Kconfig | 5 +++++ drivers/misc/Kconfig | 5 +++++ include/configs/cm_t35.h | 1 - include/configs/devkit8000.h | 1 - include/configs/nokia_rx51.h | 2 -- include/configs/omap3_beagle.h | 1 - include/configs/omap3_cairo.h | 1 - include/configs/omap3_overo.h | 1 - include/configs/omap3_pandora.h | 1 - include/configs/omap3_zoom1.h | 1 - include/configs/sniper.h | 2 -- include/configs/tao3530.h | 1 - include/configs/tricorder.h | 1 - scripts/config_whitelist.txt | 3 --- 27 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig index 0a772a284c..de073f6b90 100644 --- a/configs/cairo_defconfig +++ b/configs/cairo_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_SPI=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_MTDPARTS=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_TWL4030_LED=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_SIMPLE=y diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index 30a745210a..eaea89eaa5 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -38,6 +38,7 @@ CONFIG_LED_STATUS_BIT=186 CONFIG_LED_STATUS_STATE=2 CONFIG_LED_STATUS_BOOT_ENABLE=y CONFIG_LED_STATUS_BOOT=0 +CONFIG_TWL4030_LED=y CONFIG_MMC_OMAP_HS=y CONFIG_MTD_PARTITIONS=y CONFIG_NAND=y diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index 4a096b9265..73d3a4c29d 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)" CONFIG_ENV_IS_IN_NAND=y +CONFIG_TWL4030_LED=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index ed9070d9a2..b8ecba6d65 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y # CONFIG_NET is not set +CONFIG_TWL4030_LED=y CONFIG_MMC_OMAP_HS=y CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index 1e1a391d7f..4961672060 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -49,6 +49,7 @@ CONFIG_LED_STATUS_BOOT=1 CONFIG_LED_STATUS_GREEN_ENABLE=y CONFIG_LED_STATUS_GREEN=2 CONFIG_LED_STATUS_CMD=y +CONFIG_TWL4030_LED=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y diff --git a/configs/omap3_ha_defconfig b/configs/omap3_ha_defconfig index e4b16c6872..645d50121d 100644 --- a/configs/omap3_ha_defconfig +++ b/configs/omap3_ha_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)" CONFIG_ENV_IS_IN_NAND=y +CONFIG_TWL4030_LED=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index 21aaa03b34..dac6b0e3ce 100644 --- a/configs/omap3_overo_defconfig +++ b/configs/omap3_overo_defconfig @@ -30,6 +30,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(xloader),1792k(u-boot),256k(environ),8m(linux),-(rootfs)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_TWL4030_LED=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig index a2cb46e6b8..d0d8848d3c 100644 --- a/configs/omap3_pandora_defconfig +++ b/configs/omap3_pandora_defconfig @@ -24,6 +24,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(xloader),1920k(uboot),128k(uboot-env),10m(boot),-(rootfs)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_TWL4030_LED=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig index 4ca55cb531..fb35615efe 100644 --- a/configs/omap3_zoom1_defconfig +++ b/configs/omap3_zoom1_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)" CONFIG_ENV_IS_IN_NAND=y +CONFIG_TWL4030_LED=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig index 7e7f7dfa74..0096c70cce 100644 --- a/configs/sniper_defconfig +++ b/configs/sniper_defconfig @@ -25,6 +25,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x2000000 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_SYS_OMAP24_I2C_SPEED=400000 +CONFIG_TWL4030_INPUT=y CONFIG_MMC_OMAP_HS=y CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y diff --git a/configs/tao3530_defconfig b/configs/tao3530_defconfig index dc26f3667d..5e58bb94a6 100644 --- a/configs/tao3530_defconfig +++ b/configs/tao3530_defconfig @@ -24,6 +24,7 @@ CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)" CONFIG_ENV_IS_IN_NAND=y +CONFIG_TWL4030_LED=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig index f8a87a8242..fec6647cb8 100644 --- a/configs/tricorder_defconfig +++ b/configs/tricorder_defconfig @@ -33,6 +33,7 @@ CONFIG_LED_STATUS2=y CONFIG_LED_STATUS_BIT2=4 CONFIG_LED_STATUS_STATE2=2 CONFIG_LED_STATUS_CMD=y +CONFIG_TWL4030_LED=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_SIMPLE=y diff --git a/configs/tricorder_flash_defconfig b/configs/tricorder_flash_defconfig index 408814eac7..c231fff804 100644 --- a/configs/tricorder_flash_defconfig +++ b/configs/tricorder_flash_defconfig @@ -32,6 +32,7 @@ CONFIG_LED_STATUS2=y CONFIG_LED_STATUS_BIT2=4 CONFIG_LED_STATUS_STATE2=2 CONFIG_LED_STATUS_CMD=y +CONFIG_TWL4030_LED=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_SIMPLE=y diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig index b3873c140d..7ffb949f12 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig @@ -24,3 +24,8 @@ config I8042_KEYB driver handles English and German keyboards - set the environment variable 'keymap' to "de" to select German. Keyboard repeat is handled by the keyboard itself. + +config TWL4030_INPUT + bool "Enable TWL4030 Input controller" + help + Enable TWL4030 Input controller diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index c031dfde9d..dde1ac00be 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -195,6 +195,11 @@ config TEGRA186_BPMP can make requests to the BPMP. This driver is similar to an MFD driver in the Linux kernel.

+config TWL4030_LED + bool "Enable TWL4030 LED controller" + help + Enable this to add support for the TWL4030 LED controller. + config WINBOND_W83627 bool "Enable Winbond Super I/O driver" help diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index c755f63055..bcfb39b2c7 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -83,7 +83,6 @@ /* * TWL4030 */ -#define CONFIG_TWL4030_LED

/* * Board NAND Info. diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index f36dc2dc2c..f9c45e6456 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -57,7 +57,6 @@ #undef CONFIG_DM9000_DEBUG

/* TWL4030 */ -#define CONFIG_TWL4030_LED 1

/* Board NAND Info */

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index d4353e15a7..705b332b3a 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -92,8 +92,6 @@ /* * TWL4030 */ -#define CONFIG_TWL4030_LED -#define CONFIG_TWL4030_KEYPAD

#define GPIO_SLIDE 71

diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 1599b6f0ba..edd9ef3343 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -64,7 +64,6 @@ #define CONFIG_VIDEO_OMAP3

/* TWL4030 LED Support */ -#define CONFIG_TWL4030_LED

/* Environment */ #define CONFIG_ENV_SIZE SZ_128K diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index 2410f7d56a..620af84b05 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -50,7 +50,6 @@ /* * TWL4030 */ -#define CONFIG_TWL4030_LED 1

/* * Board NAND Info. diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index a3d0e5fcaa..5420f43513 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -32,7 +32,6 @@ /* I2C Support */

/* TWL4030 LED */ -#define CONFIG_TWL4030_LED

/* USB EHCI */ #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 183 diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index 68e1d6f82d..fb3db618ac 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -27,7 +27,6 @@ */

/* TWL4030 LED */ -#define CONFIG_TWL4030_LED

/* * NS16550 Configuration diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index c62b373de3..d2006307c5 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -51,7 +51,6 @@ /* * TWL4030 */ -#define CONFIG_TWL4030_LED 1

/* * Board NAND Info. diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 7a665f64e1..54936458f0 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -63,8 +63,6 @@ * Input */

-#define CONFIG_TWL4030_INPUT - /* * SPL */ diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 4b596c680a..95020f2a4c 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -65,7 +65,6 @@ /* * TWL4030 */ -#define CONFIG_TWL4030_LED

/* * Board NAND Info. diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index c4bb9f04be..eb32d9d02f 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -61,7 +61,6 @@ #define CONFIG_SYS_EEPROM_BUS_NUM 1

/* TWL4030 */ -#define CONFIG_TWL4030_LED

/* Board NAND Info */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e3930b964a..584f3386ab 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4523,9 +4523,6 @@ CONFIG_TULIP_FIX_DAVICOM CONFIG_TULIP_SELECT_MEDIA CONFIG_TULIP_USE_IO CONFIG_TUXX1 -CONFIG_TWL4030_INPUT -CONFIG_TWL4030_KEYPAD -CONFIG_TWL4030_LED CONFIG_TWL6030_INPUT CONFIG_TWL6030_POWER CONFIG_TWR