aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/tps65910.c
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2012-05-11 09:07:44 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2012-05-20 11:26:59 -0400
commit32df986e985921386b75b4bd1117102bf65fe095 (patch)
treeaf9a34aa41af52761505e427647448a189d11209 /drivers/mfd/tps65910.c
parent63fe7dee9183118716078a9f2503f5f805d37c12 (diff)
mfd: Register tps65910 gpios as an mfd device
As gpio support for tps65910 is on gpio driver, registering gpio support as the mfd sub devices instead of calling gpio_init() from the core probe. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/tps65910.c')
-rw-r--r--drivers/mfd/tps65910.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
index 22fa43070659..553574da3611 100644
--- a/drivers/mfd/tps65910.c
+++ b/drivers/mfd/tps65910.c
@@ -19,7 +19,6 @@
19#include <linux/err.h> 19#include <linux/err.h>
20#include <linux/slab.h> 20#include <linux/slab.h>
21#include <linux/i2c.h> 21#include <linux/i2c.h>
22#include <linux/gpio.h>
23#include <linux/mfd/core.h> 22#include <linux/mfd/core.h>
24#include <linux/regmap.h> 23#include <linux/regmap.h>
25#include <linux/mfd/tps65910.h> 24#include <linux/mfd/tps65910.h>
@@ -27,6 +26,9 @@
27 26
28static struct mfd_cell tps65910s[] = { 27static struct mfd_cell tps65910s[] = {
29 { 28 {
29 .name = "tps65910-gpio",
30 },
31 {
30 .name = "tps65910-pmic", 32 .name = "tps65910-pmic",
31 }, 33 },
32 { 34 {
@@ -250,8 +252,6 @@ static __devinit int tps65910_i2c_probe(struct i2c_client *i2c,
250 init_data->irq = pmic_plat_data->irq; 252 init_data->irq = pmic_plat_data->irq;
251 init_data->irq_base = pmic_plat_data->irq_base; 253 init_data->irq_base = pmic_plat_data->irq_base;
252 254
253 tps65910_gpio_init(tps65910, pmic_plat_data->gpio_base);
254
255 tps65910_irq_init(tps65910, init_data->irq, init_data); 255 tps65910_irq_init(tps65910, init_data->irq, init_data);
256 256
257 tps65910_sleepinit(tps65910, pmic_plat_data); 257 tps65910_sleepinit(tps65910, pmic_plat_data);