aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-07-27 14:45:51 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2009-09-17 09:46:56 +0200
commit3bed6e415fc2cbf8d706848a62a48aebe84435e5 (patch)
treec3f82bf4f2875d243cf6cd7d60bf2e568469af92 /drivers/mfd
parentf078237bcf6d5ffe322f6de7f05c0541989a8d35 (diff)
downloadkernel_samsung_tuna-3bed6e415fc2cbf8d706848a62a48aebe84435e5.zip
kernel_samsung_tuna-3bed6e415fc2cbf8d706848a62a48aebe84435e5.tar.gz
kernel_samsung_tuna-3bed6e415fc2cbf8d706848a62a48aebe84435e5.tar.bz2
mfd: Allow multiple MFD cells with the same name
Provide basic support for MFDs having multiple cells of a given type with different IDs by adding an id to the mfd_cell structure and then adding that to the id passed in to mfd_add_devices(). As it stands this approach requires that MFDs using this feature deal with ensuring that there aren't any ID collisions resulting from multiple MFDs of the same type being instantiated. This needs to happen with the existing code too, but with this approach there is a knock on effect on the IDs for non-duplicated devices. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/mfd-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index 54ddf37..ae15e49 100644
--- a/drivers/mfd/mfd-core.c
+++ b/drivers/mfd/mfd-core.c
@@ -25,7 +25,7 @@ static int mfd_add_device(struct device *parent, int id,
int ret = -ENOMEM;
int r;
- pdev = platform_device_alloc(cell->name, id);
+ pdev = platform_device_alloc(cell->name, id + cell->id);
if (!pdev)
goto fail_alloc;