ARM: OMAP: Rename twl4030* driver files to enable re-use
Subsystems (12)
PATCH v3 1/4 ARM: OMAP: Rename twl4030* driver files to enable re-use
From: Santosh Shilimkar <[email protected]>
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.
---
arch/arm/mach-omap2/board-2430sdp.c | 2 +-
arch/arm/mach-omap2/board-3430sdp.c | 2 +-
arch/arm/mach-omap2/board-ldp.c | 2 +-
arch/arm/mach-omap2/board-omap3beagle.c | 2 +-
arch/arm/mach-omap2/board-omap3pandora.c | 2 +-
arch/arm/mach-omap2/board-overo.c | 2 +-
drivers/gpio/twl4030-gpio.c | 2 +-
drivers/input/misc/twl4030-pwrbutton.c | 2 +-
drivers/mfd/Makefile | 2 +-
drivers/mfd/{twl4030-core.c => twl-core.c} | 2 +-
drivers/mfd/twl4030-irq.c | 2 +-
drivers/regulator/Makefile | 2 +-
.../{twl4030-regulator.c => twl-regulator.c} | 2 +-
drivers/rtc/Makefile | 2 +-
drivers/rtc/{rtc-twl4030.c => rtc-twl.c} | 2 +-
drivers/usb/otg/twl4030-usb.c | 2 +-
drivers/watchdog/twl4030_wdt.c | 2 +-
include/linux/i2c/{twl4030.h => twl.h} | 0
sound/soc/codecs/twl4030.c | 2 +-
19 files changed, 18 insertions(+), 18 deletions(-)
rename drivers/mfd/{twl4030-core.c => twl-core.c} (99%)
rename drivers/regulator/{twl4030-regulator.c => twl-regulator.c} (99%)
rename drivers/rtc/{rtc-twl4030.c => rtc-twl.c} (99%)
rename include/linux/i2c/{twl4030.h => twl.h} (100%)arch/arm/mach-omap2/board-2430sdp.c +1 -1
@@ -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>
arch/arm/mach-omap2/board-3430sdp.c +1 -1
@@ -19,7 +19,7 @@#include <linux/input.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>
arch/arm/mach-omap2/board-ldp.c +1 -1
@@ -23,7 +23,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>
arch/arm/mach-omap2/board-omap3beagle.c +1 -1
@@ -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>
arch/arm/mach-omap2/board-omap3pandora.c +1 -1
@@ -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/gpio_keys.h>
arch/arm/mach-omap2/board-overo.c +1 -1
@@ -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>
drivers/gpio/twl4030-gpio.c +1 -1
@@ -34,7 +34,7 @@#include <linux/platform_device.h> #include <linux/slab.h> -#include <linux/i2c/twl4030.h> +#include <linux/i2c/twl.h> /*
drivers/input/misc/twl4030-pwrbutton.c +1 -1
@@ -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)
drivers/mfd/Makefile +1 -1
@@ -22,7 +22,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_MFD_CORE) += mfd-core.o
drivers/mfd/twl-core.c renamed from drivers/mfd/twl4030-core.c +1 -1
@@ -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 <mach/cpu.h>
drivers/mfd/twl4030-irq.c +1 -1
@@ -32,7 +32,7 @@#include <linux/irq.h> #include <linux/kthread.h> -#include <linux/i2c/twl4030.h> +#include <linux/i2c/twl.h> /*
drivers/regulator/Makefile +1 -1
@@ -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_WM8350) += wm8350-regulator.o obj-$(CONFIG_REGULATOR_WM8400) += wm8400-regulator.o obj-$(CONFIG_REGULATOR_DA903X) += da903x.o
drivers/regulator/twl-regulator.c renamed from drivers/regulator/twl4030-regulator.c +1 -1
@@ -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> /*
drivers/rtc/Makefile +1 -1
@@ -70,7 +70,7 @@ obj-$(CONFIG_RTC_DRV_SA1100) += rtc-sa1100.o obj-$(CONFIG_RTC_DRV_SH) += rtc-sh.o obj-$(CONFIG_RTC_DRV_STK17TA8) += rtc-stk17ta8.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
drivers/rtc/rtc-twl.c renamed from drivers/rtc/rtc-twl4030.c +1 -1
@@ -28,7 +28,7 @@#include <linux/platform_device.h> #include <linux/interrupt.h> -#include <linux/i2c/twl4030.h> +#include <linux/i2c/twl.h> /*
drivers/usb/otg/twl4030-usb.c +1 -1
@@ -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>
drivers/watchdog/twl4030_wdt.c +1 -1
@@ -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
include/linux/i2c/twl.h renamed from include/linux/i2c/twl4030.h +0 -0
sound/soc/codecs/twl4030.c +1 -1
@@ -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>
Signature · 1 line
1.5.4.7
Quoted 8 lines · On Thu, Oct 01, 2009 at 05:46:49PM +0530, [email protected] wrote:
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.
sound/soc/codecs/twl4030.c | 2 +-
Nack on this part of the change.
The TWL6030 audio architecture is noticably different to the TWL4030 audio architecture, most of the digital functionality has been moved into the OMAP and the I2S/DSP DAIs replaced by PDM links. Merging the two drivers was previously suggested in response to the TWL6030 CODEC driver postings but Misael Lopez Cruz (who is doing the driver) wasn't happy with the idea.
Quoted 11 lines · On Thu, Oct 01, 2009 at 05:46:49PM +0530, [email protected] wrote:
Quoted 9 lines
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.
sound/soc/codecs/twl4030.c | 2 +-
Quoted 8 lines
Nack on this part of the change.
The TWL6030 audio architecture is noticably different to the TWL4030 audio architecture, most of the digital functionality has been moved into the OMAP and the I2S/DSP DAIs replaced by PDM links. Merging the two drivers was previously suggested in response to the TWL6030 CODEC driver postings but Misael Lopez Cruz (who is doing the driver) wasn't happy with the idea.
I agree that TWL6030 codec will very different from TWL4030 codec and two separate drivers will exist for twl4030 and twl6030.c
The patch which is posted now will make both codec to use the same i2c read /write api like twl_i2c_write_u8, twl_i2c_read_u8 ...
Quoted 2 lines · Balaji T
The patch which is posted now will make both codec to use the same i2c read /write api like
twl_i2c_write_u8,twl_i2c_read_u8...
Ah, I see. In that case I'm fine with the change.
Mark,
Quoted 32 lines
-----Original Message-----
From: Krishnamoorthy, Balaji T
Sent: Thursday, October 01, 2009 6:27 PM
To: Mark Brown
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Shilimkar, Santosh; Nayak, Rajendra; Lopez Cruz, Misael
Subject: RE: [PATCH v3 01/04] ARM: OMAP: Rename twl4030* driver files to enable re-useQuoted 3 lines · On Thu, Oct 01, 2009 at 05:46:49PM +0530, [email protected] wrote:
Quoted 2 lines
The upcoming TWL6030 is companion chip for OMAP4 like the current
TWL4030
Quoted 8 lines
Quoted 7 lines
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.
sound/soc/codecs/twl4030.c | 2 +-Quoted 8 lines
Nack on this part of the change.
The TWL6030 audio architecture is noticably different to the TWL4030 audio architecture, most of the digital functionality has been moved into the OMAP and the I2S/DSP DAIs replaced by PDM links. Merging the two drivers was previously suggested in response to the TWL6030 CODEC driver postings but Misael Lopez Cruz (who is doing the driver) wasn't happy with the idea.
Quoted 5 lines
I agree that TWL6030 codec will very different from TWL4030 codec and two separate drivers will exist for twl4030 and
twl6030.c
The patch which is posted now will make both codec to use the same i2c read
/write api liketwl_i2c_write_u8,twl_i2c_read_u8...
This patch doesn't rename "sound/soc/codecs/twl4030.c". The change is just correcting the header file. As discussed and agreed the TWL6030 codec can be a separate file from TWL4030 codec.
Regards,
Santosh