| Message ID | 1328078344-11670-1-git-send-email-ldewangan@nvidia.com |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Wed, Feb 1, 2012 at 7:39 AM, Laxman Dewangan <ldewangan@nvidia.com> wrote: > The device tps65910/tps65911 supports the sleep > functionality in some of gpios. If gpio is configured > in output mode and sleep is enabled then during device > sleep state, the output of gpio becomes LOW regardless > of non-sleep output value. > Such gpio can be used to control regulator switch such > that output of regulator is off in device sleep state. > > Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> > --- > Changes from V1: > Taken care of review comments from Linus Walleij's > - Remove magic numbers and added macro for defining them. > - Used bool type for the platform's gpio sleep control data. Thanks, looks good! Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Feb 01, 2012 at 01:30:54PM +0100, Linus Walleij wrote: > On Wed, Feb 1, 2012 at 7:39 AM, Laxman Dewangan <ldewangan@nvidia.com> wrote: > > > The device tps65910/tps65911 supports the sleep > > functionality in some of gpios. If gpio is configured > > in output mode and sleep is enabled then during device > > sleep state, the output of gpio becomes LOW regardless > > of non-sleep output value. > > Such gpio can be used to control regulator switch such > > that output of regulator is off in device sleep state. > > > > Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> > > --- > > Changes from V1: > > Taken care of review comments from Linus Walleij's > > - Remove magic numbers and added macro for defining them. > > - Used bool type for the platform's gpio sleep control data. > > Thanks, looks good! > Acked-by: Linus Walleij <linus.walleij@linaro.org> Applied, thanks. g. -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/gpio/gpio-tps65910.c b/drivers/gpio/gpio-tps65910.c index 91f45b9..7eef648 100644 --- a/drivers/gpio/gpio-tps65910.c +++ b/drivers/gpio/gpio-tps65910.c @@ -69,6 +69,7 @@ static int tps65910_gpio_input(struct gpio_chip *gc, unsigned offset) void tps65910_gpio_init(struct tps65910 *tps65910, int gpio_base) { int ret; + struct tps65910_board *board_data; if (!gpio_base) return; @@ -80,10 +81,10 @@ void tps65910_gpio_init(struct tps65910 *tps65910, int gpio_base) switch(tps65910_chip_id(tps65910)) { case TPS65910: - tps65910->gpio.ngpio = 6; + tps65910->gpio.ngpio = TPS65910_NUM_GPIO; break; case TPS65911: - tps65910->gpio.ngpio = 9; + tps65910->gpio.ngpio = TPS65911_NUM_GPIO; break; default: return; @@ -95,6 +96,21 @@ void tps65910_gpio_init(struct tps65910 *tps65910, int gpio_base) tps65910->gpio.set = tps65910_gpio_set; tps65910->gpio.get = tps65910_gpio_get; + /* Configure sleep control for gpios */ + board_data = dev_get_platdata(tps65910->dev); + if (board_data) { + int i; + for (i = 0; i < tps65910->gpio.ngpio; ++i) { + if (board_data->en_gpio_sleep[i]) { + ret = tps65910_set_bits(tps65910, + TPS65910_GPIO0 + i, GPIO_SLEEP_MASK); + if (ret < 0) + dev_warn(tps65910->dev, + "GPIO Sleep setting failed\n"); + } + } + } + ret = gpiochip_add(&tps65910->gpio); if (ret) diff --git a/include/linux/mfd/tps65910.h b/include/linux/mfd/tps65910.h index fa6c6bf..5c76b96 100644 --- a/include/linux/mfd/tps65910.h +++ b/include/linux/mfd/tps65910.h @@ -657,6 +657,8 @@ /*Register GPIO (0x80) register.RegisterDescription */ +#define GPIO_SLEEP_MASK 0x80 +#define GPIO_SLEEP_SHIFT 7 #define GPIO_DEB_MASK 0x10 #define GPIO_DEB_SHIFT 4 #define GPIO_PUEN_MASK 0x08 @@ -740,6 +742,11 @@ #define TPS65910_GPIO_STS BIT(1) #define TPS65910_GPIO_SET BIT(0) +/* Max number of TPS65910/11 GPIOs */ +#define TPS65910_NUM_GPIO 6 +#define TPS65911_NUM_GPIO 9 +#define TPS6591X_MAX_NUM_GPIO 9 + /* Regulator Index Definitions */ #define TPS65910_REG_VRTC 0 #define TPS65910_REG_VIO 1 @@ -786,6 +793,7 @@ struct tps65910_board { int irq_base; int vmbch_threshold; int vmbch2_threshold; + bool en_gpio_sleep[TPS6591X_MAX_NUM_GPIO]; unsigned long regulator_ext_sleep_control[TPS65910_NUM_REGS]; struct regulator_init_data *tps65910_pmic_init_data[TPS65910_NUM_REGS]; };
The device tps65910/tps65911 supports the sleep functionality in some of gpios. If gpio is configured in output mode and sleep is enabled then during device sleep state, the output of gpio becomes LOW regardless of non-sleep output value. Such gpio can be used to control regulator switch such that output of regulator is off in device sleep state. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> --- Changes from V1: Taken care of review comments from Linus Walleij's - Remove magic numbers and added macro for defining them. - Used bool type for the platform's gpio sleep control data. drivers/gpio/gpio-tps65910.c | 20 ++++++++++++++++++-- include/linux/mfd/tps65910.h | 8 ++++++++ 2 files changed, 26 insertions(+), 2 deletions(-)