mfd: add platform_data to mfd_cell

Adding platform_data to mfd_cell allows passing of platform data directly
to the platform_device created for each cell and thus reuse of existing
drivers.
On the other side it can be used as a hook to mfd_cell itself
removing the need in mfd_get_cell method.

Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Acked-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@openedhand.com>

diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index 50207700140c15d5fdb0dbbcb524533ce4cd4f12..ad4e4d16a36ac500fbf345f0fcd67a12c76b04dc 100644 (file)
--- a/drivers/mfd/mfd-core.c
+++ b/drivers/mfd/mfd-core.c
@@ -32,7 +32,7 @@ static int mfd_add_device(struct platform_device *parent,
        pdev->dev.parent = &parent->dev;
 
        ret = platform_device_add_data(pdev,
-                       cell, sizeof(struct mfd_cell));
+                       cell->platform_data, cell->data_size);
        if (ret)
                goto fail_device;
 

diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
index 94e55e8e7ce62345614eda7344ff9a45b04d1c8d..9908aaa4881a7cd9b0fd5ecde5138cfae86f3801 100644 (file)
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -466,6 +466,10 @@ static int __devinit tc6393xb_probe(struct platform_device *dev)
                tc6393xb_attach_irq(dev);
 
        tc6393xb_cells[TC6393XB_CELL_NAND].driver_data = tcpd->nand_data;
+       tc6393xb_cells[TC6393XB_CELL_NAND].platform_data =
+               &tc6393xb_cells[TC6393XB_CELL_NAND];
+       tc6393xb_cells[TC6393XB_CELL_NAND].data_size =
+               sizeof(tc6393xb_cells[TC6393XB_CELL_NAND]);
 
        retval = mfd_add_devices(dev,
                        tc6393xb_cells, ARRAY_SIZE(tc6393xb_cells),

diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h
index b7cbb9968339c413c7c26727b81de5cf0c054b7f..ea45d4a5a2acf1e7a819eb3152d6f1272d55c73b 100644 (file)
--- a/include/linux/mfd/core.h
+++ b/include/linux/mfd/core.h
@@ -29,7 +29,13 @@ struct mfd_cell {
        int                     (*suspend)(struct platform_device *dev);
        int                     (*resume)(struct platform_device *dev);
 
-       void                    *driver_data; /* driver-specific data */
+       /* driver-specific data for MFD-aware "cell" drivers */
+       void                    *driver_data;
+
+       /* platform_data can be used to either pass data to "generic"
+          driver or as a hook to mfd_cell for the "cell" drivers */
+       void                    *platform_data;
+       size_t                  data_size;
 
        /*
         * This resources can be specified relatievly to the parent device.
@@ -39,11 +45,6 @@ struct mfd_cell {
        const struct resource   *resources;
 };
 
-static inline struct mfd_cell *mfd_get_cell(struct platform_device *pdev)
-{
-       return (struct mfd_cell *)pdev->dev.platform_data;
-}
-
 extern int mfd_add_devices(struct platform_device *parent,
                           const struct mfd_cell *cells, int n_devs,
                           struct resource *mem_base,