Convert CONFIG_HIKEY_GPIO et al to Kconfig

This converts the following to Kconfig:
   CONFIG_HIKEY_GPIO
   CONFIG_TCA642X

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/configs/hikey_defconfig b/configs/hikey_defconfig
index 9eec9281849c32178c8439287c64476ce09f5871..d023653815cdb14c8b799633b4449d02bd1b3aad 100644 (file)
--- a/configs/hikey_defconfig
+++ b/configs/hikey_defconfig
@@ -30,6 +30,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_MMC_ENV_PART=2
+CONFIG_HIKEY_GPIO=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_K3=y
 CONFIG_POWER_LEGACY=y

diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig
index d12199766ad38f84c23b4feed34d730261ab1b60..91878c11ed40d61ba8b49504a46d142cc6d021b3 100644 (file)
--- a/configs/omap5_uevm_defconfig
+++ b/configs/omap5_uevm_defconfig
@@ -47,7 +47,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_SCSI_AHCI=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
-CONFIG_CMD_TCA642X=y
+CONFIG_TCA642X=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SUPPORT_EMMC_BOOT=y

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index ff87fbfb397e2b4c77cd55c238125a710be54b8b..e007b38fac716cb98dd247b27e9393c67ad2c0a7 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -169,6 +169,10 @@ config FXL6408_GPIO
          This driver supports the Fairchild FXL6408 device. FXL6408 is a
          fully configurable 8-bit I2C-controlled GPIO expander.
 
+config HIKEY_GPIO
+       bool "HI6220 GPIO driver"
+       depends on DM_GPIO
+
 config INTEL_BROADWELL_GPIO
        bool "Intel Broadwell GPIO driver"
        depends on DM
@@ -374,8 +378,13 @@ config XILINX_GPIO
        help
          This config enable the Xilinx GPIO driver for Microblaze.
 
+config TCA642X
+       bool "TCA642x legacy GPIO driver"
+
 config CMD_TCA642X
        bool "tca642x - Command to access tca642x state"
+       depends on TCA642X
+       default y
        help
          DEPRECATED - This needs conversion to driver model
 

diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index c5ef2f99b0f40fa59dd8772f3e8e1dd56757b558..eefdbd6ed11b809e37584016a230324d53243068 100644 (file)
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -32,8 +32,6 @@
 #define GICD_BASE                      0xf6801000
 #define GICC_BASE                      0xf6802000
 
-#define CONFIG_HIKEY_GPIO
-
 /* Initial environment variables */
 
 /*

diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h
index 1634db860640da50658f733137d8fc618c02efb7..d7fa2d43914acffc823328c663fb13daf714eadd 100644 (file)
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -36,7 +36,6 @@
 #define CONFIG_HSMMC2_8BIT
 
 /* Required support for the TCA642X GPIO we have on the uEVM */
-#define CONFIG_TCA642X
 #define CFG_SYS_I2C_TCA642X_BUS_NUM 4
 #define CFG_SYS_I2C_TCA642X_ADDR 0x22