[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20110509112107.GC8071@sortiz-mobl>
Date: Mon, 9 May 2011 13:21:08 +0200
From: Samuel Ortiz <sameo@...ux.intel.com>
To: linux-kernel <linux-kernel@...r.kernel.org>
Subject: [PATCH 01/19] mfd: Add platform data pointer back
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 <dilinger@...ued.net>
Cc: Artem Bityutskiy <Artem.Bityutskiy@...ia.com>
Cc: Dmitry Baryshkov <dbaryshkov@...il.com>
Cc: Dmitry Torokhov <dtor@...l.ru>
Cc: Florian Fainelli <florian@...nwrt.org>
Cc: Grant Likely <grant.likely@...retlab.ca>
Cc: Guennadi Liakhovetski <g.liakhovetski@....de>
Cc: Haojian Zhuang <haojian.zhuang@...vell.com>
Cc: Ian Molton <spyro@....com>
Cc: Ira W. Snyder <iws@...o.caltech.edu>
Cc: Liam Girdwood <lrg@...mlogic.co.uk>
Cc: Linus Walleij <linus.walleij@...aro.org>
Cc: Mark Brown <broonie@...nsource.wolfsonmicro.com>
Cc: Matti Aaltonen <matti.j.aaltonen@...ia.com>
Cc: Matt Reimer <mreimer@...p.net>
Cc: Miguel Aguilar <miguel.aguilar@...gerun.com>
Cc: Paul Mundt <lethal@...ux-sh.org>
Cc: Peter Ujfalusi <peter.ujfalusi@...ia.com>
Cc: Philipp Zabel <philipp.zabel@...il.com>
Cc: Richard Purdie <rpurdie@...ys.net>
Cc: Richard Röjfors <richard.rojfors@...agicore.com>
Cc: Uwe Kleine-König <u.kleine-koenig@...gutronix.de>
Cc: Wim Van Sebroeck <wim@...ana.be>
Cc: Wolfgang Grandegger <wg@...ndegger.com>
Signed-off-by: Samuel Ortiz <sameo@...ux.intel.com>
---
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/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists