* [PATCH v2] mfd: twl: fix twl4030 rename for remaining driver, board files
@ 2009-12-15 14:39 balajitk
2009-12-15 16:10 ` Krishnamoorthy, Balaji T
0 siblings, 1 reply; 6+ messages in thread
From: balajitk @ 2009-12-15 14:39 UTC (permalink / raw)
To: linux-omap, sameo; +Cc: broonie, tony, sfr, felipe.balbi, lrg, Balaji T K
From: Balaji T K <balajitk@ti.com>
This patch renames include twl4030.h to include twl.h
and also renames twl4030_i2c_ routines
Signed-off-by: Balaji T K <balajitk@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Reviewed-by: Felipe Balbi <felipe.balbi@nokia.com>
---
rebased the patch on latest mainline
commit 3ea6b3d0e6d0ffd91c0f8cadeb69b7133c038b32
arch/arm/mach-omap2/board-cm-t35.c | 2 +-
arch/arm/mach-omap2/board-igep0020.c | 2 +-
arch/arm/mach-omap2/board-omap3evm.c | 2 +-
arch/arm/mach-omap2/board-omap3touchbook.c | 2 +-
arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +-
arch/arm/mach-omap2/board-zoom-peripherals.c | 2 +-
drivers/mfd/twl4030-codec.c | 10 +++++-----
drivers/video/omap/lcd_ldp.c | 4 ++--
drivers/video/omap/lcd_omap2evm.c | 10 +++++-----
drivers/video/omap/lcd_omap3beagle.c | 2 +-
drivers/video/omap/lcd_omap3evm.c | 10 +++++-----
drivers/video/omap/lcd_overo.c | 2 +-
sound/soc/omap/sdp3430.c | 6 +++---
13 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 1591aae..2626a9f 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -29,7 +29,7 @@
#include <linux/gpio.h>
#include <linux/i2c/at24.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
#include <linux/regulator/machine.h>
#include <asm/mach-types.h>
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 44239e3..117b8fd 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -19,7 +19,7 @@
#include <linux/interrupt.h>
#include <linux/regulator/machine.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 18913e9..34de178 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -26,7 +26,7 @@
#include <linux/spi/spi.h>
#include <linux/spi/ads7846.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
#include <linux/usb/otg.h>
#include <linux/smsc911x.h>
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c
index c9e5ebb..fe3d22c 100644
--- a/arch/arm/mach-omap2/board-omap3touchbook.c
+++ b/arch/arm/mach-omap2/board-omap3touchbook.c
@@ -34,7 +34,7 @@
#include <linux/spi/ads7846.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-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index 17f3c91..acafdbc 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -16,7 +16,7 @@
#include <linux/spi/spi.h>
#include <linux/spi/wl12xx.h>
#include <linux/i2c.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
#include <linux/clk.h>
#include <linux/delay.h>
#include <linux/regulator/machine.h>
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c
index 258794d..8dd277c 100755
--- a/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -14,7 +14,7 @@
#include <linux/input.h>
#include <linux/input/matrix_keypad.h>
#include <linux/gpio.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
#include <linux/regulator/machine.h>
#include <asm/mach-types.h>
diff --git a/drivers/mfd/twl4030-codec.c b/drivers/mfd/twl4030-codec.c
index 77b9149..700b149 100644
--- a/drivers/mfd/twl4030-codec.c
+++ b/drivers/mfd/twl4030-codec.c
@@ -26,7 +26,7 @@
#include <linux/kernel.h>
#include <linux/fs.h>
#include <linux/platform_device.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
#include <linux/mfd/core.h>
#include <linux/mfd/twl4030-codec.h>
@@ -56,7 +56,7 @@ static int twl4030_codec_set_resource(enum twl4030_codec_res id, int enable)
struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev);
u8 val;
- twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val,
+ twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val,
codec->resource[id].reg);
if (enable)
@@ -64,7 +64,7 @@ static int twl4030_codec_set_resource(enum twl4030_codec_res id, int enable)
else
val &= ~codec->resource[id].mask;
- twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
+ twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
val, codec->resource[id].reg);
return val;
@@ -75,7 +75,7 @@ static inline int twl4030_codec_get_resource(enum twl4030_codec_res id)
struct twl4030_codec *codec = platform_get_drvdata(twl4030_codec_dev);
u8 val;
- twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val,
+ twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val,
codec->resource[id].reg);
return val;
@@ -183,7 +183,7 @@ static int __devinit twl4030_codec_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "Invalid audio_mclk\n");
return -EINVAL;
}
- twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
+ twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE,
val, TWL4030_REG_APLL_CTL);
codec = kzalloc(sizeof(struct twl4030_codec), GFP_KERNEL);
diff --git a/drivers/video/omap/lcd_ldp.c b/drivers/video/omap/lcd_ldp.c
index 5bb7f6f..0f5952c 100644
--- a/drivers/video/omap/lcd_ldp.c
+++ b/drivers/video/omap/lcd_ldp.c
@@ -24,7 +24,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/delay.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
#include <mach/gpio.h>
#include <plat/mux.h>
@@ -59,7 +59,7 @@
#define TWL4030_VPLL2_DEV_GRP 0x33
#define TWL4030_VPLL2_DEDICATED 0x36
-#define t2_out(c, r, v) twl4030_i2c_write_u8(c, r, v)
+#define t2_out(c, r, v) twl_i2c_write_u8(c, r, v)
static int ldp_panel_init(struct lcd_panel *panel,
diff --git a/drivers/video/omap/lcd_omap2evm.c b/drivers/video/omap/lcd_omap2evm.c
index 006c2fe..7e7a65c 100644
--- a/drivers/video/omap/lcd_omap2evm.c
+++ b/drivers/video/omap/lcd_omap2evm.c
@@ -24,7 +24,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/gpio.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
#include <plat/mux.h>
#include <asm/mach-types.h>
@@ -61,9 +61,9 @@ static int omap2evm_panel_init(struct lcd_panel *panel,
gpio_direction_output(LCD_PANEL_LR, 1);
gpio_direction_output(LCD_PANEL_UD, 1);
- twl4030_i2c_write_u8(TWL4030_MODULE_LED, 0x11, TWL_LED_LEDEN);
- twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x01, TWL_PWMA_PWMAON);
- twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x02, TWL_PWMA_PWMAOFF);
+ twl_i2c_write_u8(TWL4030_MODULE_LED, 0x11, TWL_LED_LEDEN);
+ twl_i2c_write_u8(TWL4030_MODULE_PWMA, 0x01, TWL_PWMA_PWMAON);
+ twl_i2c_write_u8(TWL4030_MODULE_PWMA, 0x02, TWL_PWMA_PWMAOFF);
bklight_level = 100;
return 0;
@@ -101,7 +101,7 @@ static int omap2evm_bklight_setlevel(struct lcd_panel *panel,
u8 c;
if ((level >= 0) && (level <= 100)) {
c = (125 * (100 - level)) / 100 + 2;
- twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, c, TWL_PWMA_PWMAOFF);
+ twl_i2c_write_u8(TWL4030_MODULE_PWMA, c, TWL_PWMA_PWMAOFF);
bklight_level = level;
}
return 0;
diff --git a/drivers/video/omap/lcd_omap3beagle.c b/drivers/video/omap/lcd_omap3beagle.c
index fc503d8..ca75cc2 100644
--- a/drivers/video/omap/lcd_omap3beagle.c
+++ b/drivers/video/omap/lcd_omap3beagle.c
@@ -23,7 +23,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/gpio.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
#include <plat/mux.h>
#include <plat/mux.h>
diff --git a/drivers/video/omap/lcd_omap3evm.c b/drivers/video/omap/lcd_omap3evm.c
index ae2edc4..06840da 100644
--- a/drivers/video/omap/lcd_omap3evm.c
+++ b/drivers/video/omap/lcd_omap3evm.c
@@ -23,7 +23,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/gpio.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
#include <plat/mux.h>
#include <asm/mach-types.h>
@@ -63,9 +63,9 @@ static int omap3evm_panel_init(struct lcd_panel *panel,
gpio_direction_output(LCD_PANEL_LR, 1);
gpio_direction_output(LCD_PANEL_UD, 1);
- twl4030_i2c_write_u8(TWL4030_MODULE_LED, 0x11, TWL_LED_LEDEN);
- twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x01, TWL_PWMA_PWMAON);
- twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x02, TWL_PWMA_PWMAOFF);
+ twl_i2c_write_u8(TWL4030_MODULE_LED, 0x11, TWL_LED_LEDEN);
+ twl_i2c_write_u8(TWL4030_MODULE_PWMA, 0x01, TWL_PWMA_PWMAON);
+ twl_i2c_write_u8(TWL4030_MODULE_PWMA, 0x02, TWL_PWMA_PWMAOFF);
bklight_level = 100;
return 0;
@@ -102,7 +102,7 @@ static int omap3evm_bklight_setlevel(struct lcd_panel *panel,
u8 c;
if ((level >= 0) && (level <= 100)) {
c = (125 * (100 - level)) / 100 + 2;
- twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, c, TWL_PWMA_PWMAOFF);
+ twl_i2c_write_u8(TWL4030_MODULE_PWMA, c, TWL_PWMA_PWMAOFF);
bklight_level = level;
}
return 0;
diff --git a/drivers/video/omap/lcd_overo.c b/drivers/video/omap/lcd_overo.c
index 56ee192..564933f 100644
--- a/drivers/video/omap/lcd_overo.c
+++ b/drivers/video/omap/lcd_overo.c
@@ -21,7 +21,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
#include <mach/gpio.h>
#include <plat/mux.h>
diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c
index c071f96..3c85c0f 100644
--- a/sound/soc/omap/sdp3430.c
+++ b/sound/soc/omap/sdp3430.c
@@ -24,7 +24,7 @@
#include <linux/clk.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/soc.h>
@@ -321,11 +321,11 @@ static int __init sdp3430_soc_init(void)
*(unsigned int *)sdp3430_dai[1].cpu_dai->private_data = 2; /* McBSP3 */
/* Set TWL4030 GPIO6 as EXTMUTE signal */
- twl4030_i2c_read_u8(TWL4030_MODULE_INTBR, &pin_mux,
+ twl_i2c_read_u8(TWL4030_MODULE_INTBR, &pin_mux,
TWL4030_INTBR_PMBR1);
pin_mux &= ~TWL4030_GPIO6_PWM0_MUTE(0x03);
pin_mux |= TWL4030_GPIO6_PWM0_MUTE(0x02);
- twl4030_i2c_write_u8(TWL4030_MODULE_INTBR, pin_mux,
+ twl_i2c_write_u8(TWL4030_MODULE_INTBR, pin_mux,
TWL4030_INTBR_PMBR1);
ret = platform_device_add(sdp3430_snd_device);
--
1.5.4.7
^ permalink raw reply related [flat|nested] 6+ messages in thread* RE: [PATCH v2] mfd: twl: fix twl4030 rename for remaining driver, board files
2009-12-15 14:39 [PATCH v2] mfd: twl: fix twl4030 rename for remaining driver, board files balajitk
@ 2009-12-15 16:10 ` Krishnamoorthy, Balaji T
2009-12-15 17:43 ` Tony Lindgren
0 siblings, 1 reply; 6+ messages in thread
From: Krishnamoorthy, Balaji T @ 2009-12-15 16:10 UTC (permalink / raw)
To: Krishnamoorthy, Balaji T, linux-omap@vger.kernel.org,
sameo@linux.intel.com
Cc: broonie@opensource.wolfsonmicro.com, tony@atomide.com,
sfr@canb.auug.org.au, felipe.balbi@nokia.com, lrg@slimlogic.co.uk
Hi Samuel,
Could you please take this patch through the mfd tree.
Thanks and Regards,
Balaji T K
> -----Original Message-----
> From: Krishnamoorthy, Balaji T
> Sent: Tuesday, December 15, 2009 8:09 PM
> To: linux-omap@vger.kernel.org; sameo@linux.intel.com
> Cc: broonie@opensource.wolfsonmicro.com; tony@atomide.com;
> sfr@canb.auug.org.au; felipe.balbi@nokia.com; lrg@slimlogic.co.uk;
> Krishnamoorthy, Balaji T
> Subject: [PATCH v2] mfd: twl: fix twl4030 rename for remaining driver, board
> files
>
> From: Balaji T K <balajitk@ti.com>
>
> This patch renames include twl4030.h to include twl.h
> and also renames twl4030_i2c_ routines
>
> Signed-off-by: Balaji T K <balajitk@ti.com>
> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Reviewed-by: Felipe Balbi <felipe.balbi@nokia.com>
> ---
> rebased the patch on latest mainline
> commit 3ea6b3d0e6d0ffd91c0f8cadeb69b7133c038b32
>
> arch/arm/mach-omap2/board-cm-t35.c | 2 +-
> arch/arm/mach-omap2/board-igep0020.c | 2 +-
> arch/arm/mach-omap2/board-omap3evm.c | 2 +-
> arch/arm/mach-omap2/board-omap3touchbook.c | 2 +-
> arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +-
> arch/arm/mach-omap2/board-zoom-peripherals.c | 2 +-
> drivers/mfd/twl4030-codec.c | 10 +++++-----
> drivers/video/omap/lcd_ldp.c | 4 ++--
> drivers/video/omap/lcd_omap2evm.c | 10 +++++-----
> drivers/video/omap/lcd_omap3beagle.c | 2 +-
> drivers/video/omap/lcd_omap3evm.c | 10 +++++-----
> drivers/video/omap/lcd_overo.c | 2 +-
> sound/soc/omap/sdp3430.c | 6 +++---
> 13 files changed, 28 insertions(+), 28 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] mfd: twl: fix twl4030 rename for remaining driver, board files
2009-12-15 16:10 ` Krishnamoorthy, Balaji T
@ 2009-12-15 17:43 ` Tony Lindgren
2009-12-15 18:21 ` Tony Lindgren
0 siblings, 1 reply; 6+ messages in thread
From: Tony Lindgren @ 2009-12-15 17:43 UTC (permalink / raw)
To: Krishnamoorthy, Balaji T
Cc: linux-omap@vger.kernel.org, sameo@linux.intel.com,
broonie@opensource.wolfsonmicro.com, sfr@canb.auug.org.au,
felipe.balbi@nokia.com, lrg@slimlogic.co.uk
* Krishnamoorthy, Balaji T <balajitk@ti.com> [091215 08:09]:
> Hi Samuel,
> Could you please take this patch through the mfd tree.
NAK. Please redo the whole twl rename series so _every_ patch
in the series builds for _every_ omap and x86. Then let's have
it sit in for-next before merging it. Otherwise git bisect
breaks on x86 also.
Regards,
Tony
> Thanks and Regards,
> Balaji T K
>
> > -----Original Message-----
> > From: Krishnamoorthy, Balaji T
> > Sent: Tuesday, December 15, 2009 8:09 PM
> > To: linux-omap@vger.kernel.org; sameo@linux.intel.com
> > Cc: broonie@opensource.wolfsonmicro.com; tony@atomide.com;
> > sfr@canb.auug.org.au; felipe.balbi@nokia.com; lrg@slimlogic.co.uk;
> > Krishnamoorthy, Balaji T
> > Subject: [PATCH v2] mfd: twl: fix twl4030 rename for remaining driver, board
> > files
> >
> > From: Balaji T K <balajitk@ti.com>
> >
> > This patch renames include twl4030.h to include twl.h
> > and also renames twl4030_i2c_ routines
> >
> > Signed-off-by: Balaji T K <balajitk@ti.com>
> > Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> > Reviewed-by: Felipe Balbi <felipe.balbi@nokia.com>
> > ---
> > rebased the patch on latest mainline
> > commit 3ea6b3d0e6d0ffd91c0f8cadeb69b7133c038b32
> >
> > arch/arm/mach-omap2/board-cm-t35.c | 2 +-
> > arch/arm/mach-omap2/board-igep0020.c | 2 +-
> > arch/arm/mach-omap2/board-omap3evm.c | 2 +-
> > arch/arm/mach-omap2/board-omap3touchbook.c | 2 +-
> > arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +-
> > arch/arm/mach-omap2/board-zoom-peripherals.c | 2 +-
> > drivers/mfd/twl4030-codec.c | 10 +++++-----
> > drivers/video/omap/lcd_ldp.c | 4 ++--
> > drivers/video/omap/lcd_omap2evm.c | 10 +++++-----
> > drivers/video/omap/lcd_omap3beagle.c | 2 +-
> > drivers/video/omap/lcd_omap3evm.c | 10 +++++-----
> > drivers/video/omap/lcd_overo.c | 2 +-
> > sound/soc/omap/sdp3430.c | 6 +++---
> > 13 files changed, 28 insertions(+), 28 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] mfd: twl: fix twl4030 rename for remaining driver, board files
2009-12-15 17:43 ` Tony Lindgren
@ 2009-12-15 18:21 ` Tony Lindgren
2009-12-15 21:50 ` Tony Lindgren
0 siblings, 1 reply; 6+ messages in thread
From: Tony Lindgren @ 2009-12-15 18:21 UTC (permalink / raw)
To: Krishnamoorthy, Balaji T
Cc: linux-omap@vger.kernel.org, sameo@linux.intel.com,
broonie@opensource.wolfsonmicro.com, sfr@canb.auug.org.au,
felipe.balbi@nokia.com, lrg@slimlogic.co.uk
* Tony Lindgren <tony@atomide.com> [091215 09:43]:
> * Krishnamoorthy, Balaji T <balajitk@ti.com> [091215 08:09]:
> > Hi Samuel,
> > Could you please take this patch through the mfd tree.
>
> NAK. Please redo the whole twl rename series so _every_ patch
> in the series builds for _every_ omap and x86. Then let's have
> it sit in for-next before merging it. Otherwise git bisect
> breaks on x86 also.
Argh. Too late. This twl rename series already hit the mainline
just now.
Has this patch been compile tested on all omaps and x86?
Regards,
Tony
> Regards,
>
> Tony
>
>
>
> > Thanks and Regards,
> > Balaji T K
> >
> > > -----Original Message-----
> > > From: Krishnamoorthy, Balaji T
> > > Sent: Tuesday, December 15, 2009 8:09 PM
> > > To: linux-omap@vger.kernel.org; sameo@linux.intel.com
> > > Cc: broonie@opensource.wolfsonmicro.com; tony@atomide.com;
> > > sfr@canb.auug.org.au; felipe.balbi@nokia.com; lrg@slimlogic.co.uk;
> > > Krishnamoorthy, Balaji T
> > > Subject: [PATCH v2] mfd: twl: fix twl4030 rename for remaining driver, board
> > > files
> > >
> > > From: Balaji T K <balajitk@ti.com>
> > >
> > > This patch renames include twl4030.h to include twl.h
> > > and also renames twl4030_i2c_ routines
> > >
> > > Signed-off-by: Balaji T K <balajitk@ti.com>
> > > Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> > > Reviewed-by: Felipe Balbi <felipe.balbi@nokia.com>
> > > ---
> > > rebased the patch on latest mainline
> > > commit 3ea6b3d0e6d0ffd91c0f8cadeb69b7133c038b32
> > >
> > > arch/arm/mach-omap2/board-cm-t35.c | 2 +-
> > > arch/arm/mach-omap2/board-igep0020.c | 2 +-
> > > arch/arm/mach-omap2/board-omap3evm.c | 2 +-
> > > arch/arm/mach-omap2/board-omap3touchbook.c | 2 +-
> > > arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +-
> > > arch/arm/mach-omap2/board-zoom-peripherals.c | 2 +-
> > > drivers/mfd/twl4030-codec.c | 10 +++++-----
> > > drivers/video/omap/lcd_ldp.c | 4 ++--
> > > drivers/video/omap/lcd_omap2evm.c | 10 +++++-----
> > > drivers/video/omap/lcd_omap3beagle.c | 2 +-
> > > drivers/video/omap/lcd_omap3evm.c | 10 +++++-----
> > > drivers/video/omap/lcd_overo.c | 2 +-
> > > sound/soc/omap/sdp3430.c | 6 +++---
> > > 13 files changed, 28 insertions(+), 28 deletions(-)
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] mfd: twl: fix twl4030 rename for remaining driver, board files
2009-12-15 18:21 ` Tony Lindgren
@ 2009-12-15 21:50 ` Tony Lindgren
2009-12-16 16:52 ` Krishnamoorthy, Balaji T
0 siblings, 1 reply; 6+ messages in thread
From: Tony Lindgren @ 2009-12-15 21:50 UTC (permalink / raw)
To: Krishnamoorthy, Balaji T
Cc: linux-omap@vger.kernel.org, sameo@linux.intel.com,
broonie@opensource.wolfsonmicro.com, sfr@canb.auug.org.au,
felipe.balbi@nokia.com, lrg@slimlogic.co.uk
[-- Attachment #1: Type: text/plain, Size: 798 bytes --]
* Tony Lindgren <tony@atomide.com> [091215 10:19]:
> * Tony Lindgren <tony@atomide.com> [091215 09:43]:
> > * Krishnamoorthy, Balaji T <balajitk@ti.com> [091215 08:09]:
> > > Hi Samuel,
> > > Could you please take this patch through the mfd tree.
> >
> > NAK. Please redo the whole twl rename series so _every_ patch
> > in the series builds for _every_ omap and x86. Then let's have
> > it sit in for-next before merging it. Otherwise git bisect
> > breaks on x86 also.
>
> Argh. Too late. This twl rename series already hit the mainline
> just now.
>
> Has this patch been compile tested on all omaps and x86?
Looks like commit 8bea8672edfca7ec5f661cafb218f1205863b343 already
took care of the x86 compile issue.
I'll merge the refreshed version below via omap-fixes queue.
Regards,
Tony
[-- Attachment #2: twl-fix.patch --]
[-- Type: text/x-diff, Size: 8424 bytes --]
>From 9008b8c9594df6e34992d766c04f0a0c60fa7d69 Mon Sep 17 00:00:00 2001
From: Balaji T K <balajitk@ti.com>
Date: Tue, 15 Dec 2009 20:09:02 +0530
Subject: [PATCH] mfd: twl: fix twl4030 rename for remaining driver, board files
Recent drivers/mfd/twl4030* renames to twl broke compile for
various boards as the series was missing a patch to change
the board-*.c files.
This patch renames include twl4030.h to include twl.h
and also renames twl4030_i2c_ routines.
Signed-off-by: Balaji T K <balajitk@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Reviewed-by: Felipe Balbi <felipe.balbi@nokia.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 1591aae..2626a9f 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -29,7 +29,7 @@
#include <linux/gpio.h>
#include <linux/i2c/at24.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
#include <linux/regulator/machine.h>
#include <asm/mach-types.h>
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 44239e3..117b8fd 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -19,7 +19,7 @@
#include <linux/interrupt.h>
#include <linux/regulator/machine.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 18913e9..34de178 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -26,7 +26,7 @@
#include <linux/spi/spi.h>
#include <linux/spi/ads7846.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
#include <linux/usb/otg.h>
#include <linux/smsc911x.h>
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c
index c9e5ebb..fe3d22c 100644
--- a/arch/arm/mach-omap2/board-omap3touchbook.c
+++ b/arch/arm/mach-omap2/board-omap3touchbook.c
@@ -34,7 +34,7 @@
#include <linux/spi/ads7846.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-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index 17f3c91..acafdbc 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -16,7 +16,7 @@
#include <linux/spi/spi.h>
#include <linux/spi/wl12xx.h>
#include <linux/i2c.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
#include <linux/clk.h>
#include <linux/delay.h>
#include <linux/regulator/machine.h>
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c
index 258794d..8dd277c 100755
--- a/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -14,7 +14,7 @@
#include <linux/input.h>
#include <linux/input/matrix_keypad.h>
#include <linux/gpio.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
#include <linux/regulator/machine.h>
#include <asm/mach-types.h>
diff --git a/drivers/video/omap/lcd_ldp.c b/drivers/video/omap/lcd_ldp.c
index 5bb7f6f..0f5952c 100644
--- a/drivers/video/omap/lcd_ldp.c
+++ b/drivers/video/omap/lcd_ldp.c
@@ -24,7 +24,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/delay.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
#include <mach/gpio.h>
#include <plat/mux.h>
@@ -59,7 +59,7 @@
#define TWL4030_VPLL2_DEV_GRP 0x33
#define TWL4030_VPLL2_DEDICATED 0x36
-#define t2_out(c, r, v) twl4030_i2c_write_u8(c, r, v)
+#define t2_out(c, r, v) twl_i2c_write_u8(c, r, v)
static int ldp_panel_init(struct lcd_panel *panel,
diff --git a/drivers/video/omap/lcd_omap2evm.c b/drivers/video/omap/lcd_omap2evm.c
index 006c2fe..7e7a65c 100644
--- a/drivers/video/omap/lcd_omap2evm.c
+++ b/drivers/video/omap/lcd_omap2evm.c
@@ -24,7 +24,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/gpio.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
#include <plat/mux.h>
#include <asm/mach-types.h>
@@ -61,9 +61,9 @@ static int omap2evm_panel_init(struct lcd_panel *panel,
gpio_direction_output(LCD_PANEL_LR, 1);
gpio_direction_output(LCD_PANEL_UD, 1);
- twl4030_i2c_write_u8(TWL4030_MODULE_LED, 0x11, TWL_LED_LEDEN);
- twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x01, TWL_PWMA_PWMAON);
- twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x02, TWL_PWMA_PWMAOFF);
+ twl_i2c_write_u8(TWL4030_MODULE_LED, 0x11, TWL_LED_LEDEN);
+ twl_i2c_write_u8(TWL4030_MODULE_PWMA, 0x01, TWL_PWMA_PWMAON);
+ twl_i2c_write_u8(TWL4030_MODULE_PWMA, 0x02, TWL_PWMA_PWMAOFF);
bklight_level = 100;
return 0;
@@ -101,7 +101,7 @@ static int omap2evm_bklight_setlevel(struct lcd_panel *panel,
u8 c;
if ((level >= 0) && (level <= 100)) {
c = (125 * (100 - level)) / 100 + 2;
- twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, c, TWL_PWMA_PWMAOFF);
+ twl_i2c_write_u8(TWL4030_MODULE_PWMA, c, TWL_PWMA_PWMAOFF);
bklight_level = level;
}
return 0;
diff --git a/drivers/video/omap/lcd_omap3beagle.c b/drivers/video/omap/lcd_omap3beagle.c
index fc503d8..ca75cc2 100644
--- a/drivers/video/omap/lcd_omap3beagle.c
+++ b/drivers/video/omap/lcd_omap3beagle.c
@@ -23,7 +23,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/gpio.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
#include <plat/mux.h>
#include <plat/mux.h>
diff --git a/drivers/video/omap/lcd_omap3evm.c b/drivers/video/omap/lcd_omap3evm.c
index ae2edc4..06840da 100644
--- a/drivers/video/omap/lcd_omap3evm.c
+++ b/drivers/video/omap/lcd_omap3evm.c
@@ -23,7 +23,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/gpio.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
#include <plat/mux.h>
#include <asm/mach-types.h>
@@ -63,9 +63,9 @@ static int omap3evm_panel_init(struct lcd_panel *panel,
gpio_direction_output(LCD_PANEL_LR, 1);
gpio_direction_output(LCD_PANEL_UD, 1);
- twl4030_i2c_write_u8(TWL4030_MODULE_LED, 0x11, TWL_LED_LEDEN);
- twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x01, TWL_PWMA_PWMAON);
- twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, 0x02, TWL_PWMA_PWMAOFF);
+ twl_i2c_write_u8(TWL4030_MODULE_LED, 0x11, TWL_LED_LEDEN);
+ twl_i2c_write_u8(TWL4030_MODULE_PWMA, 0x01, TWL_PWMA_PWMAON);
+ twl_i2c_write_u8(TWL4030_MODULE_PWMA, 0x02, TWL_PWMA_PWMAOFF);
bklight_level = 100;
return 0;
@@ -102,7 +102,7 @@ static int omap3evm_bklight_setlevel(struct lcd_panel *panel,
u8 c;
if ((level >= 0) && (level <= 100)) {
c = (125 * (100 - level)) / 100 + 2;
- twl4030_i2c_write_u8(TWL4030_MODULE_PWMA, c, TWL_PWMA_PWMAOFF);
+ twl_i2c_write_u8(TWL4030_MODULE_PWMA, c, TWL_PWMA_PWMAOFF);
bklight_level = level;
}
return 0;
diff --git a/drivers/video/omap/lcd_overo.c b/drivers/video/omap/lcd_overo.c
index 56ee192..564933f 100644
--- a/drivers/video/omap/lcd_overo.c
+++ b/drivers/video/omap/lcd_overo.c
@@ -21,7 +21,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
#include <mach/gpio.h>
#include <plat/mux.h>
diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c
index c071f96..3c85c0f 100644
--- a/sound/soc/omap/sdp3430.c
+++ b/sound/soc/omap/sdp3430.c
@@ -24,7 +24,7 @@
#include <linux/clk.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/soc.h>
@@ -321,11 +321,11 @@ static int __init sdp3430_soc_init(void)
*(unsigned int *)sdp3430_dai[1].cpu_dai->private_data = 2; /* McBSP3 */
/* Set TWL4030 GPIO6 as EXTMUTE signal */
- twl4030_i2c_read_u8(TWL4030_MODULE_INTBR, &pin_mux,
+ twl_i2c_read_u8(TWL4030_MODULE_INTBR, &pin_mux,
TWL4030_INTBR_PMBR1);
pin_mux &= ~TWL4030_GPIO6_PWM0_MUTE(0x03);
pin_mux |= TWL4030_GPIO6_PWM0_MUTE(0x02);
- twl4030_i2c_write_u8(TWL4030_MODULE_INTBR, pin_mux,
+ twl_i2c_write_u8(TWL4030_MODULE_INTBR, pin_mux,
TWL4030_INTBR_PMBR1);
ret = platform_device_add(sdp3430_snd_device);
^ permalink raw reply related [flat|nested] 6+ messages in thread* RE: [PATCH v2] mfd: twl: fix twl4030 rename for remaining driver, board files
2009-12-15 21:50 ` Tony Lindgren
@ 2009-12-16 16:52 ` Krishnamoorthy, Balaji T
0 siblings, 0 replies; 6+ messages in thread
From: Krishnamoorthy, Balaji T @ 2009-12-16 16:52 UTC (permalink / raw)
To: Tony Lindgren
Cc: linux-omap@vger.kernel.org, sameo@linux.intel.com,
broonie@opensource.wolfsonmicro.com, sfr@canb.auug.org.au,
felipe.balbi@nokia.com, lrg@slimlogic.co.uk
> -----Original Message-----
> From: Tony Lindgren [mailto:tony@atomide.com]
>
> * Tony Lindgren <tony@atomide.com> [091215 10:19]:
> > * Tony Lindgren <tony@atomide.com> [091215 09:43]:
> > > * Krishnamoorthy, Balaji T <balajitk@ti.com> [091215 08:09]:
> > > > Hi Samuel,
> > > > Could you please take this patch through the mfd tree.
> > >
> > > NAK. Please redo the whole twl rename series so _every_ patch
> > > in the series builds for _every_ omap and x86. Then let's have
> > > it sit in for-next before merging it. Otherwise git bisect
> > > breaks on x86 also.
> >
> > Argh. Too late. This twl rename series already hit the mainline
> > just now.
> >
> > Has this patch been compile tested on all omaps and x86?
>
> Looks like commit 8bea8672edfca7ec5f661cafb218f1205863b343 already
> took care of the x86 compile issue.
>
> I'll merge the refreshed version below via omap-fixes queue.
Thanks
>
> Regards,
>
> Tony
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-12-16 16:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-15 14:39 [PATCH v2] mfd: twl: fix twl4030 rename for remaining driver, board files balajitk
2009-12-15 16:10 ` Krishnamoorthy, Balaji T
2009-12-15 17:43 ` Tony Lindgren
2009-12-15 18:21 ` Tony Lindgren
2009-12-15 21:50 ` Tony Lindgren
2009-12-16 16:52 ` Krishnamoorthy, Balaji T
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox