Skip to content

Commit

Permalink
mfd: Register tps65910 gpios as an mfd device
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Laxman Dewangan authored and Samuel Ortiz committed May 20, 2012
1 parent 63fe7de commit 32df986
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 8 deletions.
1 change: 0 additions & 1 deletion drivers/mfd/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,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
Expand Down
6 changes: 3 additions & 3 deletions drivers/mfd/tps65910.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@
#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>
#include <linux/of_device.h>

static struct mfd_cell tps65910s[] = {
{
.name = "tps65910-gpio",
},
{
.name = "tps65910-pmic",
},
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 0 additions & 4 deletions include/linux/mfd/tps65910.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down

0 comments on commit 32df986

Please sign in to comment.