summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2011-06-01 13:05:10 +0300
committerPeter Ujfalusi <peter.ujfalusi@ti.com>2011-07-04 19:35:07 +0300
commit6c44863763254eaf96ec7d4f816fb88605301e76 (patch)
treecb3c67fc523660d35b5f1b4df1dfea64aebdde7c
parentfb34d3d5056a1f8439bbfa13d4519345814d4255 (diff)
downloadlinux-6c44863763254eaf96ec7d4f816fb88605301e76.tar.gz
linux-6c44863763254eaf96ec7d4f816fb88605301e76.tar.bz2
linux-6c44863763254eaf96ec7d4f816fb88605301e76.zip
MFD: twl6040: Change platform data for soc codec driver
Pass twl4030_codec_data instead of the twl4030_audio_data for the ASoC codec driver. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Acked-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/mfd/twl6040-core.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mfd/twl6040-core.c b/drivers/mfd/twl6040-core.c
index 57ae36bae807..cfaedb5581ad 100644
--- a/drivers/mfd/twl6040-core.c
+++ b/drivers/mfd/twl6040-core.c
@@ -501,9 +501,8 @@ static int __devinit twl6040_probe(struct platform_device *pdev)
if (pdata->codec) {
cell = &twl6040->cells[children];
cell->name = "twl6040-codec";
- /* The codec expects the twl4030_audio_data as platform data */
- cell->platform_data = pdata;
- cell->pdata_size = sizeof(*pdata);
+ cell->platform_data = pdata->codec;
+ cell->pdata_size = sizeof(*pdata->codec);
children++;
}