Now that we have a way to pass MFD cells down to the sub drivers,
we can gradually get rid of mfd_data by putting the platform pointer
back in place.
Cc: Andres Salomon <[email protected]>
Cc: Artem Bityutskiy <[email protected]>
Cc: Dmitry Baryshkov <[email protected]>
Cc: Dmitry Torokhov <[email protected]>
Cc: Florian Fainelli <[email protected]>
Cc: Grant Likely <[email protected]>
Cc: Guennadi Liakhovetski <[email protected]>
Cc: Haojian Zhuang <[email protected]>
Cc: Ian Molton <[email protected]>
Cc: Ira W. Snyder <[email protected]>
Cc: Liam Girdwood <[email protected]>
Cc: Linus Walleij <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: Matti Aaltonen <[email protected]>
Cc: Matt Reimer <[email protected]>
Cc: Miguel Aguilar <[email protected]>
Cc: Paul Mundt <[email protected]>
Cc: Peter Ujfalusi <[email protected]>
Cc: Philipp Zabel <[email protected]>
Cc: Richard Purdie <[email protected]>
Cc: Richard R?jfors <[email protected]>
Cc: Uwe Kleine-K?nig <[email protected]>
Cc: Wim Van Sebroeck <[email protected]>
Cc: Wolfgang Grandegger <[email protected]>
Signed-off-by: Samuel Ortiz <[email protected]>
---
drivers/mfd/mfd-core.c | 7 +++++++
include/linux/mfd/core.h | 4 ++++
2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index f4c8c84..0902523 100644
--- a/drivers/mfd/mfd-core.c
+++ b/drivers/mfd/mfd-core.c
@@ -88,6 +88,13 @@ static int mfd_add_device(struct device *parent, int id,
pdev->dev.parent = parent;
+ if (cell->pdata_size) {
+ ret = platform_device_add_data(pdev,
+ cell->platform_data, cell->pdata_size);
+ if (ret)
+ goto fail_res;
+ }
+
ret = mfd_platform_add_cell(pdev, cell);
if (ret)
goto fail_res;
diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h
index aef23309..68c13e5 100644
--- a/include/linux/mfd/core.h
+++ b/include/linux/mfd/core.h
@@ -36,6 +36,10 @@ struct mfd_cell {
/* mfd_data can be used to pass data to client drivers */
void *mfd_data;
+ /* platform data passed to the sub devices drivers */
+ void *platform_data;
+ size_t pdata_size;
+
/*
* These resources can be specified relative to the parent device.
* For accessing hardware you should use resources from the platform dev
--
1.7.2.3
--
Intel Open Source Technology Centre
http://oss.intel.com/