Commit 6a1c7b7e authored by Olaya, Margarita's avatar Olaya, Margarita Committed by Mark Brown

OMAP4: PMIC: Rename twl6030_codec as twl6040_codec

Correction for chips:
twl6030 is Phoenix Power chip
twl6040 is Phoenix Audio chip
Signed-off-by: default avatarMargarita Olaya Cabrera <magi.olaya@ti.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Acked-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent f4bee1bb
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
#endif #endif
#if defined(CONFIG_TWL4030_CODEC) || defined(CONFIG_TWL4030_CODEC_MODULE) ||\ #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 #define twl_has_codec() true
#else #else
#define twl_has_codec() false #define twl_has_codec() false
...@@ -708,7 +708,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) ...@@ -708,7 +708,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
/* Phoenix*/ /* Phoenix*/
if (twl_has_codec() && pdata->codec && twl_class_is_6030()) { if (twl_has_codec() && pdata->codec && twl_class_is_6030()) {
sub_chip_id = twl_map[TWL_MODULE_AUDIO_VOICE].sid; 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), pdata->codec, sizeof(*pdata->codec),
false, 0, 0); false, 0, 0);
if (IS_ERR(child)) if (IS_ERR(child))
......
...@@ -569,7 +569,7 @@ struct twl4030_codec_data { ...@@ -569,7 +569,7 @@ struct twl4030_codec_data {
struct twl4030_codec_audio_data *audio; struct twl4030_codec_audio_data *audio;
struct twl4030_codec_vibra_data *vibra; struct twl4030_codec_vibra_data *vibra;
/* twl6030 */ /* twl6040 */
int audpwron_gpio; /* audio power-on gpio */ int audpwron_gpio; /* audio power-on gpio */
int naudint_irq; /* audio interrupt */ int naudint_irq; /* audio interrupt */
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment