diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig
index c613433d12880459d0bf3107661052a96fb953c7..273be581145894e699f665119706428c459a4c3f 100644
--- a/configs/omap5_uevm_defconfig
+++ b/configs/omap5_uevm_defconfig
@@ -36,6 +36,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_ISO_PARTITION=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
+CONFIG_CMD_TCA642X=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_SCSI=y
 CONFIG_SYS_NS16550=y
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index d2e7c29e1d6a2f077587fa2b1567ddcb47b3b8c8..ffeda9425af13f07b10487e4a3110abff51d562e 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -165,6 +165,15 @@ config SANDBOX_GPIO_COUNT
 	  of 'anonymous' GPIOs that do not belong to any device or bank.
 	  Select a suitable value depending on your needs.
 
+config CMD_TCA642X
+	bool "tca642x - Command to access tca642x state"
+	help
+	  DEPRECATED - This needs conversion to driver model
+
+	  This provides a way to looking at the pin state of this device.
+	  This mirrors the 'gpio' command and that should be used in preference
+	  to custom code.
+
 config TEGRA_GPIO
 	bool "Tegra20..210 GPIO driver"
 	depends on DM_GPIO
diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h
index 9b650090be8b17cdf9d75783f4497b7b55de974b..7e2a011843d9a8f055ece39e9ea2a911bf6db97c 100644
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -46,7 +46,6 @@
 
 /* Required support for the TCA642X GPIO we have on the uEVM */
 #define CONFIG_TCA642X
-#define CONFIG_CMD_TCA642X
 #define CONFIG_SYS_I2C_TCA642X_BUS_NUM 4
 #define CONFIG_SYS_I2C_TCA642X_ADDR 0x22
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ebe2daeb27ff86a5f441c3d5aef12aa3841fe0c2..aea6ea7fabff0f40b64e6a80208e11328052b187 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -293,7 +293,6 @@ CONFIG_CM922T_XA10
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_TCA642X
 CONFIG_CMD_TERMINAL
 CONFIG_CMD_TFTP
 CONFIG_CMD_THOR_DOWNLOAD