aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2011-06-01 06:05:10 -0400
committerPeter Ujfalusi <peter.ujfalusi@ti.com>2011-07-04 12:35:07 -0400
commit6c44863763254eaf96ec7d4f816fb88605301e76 (patch)
treecb3c67fc523660d35b5f1b4df1dfea64aebdde7c
parentfb34d3d5056a1f8439bbfa13d4519345814d4255 (diff)
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)
501 if (pdata->codec) { 501 if (pdata->codec) {
502 cell = &twl6040->cells[children]; 502 cell = &twl6040->cells[children];
503 cell->name = "twl6040-codec"; 503 cell->name = "twl6040-codec";
504 /* The codec expects the twl4030_audio_data as platform data */ 504 cell->platform_data = pdata->codec;
505 cell->platform_data = pdata; 505 cell->pdata_size = sizeof(*pdata->codec);
506 cell->pdata_size = sizeof(*pdata);
507 children++; 506 children++;
508 } 507 }
509 508