diff options
| author | Sundar Iyer <sundar.iyer@stericsson.com> | 2010-12-12 23:03:13 -0500 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@stericsson.com> | 2010-12-19 13:27:42 -0500 |
| commit | f4e8afdc7ab1b5a0962be02a9dd15d29a81f4c53 (patch) | |
| tree | 8e7ab50489a335c9ab60976aaaeb5ad0d2baab95 | |
| parent | c6eda6c5eeb357ff231121619fb49d2bc0605faf (diff) | |
mfd/tc35892: rename tc35892 core driver to tc3589x
Rename the tc35892 core/gpio drivers to tc3589x to include
new variants in the same mfd core
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Sundar Iyer <sundar.iyer@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
| -rw-r--r-- | drivers/gpio/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/gpio/Makefile | 2 | ||||
| -rw-r--r-- | drivers/gpio/tc3589x-gpio.c (renamed from drivers/gpio/tc35892-gpio.c) | 0 | ||||
| -rw-r--r-- | drivers/mfd/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/mfd/Makefile | 2 | ||||
| -rw-r--r-- | drivers/mfd/tc3589x.c (renamed from drivers/mfd/tc35892.c) | 0 |
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 | |||
| 230 | This enables support for the GPIOs found on the STMPE I/O | 230 | This enables support for the GPIOs found on the STMPE I/O |
| 231 | Expanders. | 231 | Expanders. |
| 232 | 232 | ||
| 233 | config GPIO_TC35892 | 233 | config GPIO_TC3589X |
| 234 | bool "TC35892 GPIOs" | 234 | bool "TC3589X GPIOs" |
| 235 | depends on MFD_TC35892 | 235 | depends on MFD_TC3589X |
| 236 | help | 236 | help |
| 237 | This enables support for the GPIOs found on the TC35892 | 237 | This enables support for the GPIOs found on the TC3589X |
| 238 | I/O Expander. | 238 | I/O Expander. |
| 239 | 239 | ||
| 240 | config GPIO_TWL4030 | 240 | 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 | |||
| 24 | obj-$(CONFIG_GPIO_PCH) += pch_gpio.o | 24 | obj-$(CONFIG_GPIO_PCH) += pch_gpio.o |
| 25 | obj-$(CONFIG_GPIO_PL061) += pl061.o | 25 | obj-$(CONFIG_GPIO_PL061) += pl061.o |
| 26 | obj-$(CONFIG_GPIO_STMPE) += stmpe-gpio.o | 26 | obj-$(CONFIG_GPIO_STMPE) += stmpe-gpio.o |
| 27 | obj-$(CONFIG_GPIO_TC35892) += tc35892-gpio.o | 27 | obj-$(CONFIG_GPIO_TC3589X) += tc3589x-gpio.o |
| 28 | obj-$(CONFIG_GPIO_TIMBERDALE) += timbgpio.o | 28 | obj-$(CONFIG_GPIO_TIMBERDALE) += timbgpio.o |
| 29 | obj-$(CONFIG_GPIO_TWL4030) += twl4030-gpio.o | 29 | obj-$(CONFIG_GPIO_TWL4030) += twl4030-gpio.o |
| 30 | obj-$(CONFIG_GPIO_UCB1400) += ucb1400_gpio.o | 30 | 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 | |||
| 218 | Keypad: stmpe-keypad | 218 | Keypad: stmpe-keypad |
| 219 | Touchscreen: stmpe-ts | 219 | Touchscreen: stmpe-ts |
| 220 | 220 | ||
| 221 | config MFD_TC35892 | 221 | config MFD_TC3589X |
| 222 | bool "Support Toshiba TC35892" | 222 | bool "Support Toshiba TC35892 and variants" |
| 223 | depends on I2C=y && GENERIC_HARDIRQS | 223 | depends on I2C=y && GENERIC_HARDIRQS |
| 224 | select MFD_CORE | 224 | select MFD_CORE |
| 225 | help | 225 | help |
| 226 | Support for the Toshiba TC35892 I/O Expander. | 226 | Support for the Toshiba TC35892 and variants I/O Expander. |
| 227 | 227 | ||
| 228 | This driver provides common support for accessing the device, | 228 | This driver provides common support for accessing the device, |
| 229 | additional drivers must be enabled in order to use the | 229 | 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 | |||
| 16 | obj-$(CONFIG_MFD_DM355EVM_MSP) += dm355evm_msp.o | 16 | obj-$(CONFIG_MFD_DM355EVM_MSP) += dm355evm_msp.o |
| 17 | 17 | ||
| 18 | obj-$(CONFIG_MFD_STMPE) += stmpe.o | 18 | obj-$(CONFIG_MFD_STMPE) += stmpe.o |
| 19 | obj-$(CONFIG_MFD_TC35892) += tc35892.o | 19 | obj-$(CONFIG_MFD_TC3589X) += tc3589x.o |
| 20 | obj-$(CONFIG_MFD_T7L66XB) += t7l66xb.o tmio_core.o | 20 | obj-$(CONFIG_MFD_T7L66XB) += t7l66xb.o tmio_core.o |
| 21 | obj-$(CONFIG_MFD_TC6387XB) += tc6387xb.o tmio_core.o | 21 | obj-$(CONFIG_MFD_TC6387XB) += tc6387xb.o tmio_core.o |
| 22 | obj-$(CONFIG_MFD_TC6393XB) += tc6393xb.o tmio_core.o | 22 | 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 | |||
