6 files changed, 9 insertions, 9 deletions

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 3143ac795eb0..082495bb08a7 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -230,11 +230,11 @@ config GPIO_STMPE
           This enables support for the GPIOs found on the STMPE I/O
           Expanders.
 
-config GPIO_TC35892
-        bool "TC35892 GPIOs"
-        depends on MFD_TC35892
+config GPIO_TC3589X
+        bool "TC3589X GPIOs"
+        depends on MFD_TC3589X
         help
-          This enables support for the GPIOs found on the TC35892
+          This enables support for the GPIOs found on the TC3589X
           I/O Expander.
 
 config GPIO_TWL4030
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index bdf3ddec0652..39bfd7a37650 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -24,7 +24,7 @@ obj-$(CONFIG_GPIO_PCF857X)	+= pcf857x.o
 obj-$(CONFIG_GPIO_PCH)          += pch_gpio.o
 obj-$(CONFIG_GPIO_PL061)        += pl061.o
 obj-$(CONFIG_GPIO_STMPE)        += stmpe-gpio.o
-obj-$(CONFIG_GPIO_TC35892)      += tc35892-gpio.o
+obj-$(CONFIG_GPIO_TC3589X)      += tc3589x-gpio.o
 obj-$(CONFIG_GPIO_TIMBERDALE)   += timbgpio.o
 obj-$(CONFIG_GPIO_TWL4030)      += twl4030-gpio.o
 obj-$(CONFIG_GPIO_UCB1400)      += ucb1400_gpio.o
diff --git a/drivers/gpio/tc35892-gpio.c b/drivers/gpio/tc3589x-gpio.c
index 027b857c18ff..027b857c18ff 100644
--- a/drivers/gpio/tc35892-gpio.c
+++ b/drivers/gpio/tc3589x-gpio.c
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 3a1493b8b5e5..e8e704f52746 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -218,12 +218,12 @@ config MFD_STMPE
                 Keypad: stmpe-keypad
                 Touchscreen: stmpe-ts
 
-config MFD_TC35892
-        bool "Support Toshiba TC35892"
+config MFD_TC3589X
+        bool "Support Toshiba TC35892 and variants"
         depends on I2C=y && GENERIC_HARDIRQS
         select MFD_CORE
         help
-          Support for the Toshiba TC35892 I/O Expander.
+          Support for the Toshiba TC35892 and variants I/O Expander.
 
           This driver provides common support for accessing the device,
           additional drivers must be enabled in order to use the
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index f54b3659abbb..e590d1e44cf0 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -16,7 +16,7 @@ obj-$(CONFIG_MFD_DAVINCI_VOICECODEC)	+= davinci_voicecodec.o
 obj-$(CONFIG_MFD_DM355EVM_MSP)  += dm355evm_msp.o
 
 obj-$(CONFIG_MFD_STMPE)         += stmpe.o
-obj-$(CONFIG_MFD_TC35892)       += tc35892.o
+obj-$(CONFIG_MFD_TC3589X)       += tc3589x.o
 obj-$(CONFIG_MFD_T7L66XB)       += t7l66xb.o tmio_core.o
 obj-$(CONFIG_MFD_TC6387XB)      += tc6387xb.o tmio_core.o
 obj-$(CONFIG_MFD_TC6393XB)      += tc6393xb.o tmio_core.o
diff --git a/drivers/mfd/tc35892.c b/drivers/mfd/tc3589x.c
index f230235c3765..f230235c3765 100644
--- a/drivers/mfd/tc35892.c
+++ b/drivers/mfd/tc3589x.c