Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...
[pandora-kernel.git] / drivers / mfd / mfd-core.c
index d83ad0f..79eda02 100644 (file)
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
 
+int mfd_cell_enable(struct platform_device *pdev)
+{
+       const struct mfd_cell *cell = mfd_get_cell(pdev);
+       int err = 0;
+
+       /* only call enable hook if the cell wasn't previously enabled */
+       if (atomic_inc_return(cell->usage_count) == 1)
+               err = cell->enable(pdev);
+
+       /* if the enable hook failed, decrement counter to allow retries */
+       if (err)
+               atomic_dec(cell->usage_count);
+
+       return err;
+}
+EXPORT_SYMBOL(mfd_cell_enable);
+
+int mfd_cell_disable(struct platform_device *pdev)
+{
+       const struct mfd_cell *cell = mfd_get_cell(pdev);
+       int err = 0;
+
+       /* only disable if no other clients are using it */
+       if (atomic_dec_return(cell->usage_count) == 0)
+               err = cell->disable(pdev);
+
+       /* if the disable hook failed, increment to allow retries */
+       if (err)
+               atomic_inc(cell->usage_count);
+
+       /* sanity check; did someone call disable too many times? */
+       WARN_ON(atomic_read(cell->usage_count) < 0);
+
+       return err;
+}
+EXPORT_SYMBOL(mfd_cell_disable);
+
 static int mfd_add_device(struct device *parent, int id,
                          const struct mfd_cell *cell,
                          struct resource *mem_base,
@@ -37,14 +74,10 @@ static int mfd_add_device(struct device *parent, int id,
                goto fail_device;
 
        pdev->dev.parent = parent;
-       platform_set_drvdata(pdev, cell->driver_data);
 
-       if (cell->data_size) {
-               ret = platform_device_add_data(pdev,
-                                       cell->platform_data, cell->data_size);
-               if (ret)
-                       goto fail_res;
-       }
+       ret = platform_device_add_data(pdev, cell, sizeof(*cell));
+       if (ret)
+               goto fail_res;
 
        for (r = 0; r < cell->num_resources; r++) {
                res[r].name = cell->resources[r].name;
@@ -100,14 +133,22 @@ fail_alloc:
 }
 
 int mfd_add_devices(struct device *parent, int id,
-                   const struct mfd_cell *cells, int n_devs,
+                   struct mfd_cell *cells, int n_devs,
                    struct resource *mem_base,
                    int irq_base)
 {
        int i;
        int ret = 0;
+       atomic_t *cnts;
+
+       /* initialize reference counting for all cells */
+       cnts = kcalloc(sizeof(*cnts), n_devs, GFP_KERNEL);
+       if (!cnts)
+               return -ENOMEM;
 
        for (i = 0; i < n_devs; i++) {
+               atomic_set(&cnts[i], 0);
+               cells[i].usage_count = &cnts[i];
                ret = mfd_add_device(parent, id, cells + i, mem_base, irq_base);
                if (ret)
                        break;
@@ -120,17 +161,89 @@ int mfd_add_devices(struct device *parent, int id,
 }
 EXPORT_SYMBOL(mfd_add_devices);
 
-static int mfd_remove_devices_fn(struct device *dev, void *unused)
+static int mfd_remove_devices_fn(struct device *dev, void *c)
 {
-       platform_device_unregister(to_platform_device(dev));
+       struct platform_device *pdev = to_platform_device(dev);
+       const struct mfd_cell *cell = mfd_get_cell(pdev);
+       atomic_t **usage_count = c;
+
+       /* find the base address of usage_count pointers (for freeing) */
+       if (!*usage_count || (cell->usage_count < *usage_count))
+               *usage_count = cell->usage_count;
+
+       platform_device_unregister(pdev);
        return 0;
 }
 
 void mfd_remove_devices(struct device *parent)
 {
-       device_for_each_child(parent, NULL, mfd_remove_devices_fn);
+       atomic_t *cnts = NULL;
+
+       device_for_each_child(parent, &cnts, mfd_remove_devices_fn);
+       kfree(cnts);
 }
 EXPORT_SYMBOL(mfd_remove_devices);
 
+static int add_shared_platform_device(const char *cell, const char *name)
+{
+       struct mfd_cell cell_entry;
+       struct device *dev;
+       struct platform_device *pdev;
+       int err;
+
+       /* check if we've already registered a device (don't fail if we have) */
+       if (bus_find_device_by_name(&platform_bus_type, NULL, name))
+               return 0;
+
+       /* fetch the parent cell's device (should already be registered!) */
+       dev = bus_find_device_by_name(&platform_bus_type, NULL, cell);
+       if (!dev) {
+               printk(KERN_ERR "failed to find device for cell %s\n", cell);
+               return -ENODEV;
+       }
+       pdev = to_platform_device(dev);
+       memcpy(&cell_entry, mfd_get_cell(pdev), sizeof(cell_entry));
+
+       WARN_ON(!cell_entry.enable);
+
+       cell_entry.name = name;
+       err = mfd_add_device(pdev->dev.parent, -1, &cell_entry, NULL, 0);
+       if (err)
+               dev_err(dev, "MFD add devices failed: %d\n", err);
+       return err;
+}
+
+int mfd_shared_platform_driver_register(struct platform_driver *drv,
+               const char *cellname)
+{
+       int err;
+
+       err = add_shared_platform_device(cellname, drv->driver.name);
+       if (err)
+               printk(KERN_ERR "failed to add platform device %s\n",
+                               drv->driver.name);
+
+       err = platform_driver_register(drv);
+       if (err)
+               printk(KERN_ERR "failed to add platform driver %s\n",
+                               drv->driver.name);
+
+       return err;
+}
+EXPORT_SYMBOL(mfd_shared_platform_driver_register);
+
+void mfd_shared_platform_driver_unregister(struct platform_driver *drv)
+{
+       struct device *dev;
+
+       dev = bus_find_device_by_name(&platform_bus_type, NULL,
+                       drv->driver.name);
+       if (dev)
+               platform_device_unregister(to_platform_device(dev));
+
+       platform_driver_unregister(drv);
+}
+EXPORT_SYMBOL(mfd_shared_platform_driver_unregister);
+
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Ian Molton, Dmitry Baryshkov");