summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorOlaya, Margarita <magi.olaya@ti.com>2010-03-17 17:42:29 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-03-18 17:04:55 +0000
commit6a1c7b7e2ea3ca5f6ae73154c4b72755d262c9e0 (patch)
treeb564b5f1a47db67c504e68b83264ed1ea9a0c752 /drivers/mfd
parentf4bee1bb0083869b1b7d73c6eda7703a7aae0506 (diff)
downloadop-kernel-dev-6a1c7b7e2ea3ca5f6ae73154c4b72755d262c9e0.zip
op-kernel-dev-6a1c7b7e2ea3ca5f6ae73154c4b72755d262c9e0.tar.gz
OMAP4: PMIC: Rename twl6030_codec as twl6040_codec
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> Acked-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/twl-core.c4
1 files changed, 2 insertions, 2 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))
OpenPOWER on IntegriCloud