mfd: Register tps65910 gpios as an mfd device
Laxman Dewangan [Fri, 11 May 2012 13:07:44 +0000 (15:07 +0200)]
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>
(cherry picked from commit 32df986e985921386b75b4bd1117102bf65fe095)

Change-Id: I631596313528ab192d7d8c2f376965ccc989c313
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/105926
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit

drivers/mfd/Kconfig
drivers/mfd/tps65910.c
include/linux/mfd/tps65910.h

index f3a257e..a871bd3 100644 (file)
@@ -176,7 +176,6 @@ config MFD_TPS65910
        bool "TPS65910 Power Management chip"
        depends on I2C=y && GPIOLIB
        select MFD_CORE
-       select GPIO_TPS65910
        select REGMAP_I2C
        help
          if you say yes here you get support for the TPS65910 series of
index 22fa430..553574d 100644 (file)
@@ -19,7 +19,6 @@
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/gpio.h>
 #include <linux/mfd/core.h>
 #include <linux/regmap.h>
 #include <linux/mfd/tps65910.h>
@@ -27,6 +26,9 @@
 
 static struct mfd_cell tps65910s[] = {
        {
+               .name = "tps65910-gpio",
+       },
+       {
                .name = "tps65910-pmic",
        },
        {
@@ -250,8 +252,6 @@ static __devinit int tps65910_i2c_probe(struct i2c_client *i2c,
        init_data->irq = pmic_plat_data->irq;
        init_data->irq_base = pmic_plat_data->irq_base;
 
-       tps65910_gpio_init(tps65910, pmic_plat_data->gpio_base);
-
        tps65910_irq_init(tps65910, init_data->irq, init_data);
 
        tps65910_sleepinit(tps65910, pmic_plat_data);
index 5f22b9b..f20c4e7 100644 (file)
@@ -830,9 +830,6 @@ struct tps65910 {
        struct tps65910_rtc *rtc;
        struct tps65910_power *power;
 
-       /* GPIO Handling */
-       struct gpio_chip gpio;
-
        /* IRQ Handling */
        struct mutex irq_lock;
        int chip_irq;
@@ -846,7 +843,6 @@ struct tps65910_platform_data {
        int irq_base;
 };
 
-void tps65910_gpio_init(struct tps65910 *tps65910, int gpio_base);
 int tps65910_irq_init(struct tps65910 *tps65910, int irq,
                struct tps65910_platform_data *pdata);
 int tps65910_irq_exit(struct tps65910 *tps65910);