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@xxxxxx>
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
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
