diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2011-04-06 09:57:17 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-05-26 13:45:09 -0400 |
commit | a4579ad2bb6557834ebfafc8d2942891516fb4ad (patch) | |
tree | 3a4c19cd9cb685c6bd15a2e124f537db68374c39 /drivers/mfd | |
parent | 3d2bdf759f48f9b0a0ffcd798f3e9a3228d6455d (diff) |
mfd: Use mfd cell platform_data for twl4030 codec cells platform bits
With the addition of a platform device mfd_cell pointer, MFD drivers
can go back to passing platform data back to their sub drivers.
This allows for an mfd_cell->mfd_data removal and thus keep the
sub drivers MFD agnostic. This is mostly needed for non MFD aware
sub drivers.
Cc: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Liam Girdwood <lrg@slimlogic.co.uk>
Cc: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/twl4030-codec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mfd/twl4030-codec.c b/drivers/mfd/twl4030-codec.c index c02fded316c9..315b5ead8437 100644 --- a/drivers/mfd/twl4030-codec.c +++ b/drivers/mfd/twl4030-codec.c | |||
@@ -208,13 +208,15 @@ static int __devinit twl4030_codec_probe(struct platform_device *pdev) | |||
208 | if (pdata->audio) { | 208 | if (pdata->audio) { |
209 | cell = &codec->cells[childs]; | 209 | cell = &codec->cells[childs]; |
210 | cell->name = "twl4030-codec"; | 210 | cell->name = "twl4030-codec"; |
211 | cell->mfd_data = pdata->audio; | 211 | cell->platform_data = pdata->audio; |
212 | cell->pdata_size = sizeof(*pdata->audio); | ||
212 | childs++; | 213 | childs++; |
213 | } | 214 | } |
214 | if (pdata->vibra) { | 215 | if (pdata->vibra) { |
215 | cell = &codec->cells[childs]; | 216 | cell = &codec->cells[childs]; |
216 | cell->name = "twl4030-vibra"; | 217 | cell->name = "twl4030-vibra"; |
217 | cell->mfd_data = pdata->vibra; | 218 | cell->platform_data = pdata->vibra; |
219 | cell->pdata_size = sizeof(*pdata->vibra); | ||
218 | childs++; | 220 | childs++; |
219 | } | 221 | } |
220 | 222 | ||