Convert CONFIG_TWL4030_LED et al to Kconfig

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>
2024-11-10 15:14:43 +00:00 · 2018-08-06 14:26:50 -05:00 · 2018-08-06 14:26:50 -05:00 · cc3fedb204
commit cc3fedb204
parent 244eaea60b
27 changed files with 23 additions and 16 deletions
--- a/configs/cairo_defconfig
+++ b/configs/cairo_defconfig
@ -27,6 +27,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
--- a/configs/cm_t35_defconfig
+++ b/configs/cm_t35_defconfig
@ -39,6 +39,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
--- a/configs/devkit8000_defconfig
+++ b/configs/devkit8000_defconfig
@ -25,6 +25,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
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@ -22,6 +22,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
--- a/configs/omap3_beagle_defconfig
+++ b/configs/omap3_beagle_defconfig
@ -50,6 +50,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
--- a/configs/omap3_ha_defconfig
+++ b/configs/omap3_ha_defconfig
@ -25,6 +25,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
--- a/configs/omap3_overo_defconfig
+++ b/configs/omap3_overo_defconfig
@ -31,6 +31,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
--- a/configs/omap3_pandora_defconfig
+++ b/configs/omap3_pandora_defconfig
@ -25,6 +25,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
--- a/configs/omap3_zoom1_defconfig
+++ b/configs/omap3_zoom1_defconfig
@ -22,6 +22,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
--- a/configs/sniper_defconfig
+++ b/configs/sniper_defconfig
@ -26,6 +26,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
--- a/configs/tao3530_defconfig
+++ b/configs/tao3530_defconfig
@ -25,6 +25,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
--- a/configs/tricorder_defconfig
+++ b/configs/tricorder_defconfig
@ -34,6 +34,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
--- a/configs/tricorder_flash_defconfig
+++ b/configs/tricorder_flash_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
--- 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
--- 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
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@ -82,7 +82,6 @@
 /*
 * TWL4030
 */
-#define CONFIG_TWL4030_LED

 /*
 * Board NAND Info.
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@ -54,7 +54,6 @@
 #undef	CONFIG_DM9000_DEBUG

 /* TWL4030 */
-#define CONFIG_TWL4030_LED		1

 /* Board NAND Info */
 #define CONFIG_JFFS2_NAND
--- 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

--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@ -60,7 +60,6 @@
 /* DSS Support */

 /* TWL4030 LED Support */
-#define CONFIG_TWL4030_LED

 /* Environment */
 #define CONFIG_ENV_SIZE                 SZ_128K
--- a/include/configs/omap3_cairo.h
+++ b/include/configs/omap3_cairo.h
@ -46,7 +46,6 @@
 /*
 * TWL4030
 */
-#define CONFIG_TWL4030_LED		1

 /*
 * Board NAND Info.
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@ -29,7 +29,6 @@
 /* I2C Support */

 /* TWL4030 LED */
-#define CONFIG_TWL4030_LED

 /* USB EHCI */
 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO	183
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@ -24,7 +24,6 @@
 */

 /* TWL4030 LED */
-#define CONFIG_TWL4030_LED

 /*
 * NS16550 Configuration
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@ -48,7 +48,6 @@
 /*
 * TWL4030
 */
-#define CONFIG_TWL4030_LED		1

 /*
 * Board NAND Info.
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@ -60,8 +60,6 @@
 * Input
 */

-#define CONFIG_TWL4030_INPUT
-
 /*
 * SPL
 */
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@ -63,7 +63,6 @@
 /*
 * TWL4030
 */
-#define CONFIG_TWL4030_LED

 /*
 * Board NAND Info.
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@ -60,7 +60,6 @@
 #define CONFIG_SYS_EEPROM_BUS_NUM	1

 /* TWL4030 */
-#define CONFIG_TWL4030_LED

 /* Board NAND Info */
 #define CONFIG_SYS_NAND_BASE		NAND_BASE	/* physical address */
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@ -4497,9 +4497,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