twl4030-core: move to drivers/mfd

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Move twl4030-core to drivers/mfd from drivers/i2c/chips,
along with its Kconfig and Makefile help.

The intent here is:  no functional change, match the patch
sent to LKML this morning (except, fix that spelling error
in the new Kconfig text).

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index e6ac6a28598a81499bf2ea60feca8a44fb9cfb35..d803c412fa6dbe829eb4a20949ab3e8da97e47cc 100644 (file)
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -151,12 +151,6 @@ config GPIOEXPANDER_OMAP
          If you say yes here you get support for I/O expander calls
          to configure IrDA, Camera and audio devices.
 
-config TWL4030_CORE
-       bool "TI's TWL4030 companion chip Core Driver Support"
-       depends on I2C=y && (ARCH_OMAP24XX || ARCH_OMAP34XX)
-       help
-         Say yes here if you have TWL4030 chip on your board
-
 config TWL4030_MADC
        tristate "TWL4030 MADC Driver"
        depends on TWL4030_CORE

diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index 75c531ab7a7d926bf110b4764091b445b367443d..ba41a574576b41d46bf5b100702bab7ad954b36f 100644 (file)
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -24,7 +24,7 @@ obj-$(CONFIG_GPIOEXPANDER_OMAP)       += gpio_expander_omap.o
 obj-$(CONFIG_MENELAUS)         += menelaus.o
 obj-$(CONFIG_SENSORS_TSL2550)  += tsl2550.o
 obj-$(CONFIG_SENSORS_TSL2563)  += tsl2563.o
-obj-$(CONFIG_TWL4030_CORE)     += twl4030-core.o twl4030-pwrirq.o twl4030-power.o
+obj-$(CONFIG_TWL4030_CORE)     += twl4030-pwrirq.o twl4030-power.o
 obj-$(CONFIG_TWL4030_USB)      += twl4030-usb.o
 obj-$(CONFIG_TWL4030_POWEROFF) += twl4030-poweroff.o
 obj-$(CONFIG_TWL4030_PWRBUTTON)        += twl4030-pwrbutton.o

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 10c44d3fe01a429172855d2b76ea54e9255b6779..e70e19aa11f027d3371265b45e6f3ae5d0f24a6a 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -50,6 +50,20 @@ config HTC_PASIC3
          HTC Magician devices, respectively. Actual functionality is
          handled by the leds-pasic3 and ds1wm drivers.
 
+config TWL4030_CORE
+       bool "Texas Instruments TWL4030/TPS659x0 Support"
+       depends on I2C=y && GENERIC_HARDIRQS && (ARCH_OMAP2 || ARCH_OMAP3)
+       help
+         Say yes here if you have TWL4030 family chip on your board.
+         This core driver provides register access and IRQ handling
+         facilities, and registers devices for the various functions
+         so that function-specific drivers can bind to them.
+
+         These multi-function chips are found on many OMAP2 and OMAP3
+         boards, providing power management, RTC, GPIO, keypad, a
+         high speed USB OTG transceiver, an audio codec (on most
+         versions) and many other features.
+
 config MFD_TMIO
        bool
        default n

diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 03ad239ecef0ba0fde5cc1dbebe579203953174f..5650e7b4e8eaaeccebaa25f54251ddefa83bc9e8 100644 (file)
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -12,6 +12,8 @@ obj-$(CONFIG_MFD_T7L66XB)     += t7l66xb.o
 obj-$(CONFIG_MFD_TC6387XB)     += tc6387xb.o
 obj-$(CONFIG_MFD_TC6393XB)     += tc6393xb.o
 
+obj-$(CONFIG_TWL4030_CORE)     += twl4030-core.o
+
 obj-$(CONFIG_MFD_CORE)         += mfd-core.o
 
 obj-$(CONFIG_MCP)              += mcp-core.o

diff --git a/drivers/i2c/chips/twl4030-core.c b/drivers/mfd/twl4030-core.c
similarity index 100%
rename from drivers/i2c/chips/twl4030-core.c
rename to drivers/mfd/twl4030-core.c