mfd: Rename twl4030* driver files to enable re-use

The upcoming TWL6030 is companion chip for OMAP4 like the current TWL4030 for OMAP3. The common modules like RTC, Regulator creates opportunity to re-use the most of the code from twl4030. This patch renames few common drivers twl4030* files to twl* to enable the code re-use. Signed-off-by: Rajendra Nayak <rnayak@ti.com> Signed-off-by: Balaji T K <balajitk@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by: Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
author: Santosh Shilimkar <santosh.shilimkar@ti.com> 2009-12-13 14:05:51 -0500
committer: Samuel Ortiz <sameo@linux.intel.com> 2009-12-13 14:05:51 -0500
commit: b07682b6056eb6701f8cb86aa5800e6f2ea7919b (patch)
tree: 178461d70dd9996c9d5340221e8389dc67448da8
parent: 147e084792f22b52df65a3d9d0e8b2a9233e0aa8 (diff)
22 files changed, 21 insertions, 21 deletions
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c
index db9374bc528b..e508904fb67e 100644
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@ -19,7 +19,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/delay.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 #include <linux/err.h>
 #include <linux/clk.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index 4cfb7b68dfad..c90b0d0b1927 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -20,7 +20,7 @@
 #include <linux/input/matrix_keypad.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 #include <linux/regulator/machine.h>
 #include <linux/io.h>
 #include <linux/gpio.h>
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index 37431738f1c2..995d4a2b2dfd 100644
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -24,7 +24,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 #include <linux/regulator/machine.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 #include <linux/io.h>
 #include <linux/smsc911x.h>
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 6ada8029f9a8..231cb4ec1847 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -29,7 +29,7 @@
 #include <linux/mtd/nand.h>
 #include <linux/regulator/machine.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index 6f6c601eeab7..ef17cf1ab6d7 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -24,7 +24,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 #include <linux/regulator/machine.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 #include <linux/leds.h>
 #include <linux/input.h>
 #include <linux/input/matrix_keypad.h>
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index 5b78a87217e0..d192dd98a591 100644
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -26,7 +26,7 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 #include <linux/regulator/machine.h>
 #include <linux/mtd/mtd.h>
diff --git a/drivers/gpio/twl4030-gpio.c b/drivers/gpio/twl4030-gpio.c
index 49384a7c5492..a320d7bfe67c 100644
--- a/drivers/gpio/twl4030-gpio.c
+++ b/drivers/gpio/twl4030-gpio.c
@@ -34,7 +34,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 /*
diff --git a/drivers/input/keyboard/twl4030_keypad.c b/drivers/input/keyboard/twl4030_keypad.c
index 9a2977c21696..1d1536a2fe46 100644
--- a/drivers/input/keyboard/twl4030_keypad.c
+++ b/drivers/input/keyboard/twl4030_keypad.c
@@ -31,7 +31,7 @@
 #include <linux/interrupt.h>
 #include <linux/input.h>
 #include <linux/platform_device.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 /*
diff --git a/drivers/input/misc/twl4030-pwrbutton.c b/drivers/input/misc/twl4030-pwrbutton.c
index f5fc9974a111..a73b889fff79 100644
--- a/drivers/input/misc/twl4030-pwrbutton.c
+++ b/drivers/input/misc/twl4030-pwrbutton.c
@@ -27,7 +27,7 @@
 #include <linux/input.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 #define PWR_PWRON_IRQ (1 << 0)
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 75638ca8288b..f4d14b7589bf 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -26,7 +26,7 @@ obj-$(CONFIG_MFD_WM8350_I2C)	+= wm8350-i2c.o
 obj-$(CONFIG_TPS65010)          += tps65010.o
 obj-$(CONFIG_MENELAUS)          += menelaus.o
-obj-$(CONFIG_TWL4030_CORE)      += twl4030-core.o twl4030-irq.o
+obj-$(CONFIG_TWL4030_CORE)      += twl-core.o twl4030-irq.o
 obj-$(CONFIG_TWL4030_POWER)    += twl4030-power.o
 obj-$(CONFIG_TWL4030_CODEC)     += twl4030-codec.o
diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl-core.c
index 7c2ec0aa9d87..44714f5cf495 100644
--- a/drivers/mfd/twl4030-core.c
+++ b/drivers/mfd/twl-core.c
@@ -36,7 +36,7 @@
 #include <linux/regulator/machine.h>
 #include <linux/i2c.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
 #include <plat/cpu.h>
diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
index 3f7e93ca0514..c4528db549c6 100644
--- a/drivers/mfd/twl4030-irq.c
+++ b/drivers/mfd/twl4030-irq.c
@@ -32,7 +32,7 @@
 #include <linux/irq.h>
 #include <linux/kthread.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 /*
diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
index 3048f18e0419..424b255d6f92 100644
--- a/drivers/mfd/twl4030-power.c
+++ b/drivers/mfd/twl4030-power.c
@@ -26,7 +26,7 @@
 #include <linux/module.h>
 #include <linux/pm.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 #include <linux/platform_device.h>
 #include <asm/mach-types.h>
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 4257a8683778..9ae3cc44e668 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -11,7 +11,7 @@ obj-$(CONFIG_REGULATOR_USERSPACE_CONSUMER) += userspace-consumer.o
 obj-$(CONFIG_REGULATOR_BQ24022) += bq24022.o
 obj-$(CONFIG_REGULATOR_LP3971) += lp3971.o
 obj-$(CONFIG_REGULATOR_MAX1586) += max1586.o
-obj-$(CONFIG_REGULATOR_TWL4030) += twl4030-regulator.o
+obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o
 obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o
 obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o
 obj-$(CONFIG_REGULATOR_WM831X) += wm831x-ldo.o
diff --git a/drivers/regulator/twl4030-regulator.c b/drivers/regulator/twl-regulator.c
index e2032fb60b55..c8a6e583d773 100644
--- a/drivers/regulator/twl4030-regulator.c
+++ b/drivers/regulator/twl-regulator.c
@@ -15,7 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 /*
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index af1ba7ae2857..7da6efb3e953 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -80,7 +80,7 @@ obj-$(CONFIG_RTC_DRV_STK17TA8)	+= rtc-stk17ta8.o
 obj-$(CONFIG_RTC_DRV_STMP)      += rtc-stmp3xxx.o
 obj-$(CONFIG_RTC_DRV_SUN4V)     += rtc-sun4v.o
 obj-$(CONFIG_RTC_DRV_TEST)      += rtc-test.o
-obj-$(CONFIG_RTC_DRV_TWL4030)   += rtc-twl4030.o
+obj-$(CONFIG_RTC_DRV_TWL4030)   += rtc-twl.o
 obj-$(CONFIG_RTC_DRV_TX4939)    += rtc-tx4939.o
 obj-$(CONFIG_RTC_DRV_V3020)     += rtc-v3020.o
 obj-$(CONFIG_RTC_DRV_VR41XX)    += rtc-vr41xx.o
diff --git a/drivers/rtc/rtc-twl4030.c b/drivers/rtc/rtc-twl.c
index 9c8c70c497dc..93565be12fae 100644
--- a/drivers/rtc/rtc-twl4030.c
+++ b/drivers/rtc/rtc-twl.c
@@ -28,7 +28,7 @@
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 /*
diff --git a/drivers/usb/otg/twl4030-usb.c b/drivers/usb/otg/twl4030-usb.c
index bd9883f41e63..3acbdb82bcf9 100644
--- a/drivers/usb/otg/twl4030-usb.c
+++ b/drivers/usb/otg/twl4030-usb.c
@@ -33,7 +33,7 @@
 #include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/usb/otg.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 #include <linux/regulator/consumer.h>
 #include <linux/err.h>
diff --git a/drivers/video/omap/lcd_2430sdp.c b/drivers/video/omap/lcd_2430sdp.c
index 760645d9dbb6..3764a36d9142 100644
--- a/drivers/video/omap/lcd_2430sdp.c
+++ b/drivers/video/omap/lcd_2430sdp.c
@@ -25,7 +25,7 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/gpio.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 #include <plat/mux.h>
 #include <asm/mach-types.h>
diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c
index cb46556f2973..20968b2aadef 100644
--- a/drivers/watchdog/twl4030_wdt.c
+++ b/drivers/watchdog/twl4030_wdt.c
@@ -26,7 +26,7 @@
 #include <linux/platform_device.h>
 #include <linux/miscdevice.h>
 #include <linux/uaccess.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 #define TWL4030_WATCHDOG_CFG_REG_OFFS   0x3
diff --git a/include/linux/i2c/twl4030.h b/include/linux/i2c/twl.h
index a50bcf8a4048..a50bcf8a4048 100644
--- a/include/linux/i2c/twl4030.h
+++ b/include/linux/i2c/twl.h
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 5f1681f6ca76..c3a6ceb542cb 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -26,7 +26,7 @@
 #include <linux/pm.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
author	Santosh Shilimkar <santosh.shilimkar@ti.com>	2009-12-13 14:05:51 -0500
committer	Samuel Ortiz <sameo@linux.intel.com>	2009-12-13 14:05:51 -0500
commit	b07682b6056eb6701f8cb86aa5800e6f2ea7919b (patch)
tree	178461d70dd9996c9d5340221e8389dc67448da8
parent	147e084792f22b52df65a3d9d0e8b2a9233e0aa8 (diff)

diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c index db9374bc528b..e508904fb67e 100644 --- a/arch/arm/mach-omap2/board-2430sdp.c +++ b/arch/arm/mach-omap2/board-2430sdp.c
@@ -19,7 +19,7 @@
19	#include <linux/mtd/mtd.h>	19	#include <linux/mtd/mtd.h>
20	#include <linux/mtd/partitions.h>	20	#include <linux/mtd/partitions.h>
21	#include <linux/delay.h>	21	#include <linux/delay.h>
22	#include <linux/i2c/twl4030.h>	22	#include <linux/i2c/twl.h>
23	#include <linux/err.h>	23	#include <linux/err.h>
24	#include <linux/clk.h>	24	#include <linux/clk.h>
25	#include <linux/io.h>	25	#include <linux/io.h>


diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index 4cfb7b68dfad..c90b0d0b1927 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -20,7 +20,7 @@
20	#include <linux/input/matrix_keypad.h>	20	#include <linux/input/matrix_keypad.h>
21	#include <linux/spi/spi.h>	21	#include <linux/spi/spi.h>
22	#include <linux/spi/ads7846.h>	22	#include <linux/spi/ads7846.h>
23	#include <linux/i2c/twl4030.h>	23	#include <linux/i2c/twl.h>
24	#include <linux/regulator/machine.h>	24	#include <linux/regulator/machine.h>
25	#include <linux/io.h>	25	#include <linux/io.h>
26	#include <linux/gpio.h>	26	#include <linux/gpio.h>


diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index 37431738f1c2..995d4a2b2dfd 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c
@@ -24,7 +24,7 @@
24	#include <linux/spi/spi.h>	24	#include <linux/spi/spi.h>
25	#include <linux/spi/ads7846.h>	25	#include <linux/spi/ads7846.h>
26	#include <linux/regulator/machine.h>	26	#include <linux/regulator/machine.h>
27	#include <linux/i2c/twl4030.h>	27	#include <linux/i2c/twl.h>
28	#include <linux/io.h>	28	#include <linux/io.h>
29	#include <linux/smsc911x.h>	29	#include <linux/smsc911x.h>
30		30


diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 6ada8029f9a8..231cb4ec1847 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -29,7 +29,7 @@
29	#include <linux/mtd/nand.h>	29	#include <linux/mtd/nand.h>
30		30
31	#include <linux/regulator/machine.h>	31	#include <linux/regulator/machine.h>
32	#include <linux/i2c/twl4030.h>	32	#include <linux/i2c/twl.h>
33		33
34	#include <mach/hardware.h>	34	#include <mach/hardware.h>
35	#include <asm/mach-types.h>	35	#include <asm/mach-types.h>


diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index 6f6c601eeab7..ef17cf1ab6d7 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -24,7 +24,7 @@
24	#include <linux/spi/spi.h>	24	#include <linux/spi/spi.h>
25	#include <linux/spi/ads7846.h>	25	#include <linux/spi/ads7846.h>
26	#include <linux/regulator/machine.h>	26	#include <linux/regulator/machine.h>
27	#include <linux/i2c/twl4030.h>	27	#include <linux/i2c/twl.h>
28	#include <linux/leds.h>	28	#include <linux/leds.h>
29	#include <linux/input.h>	29	#include <linux/input.h>
30	#include <linux/input/matrix_keypad.h>	30	#include <linux/input/matrix_keypad.h>


diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index 5b78a87217e0..d192dd98a591 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c
@@ -26,7 +26,7 @@
26	#include <linux/io.h>	26	#include <linux/io.h>
27	#include <linux/kernel.h>	27	#include <linux/kernel.h>
28	#include <linux/platform_device.h>	28	#include <linux/platform_device.h>
29	#include <linux/i2c/twl4030.h>	29	#include <linux/i2c/twl.h>
30	#include <linux/regulator/machine.h>	30	#include <linux/regulator/machine.h>
31		31
32	#include <linux/mtd/mtd.h>	32	#include <linux/mtd/mtd.h>


diff --git a/drivers/gpio/twl4030-gpio.c b/drivers/gpio/twl4030-gpio.c index 49384a7c5492..a320d7bfe67c 100644 --- a/drivers/gpio/twl4030-gpio.c +++ b/drivers/gpio/twl4030-gpio.c
@@ -34,7 +34,7 @@
34	#include <linux/platform_device.h>	34	#include <linux/platform_device.h>
35	#include <linux/slab.h>	35	#include <linux/slab.h>
36		36
37	#include <linux/i2c/twl4030.h>	37	#include <linux/i2c/twl.h>
38		38
39		39
40	/*	40	/*


diff --git a/drivers/input/keyboard/twl4030_keypad.c b/drivers/input/keyboard/twl4030_keypad.c index 9a2977c21696..1d1536a2fe46 100644 --- a/drivers/input/keyboard/twl4030_keypad.c +++ b/drivers/input/keyboard/twl4030_keypad.c
@@ -31,7 +31,7 @@
31	#include <linux/interrupt.h>	31	#include <linux/interrupt.h>
32	#include <linux/input.h>	32	#include <linux/input.h>
33	#include <linux/platform_device.h>	33	#include <linux/platform_device.h>
34	#include <linux/i2c/twl4030.h>	34	#include <linux/i2c/twl.h>
35		35
36		36
37	/*	37	/*


diff --git a/drivers/input/misc/twl4030-pwrbutton.c b/drivers/input/misc/twl4030-pwrbutton.c index f5fc9974a111..a73b889fff79 100644 --- a/drivers/input/misc/twl4030-pwrbutton.c +++ b/drivers/input/misc/twl4030-pwrbutton.c
@@ -27,7 +27,7 @@
27	#include <linux/input.h>	27	#include <linux/input.h>
28	#include <linux/interrupt.h>	28	#include <linux/interrupt.h>
29	#include <linux/platform_device.h>	29	#include <linux/platform_device.h>
30	#include <linux/i2c/twl4030.h>	30	#include <linux/i2c/twl.h>
31		31
32	#define PWR_PWRON_IRQ (1 << 0)	32	#define PWR_PWRON_IRQ (1 << 0)
33		33


diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 75638ca8288b..f4d14b7589bf 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile
@@ -26,7 +26,7 @@ obj-$(CONFIG_MFD_WM8350_I2C) += wm8350-i2c.o
26	obj-$(CONFIG_TPS65010) += tps65010.o	26	obj-$(CONFIG_TPS65010) += tps65010.o
27	obj-$(CONFIG_MENELAUS) += menelaus.o	27	obj-$(CONFIG_MENELAUS) += menelaus.o
28		28
29	obj-$(CONFIG_TWL4030_CORE) += twl4030-core.o twl4030-irq.o	29	obj-$(CONFIG_TWL4030_CORE) += twl-core.o twl4030-irq.o
30	obj-$(CONFIG_TWL4030_POWER) += twl4030-power.o	30	obj-$(CONFIG_TWL4030_POWER) += twl4030-power.o
31	obj-$(CONFIG_TWL4030_CODEC) += twl4030-codec.o	31	obj-$(CONFIG_TWL4030_CODEC) += twl4030-codec.o
32		32


diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl-core.c index 7c2ec0aa9d87..44714f5cf495 100644 --- a/drivers/mfd/twl4030-core.c +++ b/drivers/mfd/twl-core.c
@@ -36,7 +36,7 @@
36	#include <linux/regulator/machine.h>	36	#include <linux/regulator/machine.h>
37		37
38	#include <linux/i2c.h>	38	#include <linux/i2c.h>
39	#include <linux/i2c/twl4030.h>	39	#include <linux/i2c/twl.h>
40		40
41	#if defined(CONFIG_ARCH_OMAP2) \|\| defined(CONFIG_ARCH_OMAP3)	41	#if defined(CONFIG_ARCH_OMAP2) \|\| defined(CONFIG_ARCH_OMAP3)
42	#include <plat/cpu.h>	42	#include <plat/cpu.h>


diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c index 3f7e93ca0514..c4528db549c6 100644 --- a/drivers/mfd/twl4030-irq.c +++ b/drivers/mfd/twl4030-irq.c
@@ -32,7 +32,7 @@
32	#include <linux/irq.h>	32	#include <linux/irq.h>
33	#include <linux/kthread.h>	33	#include <linux/kthread.h>
34		34
35	#include <linux/i2c/twl4030.h>	35	#include <linux/i2c/twl.h>
36		36
37		37
38	/*	38	/*


diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c index 3048f18e0419..424b255d6f92 100644 --- a/drivers/mfd/twl4030-power.c +++ b/drivers/mfd/twl4030-power.c
@@ -26,7 +26,7 @@
26		26
27	#include <linux/module.h>	27	#include <linux/module.h>
28	#include <linux/pm.h>	28	#include <linux/pm.h>
29	#include <linux/i2c/twl4030.h>	29	#include <linux/i2c/twl.h>
30	#include <linux/platform_device.h>	30	#include <linux/platform_device.h>
31		31
32	#include <asm/mach-types.h>	32	#include <asm/mach-types.h>


diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index 4257a8683778..9ae3cc44e668 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile
@@ -11,7 +11,7 @@ obj-$(CONFIG_REGULATOR_USERSPACE_CONSUMER) += userspace-consumer.o
11	obj-$(CONFIG_REGULATOR_BQ24022) += bq24022.o	11	obj-$(CONFIG_REGULATOR_BQ24022) += bq24022.o
12	obj-$(CONFIG_REGULATOR_LP3971) += lp3971.o	12	obj-$(CONFIG_REGULATOR_LP3971) += lp3971.o
13	obj-$(CONFIG_REGULATOR_MAX1586) += max1586.o	13	obj-$(CONFIG_REGULATOR_MAX1586) += max1586.o
14	obj-$(CONFIG_REGULATOR_TWL4030) += twl4030-regulator.o	14	obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o
15	obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o	15	obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o
16	obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o	16	obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o
17	obj-$(CONFIG_REGULATOR_WM831X) += wm831x-ldo.o	17	obj-$(CONFIG_REGULATOR_WM831X) += wm831x-ldo.o


diff --git a/drivers/regulator/twl4030-regulator.c b/drivers/regulator/twl-regulator.c index e2032fb60b55..c8a6e583d773 100644 --- a/drivers/regulator/twl4030-regulator.c +++ b/drivers/regulator/twl-regulator.c
@@ -15,7 +15,7 @@
15	#include <linux/platform_device.h>	15	#include <linux/platform_device.h>
16	#include <linux/regulator/driver.h>	16	#include <linux/regulator/driver.h>
17	#include <linux/regulator/machine.h>	17	#include <linux/regulator/machine.h>
18	#include <linux/i2c/twl4030.h>	18	#include <linux/i2c/twl.h>
19		19
20		20
21	/*	21	/*


diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index af1ba7ae2857..7da6efb3e953 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile
@@ -80,7 +80,7 @@ obj-$(CONFIG_RTC_DRV_STK17TA8) += rtc-stk17ta8.o
80	obj-$(CONFIG_RTC_DRV_STMP) += rtc-stmp3xxx.o	80	obj-$(CONFIG_RTC_DRV_STMP) += rtc-stmp3xxx.o
81	obj-$(CONFIG_RTC_DRV_SUN4V) += rtc-sun4v.o	81	obj-$(CONFIG_RTC_DRV_SUN4V) += rtc-sun4v.o
82	obj-$(CONFIG_RTC_DRV_TEST) += rtc-test.o	82	obj-$(CONFIG_RTC_DRV_TEST) += rtc-test.o
83	obj-$(CONFIG_RTC_DRV_TWL4030) += rtc-twl4030.o	83	obj-$(CONFIG_RTC_DRV_TWL4030) += rtc-twl.o
84	obj-$(CONFIG_RTC_DRV_TX4939) += rtc-tx4939.o	84	obj-$(CONFIG_RTC_DRV_TX4939) += rtc-tx4939.o
85	obj-$(CONFIG_RTC_DRV_V3020) += rtc-v3020.o	85	obj-$(CONFIG_RTC_DRV_V3020) += rtc-v3020.o
86	obj-$(CONFIG_RTC_DRV_VR41XX) += rtc-vr41xx.o	86	obj-$(CONFIG_RTC_DRV_VR41XX) += rtc-vr41xx.o


diff --git a/drivers/rtc/rtc-twl4030.c b/drivers/rtc/rtc-twl.c index 9c8c70c497dc..93565be12fae 100644 --- a/drivers/rtc/rtc-twl4030.c +++ b/drivers/rtc/rtc-twl.c
@@ -28,7 +28,7 @@
28	#include <linux/platform_device.h>	28	#include <linux/platform_device.h>
29	#include <linux/interrupt.h>	29	#include <linux/interrupt.h>
30		30
31	#include <linux/i2c/twl4030.h>	31	#include <linux/i2c/twl.h>
32		32
33		33
34	/*	34	/*


diff --git a/drivers/usb/otg/twl4030-usb.c b/drivers/usb/otg/twl4030-usb.c index bd9883f41e63..3acbdb82bcf9 100644 --- a/drivers/usb/otg/twl4030-usb.c +++ b/drivers/usb/otg/twl4030-usb.c
@@ -33,7 +33,7 @@
33	#include <linux/io.h>	33	#include <linux/io.h>
34	#include <linux/delay.h>	34	#include <linux/delay.h>
35	#include <linux/usb/otg.h>	35	#include <linux/usb/otg.h>
36	#include <linux/i2c/twl4030.h>	36	#include <linux/i2c/twl.h>
37	#include <linux/regulator/consumer.h>	37	#include <linux/regulator/consumer.h>
38	#include <linux/err.h>	38	#include <linux/err.h>
39		39


diff --git a/drivers/video/omap/lcd_2430sdp.c b/drivers/video/omap/lcd_2430sdp.c index 760645d9dbb6..3764a36d9142 100644 --- a/drivers/video/omap/lcd_2430sdp.c +++ b/drivers/video/omap/lcd_2430sdp.c
@@ -25,7 +25,7 @@
25	#include <linux/platform_device.h>	25	#include <linux/platform_device.h>
26	#include <linux/delay.h>	26	#include <linux/delay.h>
27	#include <linux/gpio.h>	27	#include <linux/gpio.h>
28	#include <linux/i2c/twl4030.h>	28	#include <linux/i2c/twl.h>
29		29
30	#include <plat/mux.h>	30	#include <plat/mux.h>
31	#include <asm/mach-types.h>	31	#include <asm/mach-types.h>


diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c index cb46556f2973..20968b2aadef 100644 --- a/drivers/watchdog/twl4030_wdt.c +++ b/drivers/watchdog/twl4030_wdt.c
@@ -26,7 +26,7 @@
26	#include <linux/platform_device.h>	26	#include <linux/platform_device.h>
27	#include <linux/miscdevice.h>	27	#include <linux/miscdevice.h>
28	#include <linux/uaccess.h>	28	#include <linux/uaccess.h>
29	#include <linux/i2c/twl4030.h>	29	#include <linux/i2c/twl.h>
30		30
31	#define TWL4030_WATCHDOG_CFG_REG_OFFS 0x3	31	#define TWL4030_WATCHDOG_CFG_REG_OFFS 0x3
32		32


diff --git a/include/linux/i2c/twl4030.h b/include/linux/i2c/twl.h index a50bcf8a4048..a50bcf8a4048 100644 --- a/include/linux/i2c/twl4030.h +++ b/include/linux/i2c/twl.h


diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 5f1681f6ca76..c3a6ceb542cb 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c
@@ -26,7 +26,7 @@
26	#include <linux/pm.h>	26	#include <linux/pm.h>
27	#include <linux/i2c.h>	27	#include <linux/i2c.h>
28	#include <linux/platform_device.h>	28	#include <linux/platform_device.h>
29	#include <linux/i2c/twl4030.h>	29	#include <linux/i2c/twl.h>
30	#include <sound/core.h>	30	#include <sound/core.h>
31	#include <sound/pcm.h>	31	#include <sound/pcm.h>
32	#include <sound/pcm_params.h>	32	#include <sound/pcm_params.h>