Эх сурвалжийг харах

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>
Adam Ford 6 жил өмнө
parent
commit
cc3fedb204

+ 1 - 0
configs/cairo_defconfig

@@ -27,6 +27,7 @@ CONFIG_CMD_SPI=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_NAND=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SPL_NAND_SIMPLE=y

+ 1 - 0
configs/cm_t35_defconfig

@@ -39,6 +39,7 @@ CONFIG_LED_STATUS_BIT=186
 CONFIG_LED_STATUS_STATE=2
 CONFIG_LED_STATUS_STATE=2
 CONFIG_LED_STATUS_BOOT_ENABLE=y
 CONFIG_LED_STATUS_BOOT_ENABLE=y
 CONFIG_LED_STATUS_BOOT=0
 CONFIG_LED_STATUS_BOOT=0
+CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_PARTITIONS=y
 CONFIG_NAND=y
 CONFIG_NAND=y

+ 1 - 0
configs/devkit8000_defconfig

@@ -25,6 +25,7 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=nand"
 CONFIG_MTDIDS_DEFAULT="nand0=nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)"
 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_ENV_IS_IN_NAND=y
+CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y

+ 1 - 0
configs/nokia_rx51_defconfig

@@ -22,6 +22,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FAT=y
 # CONFIG_NET is not set
 # CONFIG_NET is not set
+CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_CONS_INDEX=3
 CONFIG_CONS_INDEX=3
 CONFIG_SYS_NS16550=y
 CONFIG_SYS_NS16550=y

+ 1 - 0
configs/omap3_beagle_defconfig

@@ -50,6 +50,7 @@ CONFIG_LED_STATUS_BOOT=1
 CONFIG_LED_STATUS_GREEN_ENABLE=y
 CONFIG_LED_STATUS_GREEN_ENABLE=y
 CONFIG_LED_STATUS_GREEN=2
 CONFIG_LED_STATUS_GREEN=2
 CONFIG_LED_STATUS_CMD=y
 CONFIG_LED_STATUS_CMD=y
+CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y

+ 1 - 0
configs/omap3_ha_defconfig

@@ -25,6 +25,7 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=nand"
 CONFIG_MTDIDS_DEFAULT="nand0=nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)"
 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_ENV_IS_IN_NAND=y
+CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y

+ 1 - 0
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_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(xloader),1792k(u-boot),256k(environ),8m(linux),-(rootfs)"
 CONFIG_CMD_UBI=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y

+ 1 - 0
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_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(xloader),1920k(uboot),128k(uboot-env),10m(boot),-(rootfs)"
 CONFIG_CMD_UBI=y
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y

+ 1 - 0
configs/omap3_zoom1_defconfig

@@ -22,6 +22,7 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=nand"
 CONFIG_MTDIDS_DEFAULT="nand0=nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)"
 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_ENV_IS_IN_NAND=y
+CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y

+ 1 - 0
configs/sniper_defconfig

@@ -26,6 +26,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x2000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_SYS_OMAP24_I2C_SPEED=400000
 CONFIG_SYS_OMAP24_I2C_SPEED=400000
+CONFIG_TWL4030_INPUT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_CONS_INDEX=3
 CONFIG_CONS_INDEX=3
 CONFIG_SYS_NS16550=y
 CONFIG_SYS_NS16550=y

+ 1 - 0
configs/tao3530_defconfig

@@ -25,6 +25,7 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=nand"
 CONFIG_MTDIDS_DEFAULT="nand0=nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)"
 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_ENV_IS_IN_NAND=y
+CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y

+ 1 - 0
configs/tricorder_defconfig

@@ -34,6 +34,7 @@ CONFIG_LED_STATUS2=y
 CONFIG_LED_STATUS_BIT2=4
 CONFIG_LED_STATUS_BIT2=4
 CONFIG_LED_STATUS_STATE2=2
 CONFIG_LED_STATUS_STATE2=2
 CONFIG_LED_STATUS_CMD=y
 CONFIG_LED_STATUS_CMD=y
+CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_NAND=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SPL_NAND_SIMPLE=y

+ 1 - 0
configs/tricorder_flash_defconfig

@@ -33,6 +33,7 @@ CONFIG_LED_STATUS2=y
 CONFIG_LED_STATUS_BIT2=4
 CONFIG_LED_STATUS_BIT2=4
 CONFIG_LED_STATUS_STATE2=2
 CONFIG_LED_STATUS_STATE2=2
 CONFIG_LED_STATUS_CMD=y
 CONFIG_LED_STATUS_CMD=y
+CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_NAND=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SPL_NAND_SIMPLE=y

+ 5 - 0
drivers/input/Kconfig

@@ -24,3 +24,8 @@ config I8042_KEYB
 	  driver handles English and German keyboards - set the environment
 	  driver handles English and German keyboards - set the environment
 	  variable 'keymap' to "de" to select German. Keyboard repeat is
 	  variable 'keymap' to "de" to select German. Keyboard repeat is
 	  handled by the keyboard itself.
 	  handled by the keyboard itself.
+
+config TWL4030_INPUT
+	bool "Enable TWL4030 Input controller"
+	help
+	  Enable TWL4030 Input controller

+ 5 - 0
drivers/misc/Kconfig

@@ -195,6 +195,11 @@ config TEGRA186_BPMP
 	  can make requests to the BPMP. This driver is similar to an MFD
 	  can make requests to the BPMP. This driver is similar to an MFD
 	  driver in the Linux kernel.
 	  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
 config WINBOND_W83627
 	bool "Enable Winbond Super I/O driver"
 	bool "Enable Winbond Super I/O driver"
 	help
 	help

+ 0 - 1
include/configs/cm_t35.h

@@ -82,7 +82,6 @@
 /*
 /*
  * TWL4030
  * TWL4030
  */
  */
-#define CONFIG_TWL4030_LED
 
 
 /*
 /*
  * Board NAND Info.
  * Board NAND Info.

+ 0 - 1
include/configs/devkit8000.h

@@ -54,7 +54,6 @@
 #undef	CONFIG_DM9000_DEBUG
 #undef	CONFIG_DM9000_DEBUG
 
 
 /* TWL4030 */
 /* TWL4030 */
-#define CONFIG_TWL4030_LED		1
 
 
 /* Board NAND Info */
 /* Board NAND Info */
 #define CONFIG_JFFS2_NAND
 #define CONFIG_JFFS2_NAND

+ 0 - 2
include/configs/nokia_rx51.h

@@ -92,8 +92,6 @@
 /*
 /*
  * TWL4030
  * TWL4030
  */
  */
-#define CONFIG_TWL4030_LED
-#define CONFIG_TWL4030_KEYPAD
 
 
 #define GPIO_SLIDE			71
 #define GPIO_SLIDE			71
 
 

+ 0 - 1
include/configs/omap3_beagle.h

@@ -60,7 +60,6 @@
 /* DSS Support */
 /* DSS Support */
 
 
 /* TWL4030 LED Support */
 /* TWL4030 LED Support */
-#define CONFIG_TWL4030_LED
 
 
 /* Environment */
 /* Environment */
 #define CONFIG_ENV_SIZE                 SZ_128K
 #define CONFIG_ENV_SIZE                 SZ_128K

+ 0 - 1
include/configs/omap3_cairo.h

@@ -46,7 +46,6 @@
 /*
 /*
  * TWL4030
  * TWL4030
  */
  */
-#define CONFIG_TWL4030_LED		1
 
 
 /*
 /*
  * Board NAND Info.
  * Board NAND Info.

+ 0 - 1
include/configs/omap3_overo.h

@@ -29,7 +29,6 @@
 /* I2C Support */
 /* I2C Support */
 
 
 /* TWL4030 LED */
 /* TWL4030 LED */
-#define CONFIG_TWL4030_LED
 
 
 /* USB EHCI */
 /* USB EHCI */
 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO	183
 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO	183

+ 0 - 1
include/configs/omap3_pandora.h

@@ -24,7 +24,6 @@
  */
  */
 
 
 /* TWL4030 LED */
 /* TWL4030 LED */
-#define CONFIG_TWL4030_LED
 
 
 /*
 /*
  * NS16550 Configuration
  * NS16550 Configuration

+ 0 - 1
include/configs/omap3_zoom1.h

@@ -48,7 +48,6 @@
 /*
 /*
  * TWL4030
  * TWL4030
  */
  */
-#define CONFIG_TWL4030_LED		1
 
 
 /*
 /*
  * Board NAND Info.
  * Board NAND Info.

+ 0 - 2
include/configs/sniper.h

@@ -60,8 +60,6 @@
  * Input
  * Input
  */
  */
 
 
-#define CONFIG_TWL4030_INPUT
-
 /*
 /*
  * SPL
  * SPL
  */
  */

+ 0 - 1
include/configs/tao3530.h

@@ -63,7 +63,6 @@
 /*
 /*
  * TWL4030
  * TWL4030
  */
  */
-#define CONFIG_TWL4030_LED
 
 
 /*
 /*
  * Board NAND Info.
  * Board NAND Info.

+ 0 - 1
include/configs/tricorder.h

@@ -60,7 +60,6 @@
 #define CONFIG_SYS_EEPROM_BUS_NUM	1
 #define CONFIG_SYS_EEPROM_BUS_NUM	1
 
 
 /* TWL4030 */
 /* TWL4030 */
-#define CONFIG_TWL4030_LED
 
 
 /* Board NAND Info */
 /* Board NAND Info */
 #define CONFIG_SYS_NAND_BASE		NAND_BASE	/* physical address */
 #define CONFIG_SYS_NAND_BASE		NAND_BASE	/* physical address */

+ 0 - 3
scripts/config_whitelist.txt

@@ -4497,9 +4497,6 @@ CONFIG_TULIP_FIX_DAVICOM
 CONFIG_TULIP_SELECT_MEDIA
 CONFIG_TULIP_SELECT_MEDIA
 CONFIG_TULIP_USE_IO
 CONFIG_TULIP_USE_IO
 CONFIG_TUXX1
 CONFIG_TUXX1
-CONFIG_TWL4030_INPUT
-CONFIG_TWL4030_KEYPAD
-CONFIG_TWL4030_LED
 CONFIG_TWL6030_INPUT
 CONFIG_TWL6030_INPUT
 CONFIG_TWL6030_POWER
 CONFIG_TWL6030_POWER
 CONFIG_TWR
 CONFIG_TWR