* [PATCHv2 1/2] OMAP4: PMIC: Rename twl6030_codec as twl6040_codec
@ 2010-03-17 22:42 Olaya, Margarita
2010-03-18 8:43 ` [alsa-devel] " Liam Girdwood
2010-03-18 12:10 ` Mark Brown
0 siblings, 2 replies; 5+ messages in thread
From: Olaya, Margarita @ 2010-03-17 22:42 UTC (permalink / raw)
To: alsa-devel@alsa-project.org, linux-omap@vger.kernel.org
Cc: broonie@opensource.wolfsonmicro.com, lrg@slimlogic.co.uk
Correction for chips:
twl6030 is Phoenix Power chip
twl6040 is Phoenix Audio chip
Signed-off-by: Margarita Olaya Cabrera <magi.olaya@ti.com>
---
drivers/mfd/twl-core.c | 4 ++--
include/linux/i2c/twl.h | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 562cd49..720e099 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -109,7 +109,7 @@
#endif
#if defined(CONFIG_TWL4030_CODEC) || defined(CONFIG_TWL4030_CODEC_MODULE) ||\
- defined(CONFIG_SND_SOC_TWL6030) || defined(CONFIG_SND_SOC_TWL6030_MODULE)
+ defined(CONFIG_SND_SOC_TWL6040) || defined(CONFIG_SND_SOC_TWL6040_MODULE)
#define twl_has_codec() true
#else
#define twl_has_codec() false
@@ -708,7 +708,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
/* Phoenix*/
if (twl_has_codec() && pdata->codec && twl_class_is_6030()) {
sub_chip_id = twl_map[TWL_MODULE_AUDIO_VOICE].sid;
- child = add_child(sub_chip_id, "twl6030_codec",
+ child = add_child(sub_chip_id, "twl6040_codec",
pdata->codec, sizeof(*pdata->codec),
false, 0, 0);
if (IS_ERR(child))
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index fb6784e..ebd90ce 100644
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -569,9 +569,9 @@ struct twl4030_codec_data {
struct twl4030_codec_audio_data *audio;
struct twl4030_codec_vibra_data *vibra;
- /* twl6030 */
- int audpwron_gpio; /* audio power-on gpio */
- int naudint_irq; /* audio interrupt */
+ /* twl6040 */
+ int audpwron_gpio; /* audio power-on gpio */
+ int naudint_irq; /* audio interrupt */
};
struct twl4030_platform_data {
--
1.6.1.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [alsa-devel] [PATCHv2 1/2] OMAP4: PMIC: Rename twl6030_codec as twl6040_codec
2010-03-17 22:42 [PATCHv2 1/2] OMAP4: PMIC: Rename twl6030_codec as twl6040_codec Olaya, Margarita
@ 2010-03-18 8:43 ` Liam Girdwood
2010-03-18 12:10 ` Mark Brown
1 sibling, 0 replies; 5+ messages in thread
From: Liam Girdwood @ 2010-03-18 8:43 UTC (permalink / raw)
To: Olaya, Margarita
Cc: alsa-devel@alsa-project.org, linux-omap@vger.kernel.org,
broonie@opensource.wolfsonmicro.com
On Wed, 2010-03-17 at 17:42 -0500, Olaya, Margarita wrote:
> Correction for chips:
> twl6030 is Phoenix Power chip
> twl6040 is Phoenix Audio chip
>
> Signed-off-by: Margarita Olaya Cabrera <magi.olaya@ti.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCHv2 1/2] OMAP4: PMIC: Rename twl6030_codec as twl6040_codec
2010-03-17 22:42 [PATCHv2 1/2] OMAP4: PMIC: Rename twl6030_codec as twl6040_codec Olaya, Margarita
2010-03-18 8:43 ` [alsa-devel] " Liam Girdwood
@ 2010-03-18 12:10 ` Mark Brown
2010-03-18 16:38 ` Samuel Ortiz
1 sibling, 1 reply; 5+ messages in thread
From: Mark Brown @ 2010-03-18 12:10 UTC (permalink / raw)
To: Olaya, Margarita
Cc: alsa-devel@alsa-project.org, linux-omap@vger.kernel.org,
lrg@slimlogic.co.uk, Samuel Ortiz
On Wed, Mar 17, 2010 at 05:42:29PM -0500, Olaya, Margarita wrote:
> Correction for chips:
> twl6030 is Phoenix Power chip
> twl6040 is Phoenix Audio chip
> Signed-off-by: Margarita Olaya Cabrera <magi.olaya@ti.com>
Samuel, are you OK with doing this via the ASoC tree?
> ---
> drivers/mfd/twl-core.c | 4 ++--
> include/linux/i2c/twl.h | 6 +++---
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
> index 562cd49..720e099 100644
> --- a/drivers/mfd/twl-core.c
> +++ b/drivers/mfd/twl-core.c
> @@ -109,7 +109,7 @@
> #endif
>
> #if defined(CONFIG_TWL4030_CODEC) || defined(CONFIG_TWL4030_CODEC_MODULE) ||\
> - defined(CONFIG_SND_SOC_TWL6030) || defined(CONFIG_SND_SOC_TWL6030_MODULE)
> + defined(CONFIG_SND_SOC_TWL6040) || defined(CONFIG_SND_SOC_TWL6040_MODULE)
> #define twl_has_codec() true
> #else
> #define twl_has_codec() false
> @@ -708,7 +708,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
> /* Phoenix*/
> if (twl_has_codec() && pdata->codec && twl_class_is_6030()) {
> sub_chip_id = twl_map[TWL_MODULE_AUDIO_VOICE].sid;
> - child = add_child(sub_chip_id, "twl6030_codec",
> + child = add_child(sub_chip_id, "twl6040_codec",
> pdata->codec, sizeof(*pdata->codec),
> false, 0, 0);
> if (IS_ERR(child))
> diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
> index fb6784e..ebd90ce 100644
> --- a/include/linux/i2c/twl.h
> +++ b/include/linux/i2c/twl.h
> @@ -569,9 +569,9 @@ struct twl4030_codec_data {
> struct twl4030_codec_audio_data *audio;
> struct twl4030_codec_vibra_data *vibra;
>
> - /* twl6030 */
> - int audpwron_gpio; /* audio power-on gpio */
> - int naudint_irq; /* audio interrupt */
> + /* twl6040 */
> + int audpwron_gpio; /* audio power-on gpio */
> + int naudint_irq; /* audio interrupt */
> };
>
> struct twl4030_platform_data {
> --
> 1.6.1.3
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCHv2 1/2] OMAP4: PMIC: Rename twl6030_codec as twl6040_codec
2010-03-18 12:10 ` Mark Brown
@ 2010-03-18 16:38 ` Samuel Ortiz
2010-03-18 17:09 ` Mark Brown
0 siblings, 1 reply; 5+ messages in thread
From: Samuel Ortiz @ 2010-03-18 16:38 UTC (permalink / raw)
To: Mark Brown
Cc: Olaya, Margarita, alsa-devel@alsa-project.org,
linux-omap@vger.kernel.org, lrg@slimlogic.co.uk
On Thu, Mar 18, 2010 at 12:10:21PM +0000, Mark Brown wrote:
> On Wed, Mar 17, 2010 at 05:42:29PM -0500, Olaya, Margarita wrote:
> > Correction for chips:
> > twl6030 is Phoenix Power chip
> > twl6040 is Phoenix Audio chip
>
> > Signed-off-by: Margarita Olaya Cabrera <magi.olaya@ti.com>
>
> Samuel, are you OK with doing this via the ASoC tree?
If that's more convenient to you, then go for it, with my:
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Cheers,
Samuel.
> > ---
> > drivers/mfd/twl-core.c | 4 ++--
> > include/linux/i2c/twl.h | 6 +++---
> > 2 files changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
> > index 562cd49..720e099 100644
> > --- a/drivers/mfd/twl-core.c
> > +++ b/drivers/mfd/twl-core.c
> > @@ -109,7 +109,7 @@
> > #endif
> >
> > #if defined(CONFIG_TWL4030_CODEC) || defined(CONFIG_TWL4030_CODEC_MODULE) ||\
> > - defined(CONFIG_SND_SOC_TWL6030) || defined(CONFIG_SND_SOC_TWL6030_MODULE)
> > + defined(CONFIG_SND_SOC_TWL6040) || defined(CONFIG_SND_SOC_TWL6040_MODULE)
> > #define twl_has_codec() true
> > #else
> > #define twl_has_codec() false
> > @@ -708,7 +708,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
> > /* Phoenix*/
> > if (twl_has_codec() && pdata->codec && twl_class_is_6030()) {
> > sub_chip_id = twl_map[TWL_MODULE_AUDIO_VOICE].sid;
> > - child = add_child(sub_chip_id, "twl6030_codec",
> > + child = add_child(sub_chip_id, "twl6040_codec",
> > pdata->codec, sizeof(*pdata->codec),
> > false, 0, 0);
> > if (IS_ERR(child))
> > diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
> > index fb6784e..ebd90ce 100644
> > --- a/include/linux/i2c/twl.h
> > +++ b/include/linux/i2c/twl.h
> > @@ -569,9 +569,9 @@ struct twl4030_codec_data {
> > struct twl4030_codec_audio_data *audio;
> > struct twl4030_codec_vibra_data *vibra;
> >
> > - /* twl6030 */
> > - int audpwron_gpio; /* audio power-on gpio */
> > - int naudint_irq; /* audio interrupt */
> > + /* twl6040 */
> > + int audpwron_gpio; /* audio power-on gpio */
> > + int naudint_irq; /* audio interrupt */
> > };
> >
> > struct twl4030_platform_data {
> > --
> > 1.6.1.3
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCHv2 1/2] OMAP4: PMIC: Rename twl6030_codec as twl6040_codec
2010-03-18 16:38 ` Samuel Ortiz
@ 2010-03-18 17:09 ` Mark Brown
0 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2010-03-18 17:09 UTC (permalink / raw)
To: Samuel Ortiz
Cc: Olaya, Margarita, alsa-devel@alsa-project.org,
linux-omap@vger.kernel.org, lrg@slimlogic.co.uk
On Thu, Mar 18, 2010 at 05:38:30PM +0100, Samuel Ortiz wrote:
> On Thu, Mar 18, 2010 at 12:10:21PM +0000, Mark Brown wrote:
> > On Wed, Mar 17, 2010 at 05:42:29PM -0500, Olaya, Margarita wrote:
> > > Correction for chips:
> > > twl6030 is Phoenix Power chip
> > > twl6040 is Phoenix Audio chip
> >
> > > Signed-off-by: Margarita Olaya Cabrera <magi.olaya@ti.com>
> >
> > Samuel, are you OK with doing this via the ASoC tree?
> If that's more convenient to you, then go for it, with my:
> Acked-by: Samuel Ortiz <sameo@linux.intel.com>
OK, applied - thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-03-18 17:09 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-17 22:42 [PATCHv2 1/2] OMAP4: PMIC: Rename twl6030_codec as twl6040_codec Olaya, Margarita
2010-03-18 8:43 ` [alsa-devel] " Liam Girdwood
2010-03-18 12:10 ` Mark Brown
2010-03-18 16:38 ` Samuel Ortiz
2010-03-18 17:09 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox