From: Adam Ford Date: Mon, 6 Aug 2018 19:26:50 +0000 (-0500) Subject: Convert CONFIG_TWL4030_LED et al to Kconfig X-Git-Tag: v2018.09-rc3~50 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc3fedb2046962c6a11e16b1d73d98b4e108a651;p=pandora-u-boot.git 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 --- diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig index c7124cf425..5c64d69702 100644 --- 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 diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index f8f1862c3f..c78aaf93d1 100644 --- 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 diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index efb682837e..41642abc83 100644 --- 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 diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index b213a1844c..fe2ecf6c94 100644 --- 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 diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index f26f5ad28c..0a402ccf5f 100644 --- 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 diff --git a/configs/omap3_ha_defconfig b/configs/omap3_ha_defconfig index c39e971751..6b3fb31aaa 100644 --- 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 diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index 8b4146dccc..0c4a021bc5 100644 --- 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 diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig index b0b9444ab5..6dce53834d 100644 --- 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 diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig index 87d7228652..48f3391c44 100644 --- 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 diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig index 8ba6bc4030..269d59ec53 100644 --- 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 diff --git a/configs/tao3530_defconfig b/configs/tao3530_defconfig index d70d840b08..daca05e84b 100644 --- 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 diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig index 98c2cbd8f5..f92d391e3f 100644 --- 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 diff --git a/configs/tricorder_flash_defconfig b/configs/tricorder_flash_defconfig index ed851c7267..b44a76656e 100644 --- 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 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 6bcd49a114..c2b7cc15db 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 c7ac8d1fcc..4970a16f5f 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -82,7 +82,6 @@ /* * TWL4030 */ -#define CONFIG_TWL4030_LED /* * Board NAND Info. diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index dae76c3fbd..1b175be387 100644 --- 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 diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index f0b512c4fb..4bc0ecaf09 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 1fbe27e1aa..7698a90c4e 100644 --- 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 diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index 481cad5523..01334168af 100644 --- 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. diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index ebbde78520..35f3af4ae9 100644 --- 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 diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index 81c243203f..4e2eaa9952 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -24,7 +24,6 @@ */ /* TWL4030 LED */ -#define CONFIG_TWL4030_LED /* * NS16550 Configuration diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 8d35efd746..0a02ecdc14 100644 --- 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. diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 7af035c3da..aa78684b02 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -60,8 +60,6 @@ * Input */ -#define CONFIG_TWL4030_INPUT - /* * SPL */ diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 556219bd9f..1384a35c0c 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -63,7 +63,6 @@ /* * TWL4030 */ -#define CONFIG_TWL4030_LED /* * Board NAND Info. diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 5fce1c634d..cba49033a9 100644 --- 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 */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 83d9793a26..63dd154c82 100644 --- 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