| Message ID | 1453737012-3130-4-git-send-email-afd@ti.com |
|---|---|
| State | New |
| Headers | show |
On Mon, 25 Jan 2016, Andrew F. Davis wrote: > Add support for the TPS65086 PMIC GPOs. > > TPS65086 has four configurable GPOs that can be used for several > purposes. These are output only. > > Signed-off-by: Andrew F. Davis <afd@ti.com> > --- > drivers/gpio/Kconfig | 6 ++ > drivers/gpio/Makefile | 1 + > drivers/gpio/gpio-tps65086.c | 144 +++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 151 insertions(+) > create mode 100644 drivers/gpio/gpio-tps65086.c Is this patch orthogonal to the other two in the set, or do they all need to go in together? > diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig > index c88dd24..e35e120 100644 > --- a/drivers/gpio/Kconfig > +++ b/drivers/gpio/Kconfig > @@ -844,6 +844,12 @@ config GPIO_TIMBERDALE > ---help--- > Add support for the GPIO IP in the timberdale FPGA. > > +config GPIO_TPS65086 > + tristate "TI TPS65086 GPO" > + depends on MFD_TPS65086 > + help > + This driver supports the GPO on TI TPS65086x PMICs. > + > config GPIO_TPS6586X > bool "TPS6586X GPIO" > depends on MFD_TPS6586X > diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile > index ece7d7c..c759190 100644 > --- a/drivers/gpio/Makefile > +++ b/drivers/gpio/Makefile > @@ -95,6 +95,7 @@ obj-$(CONFIG_GPIO_TC3589X) += gpio-tc3589x.o > obj-$(CONFIG_ARCH_TEGRA) += gpio-tegra.o > obj-$(CONFIG_GPIO_TIMBERDALE) += gpio-timberdale.o > obj-$(CONFIG_GPIO_PALMAS) += gpio-palmas.o > +obj-$(CONFIG_GPIO_TPS65086) += gpio-tps65086.o > obj-$(CONFIG_GPIO_TPS6586X) += gpio-tps6586x.o > obj-$(CONFIG_GPIO_TPS65910) += gpio-tps65910.o > obj-$(CONFIG_GPIO_TPS65912) += gpio-tps65912.o > diff --git a/drivers/gpio/gpio-tps65086.c b/drivers/gpio/gpio-tps65086.c > new file mode 100644 > index 0000000..d5d9e47 > --- /dev/null > +++ b/drivers/gpio/gpio-tps65086.c > @@ -0,0 +1,144 @@ > +/* > + * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/ > + * Andrew F. Davis <afd@ti.com> > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + * > + * This program is distributed "as is" WITHOUT ANY WARRANTY of any > + * kind, whether expressed or implied; without even the implied warranty > + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License version 2 for more details. > + * > + * Based on the TPS65912 driver > + */ > + > +#include <linux/gpio.h> > +#include <linux/module.h> > +#include <linux/platform_device.h> > + > +#include <linux/mfd/tps65086.h> > + > +struct tps65086_gpio { > + struct gpio_chip chip; > + struct tps65086 *tps; > +}; > + > +static inline struct tps65086_gpio *to_tps65086_gpio(struct gpio_chip *chip) > +{ > + return container_of(chip, struct tps65086_gpio, chip); > +} > + > +static int tps65086_gpio_get_direction(struct gpio_chip *chip, > + unsigned offset) > +{ > + /* This device is output only */ > + return 0; > +} > + > +static int tps65086_gpio_direction_input(struct gpio_chip *chip, > + unsigned offset) > +{ > + /* This device is output only */ > + return -EINVAL; > +} > + > +static int tps65086_gpio_direction_output(struct gpio_chip *chip, > + unsigned offset, int value) > +{ > + struct tps65086_gpio *gpio = to_tps65086_gpio(chip); > + > + /* Set the initial value */ > + regmap_update_bits(gpio->tps->regmap, TPS65086_GPOCTRL, > + BIT(4 + offset), value ? BIT(4 + offset) : 0); > + > + return 0; > +} > + > +static int tps65086_gpio_get(struct gpio_chip *chip, unsigned offset) > +{ > + struct tps65086_gpio *gpio = to_tps65086_gpio(chip); > + int ret, val; > + > + ret = regmap_read(gpio->tps->regmap, TPS65086_GPOCTRL, &val); > + if (ret < 0) > + return ret; > + > + return val & BIT(4 + offset); > +} > + > +static void tps65086_gpio_set(struct gpio_chip *chip, unsigned offset, > + int value) > +{ > + struct tps65086_gpio *gpio = to_tps65086_gpio(chip); > + > + regmap_update_bits(gpio->tps->regmap, TPS65086_GPOCTRL, > + BIT(4 + offset), value ? BIT(4 + offset) : 0); > +} > + > +static struct gpio_chip template_chip = { > + .label = "tps65086-gpio", > + .owner = THIS_MODULE, > + .get_direction = tps65086_gpio_get_direction, > + .direction_input = tps65086_gpio_direction_input, > + .direction_output = tps65086_gpio_direction_output, > + .get = tps65086_gpio_get, > + .set = tps65086_gpio_set, > + .base = -1, > + .ngpio = 4, > + .can_sleep = true, > +}; > + > +static int tps65086_gpio_probe(struct platform_device *pdev) > +{ > + struct tps65086_gpio *gpio; > + int ret; > + > + gpio = devm_kzalloc(&pdev->dev, sizeof(*gpio), GFP_KERNEL); > + if (!gpio) > + return -ENOMEM; > + > + platform_set_drvdata(pdev, gpio); > + > + gpio->tps = dev_get_drvdata(pdev->dev.parent); > + gpio->chip = template_chip; > + gpio->chip.parent = gpio->tps->dev; > + > + ret = gpiochip_add(&gpio->chip); > + if (ret < 0) { > + dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret); > + return ret; > + } > + > + return 0; > +} > + > +static int tps65086_gpio_remove(struct platform_device *pdev) > +{ > + struct tps65086_gpio *gpio = platform_get_drvdata(pdev); > + > + gpiochip_remove(&gpio->chip); > + > + return 0; > +} > + > +static const struct platform_device_id tps65086_gpio_id_table[] = { > + { "tps65086-gpio", }, > + { /* sentinel */ } > +}; > +MODULE_DEVICE_TABLE(platform, tps65086_gpio_id_table); > + > +static struct platform_driver tps65086_gpio_driver = { > + .driver = { > + .name = "tps65086-gpio", > + }, > + .probe = tps65086_gpio_probe, > + .remove = tps65086_gpio_remove, > + .id_table = tps65086_gpio_id_table, > +}; > +module_platform_driver(tps65086_gpio_driver); > + > +MODULE_AUTHOR("Andrew F. Davis <afd@ti.com>"); > +MODULE_DESCRIPTION("TPS65086 GPIO driver"); > +MODULE_LICENSE("GPL v2");
On 01/26/2016 08:03 AM, Lee Jones wrote: > On Mon, 25 Jan 2016, Andrew F. Davis wrote: > >> Add support for the TPS65086 PMIC GPOs. >> >> TPS65086 has four configurable GPOs that can be used for several >> purposes. These are output only. >> >> Signed-off-by: Andrew F. Davis <afd@ti.com> >> --- >> drivers/gpio/Kconfig | 6 ++ >> drivers/gpio/Makefile | 1 + >> drivers/gpio/gpio-tps65086.c | 144 +++++++++++++++++++++++++++++++++++++++++++ >> 3 files changed, 151 insertions(+) >> create mode 100644 drivers/gpio/gpio-tps65086.c > > Is this patch orthogonal to the other two in the set, or do they all > need to go in together? > These can all go in separately, in fact Mark has already taken the regulator component from a previous push of this series. It is only the TPS65912 driver I'm pushing that will need to go all at once due to conflicts with the driver it is replacing. -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, 26 Jan 2016, Andrew F. Davis wrote: > On 01/26/2016 08:03 AM, Lee Jones wrote: > >On Mon, 25 Jan 2016, Andrew F. Davis wrote: > > > >>Add support for the TPS65086 PMIC GPOs. > >> > >>TPS65086 has four configurable GPOs that can be used for several > >>purposes. These are output only. > >> > >>Signed-off-by: Andrew F. Davis <afd@ti.com> > >>--- > >> drivers/gpio/Kconfig | 6 ++ > >> drivers/gpio/Makefile | 1 + > >> drivers/gpio/gpio-tps65086.c | 144 +++++++++++++++++++++++++++++++++++++++++++ > >> 3 files changed, 151 insertions(+) > >> create mode 100644 drivers/gpio/gpio-tps65086.c > > > >Is this patch orthogonal to the other two in the set, or do they all > >need to go in together? > > These can all go in separately, in fact Mark has already taken the regulator > component from a previous push of this series. It is only the TPS65912 > driver I'm pushing that will need to go all at once due to conflicts with > the driver it is replacing. Very well. MFD patches taken. Linus should take this through his tree.
On Mon, Jan 25, 2016 at 4:50 PM, Andrew F. Davis <afd@ti.com> wrote: > Add support for the TPS65086 PMIC GPOs. > > TPS65086 has four configurable GPOs that can be used for several > purposes. These are output only. > > Signed-off-by: Andrew F. Davis <afd@ti.com> (...) > +static inline struct tps65086_gpio *to_tps65086_gpio(struct gpio_chip *chip) > +{ > + return container_of(chip, struct tps65086_gpio, chip); > +} Remove this and use gpiochip_get_data() instead. > + ret = gpiochip_add(&gpio->chip); And use gpiochip_add_data() to pass what gpiochip_get_data() will return. Apart from that no strong opinions. If there is a header file dependency this either has to go to Lee's tree with my ACK, or wait until the next kernel cycle. But first change the above. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 02/05/2016 08:43 AM, Linus Walleij wrote: > On Mon, Jan 25, 2016 at 4:50 PM, Andrew F. Davis <afd@ti.com> wrote: > >> Add support for the TPS65086 PMIC GPOs. >> >> TPS65086 has four configurable GPOs that can be used for several >> purposes. These are output only. >> >> Signed-off-by: Andrew F. Davis <afd@ti.com> > (...) >> +static inline struct tps65086_gpio *to_tps65086_gpio(struct gpio_chip *chip) >> +{ >> + return container_of(chip, struct tps65086_gpio, chip); >> +} > > Remove this and use gpiochip_get_data() instead. > >> + ret = gpiochip_add(&gpio->chip); > > And use gpiochip_add_data() to pass what gpiochip_get_data() > will return. > > Apart from that no strong opinions. > > If there is a header file dependency this either has to go to > Lee's tree with my ACK, or wait until the next kernel cycle. > But first change the above. > > Yours, > Linus Walleij > Changes made, I will resend this part as its own patch as the other components have been taken. Thanks, Andrew -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" 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/Kconfig b/drivers/gpio/Kconfig index c88dd24..e35e120 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -844,6 +844,12 @@ config GPIO_TIMBERDALE ---help--- Add support for the GPIO IP in the timberdale FPGA. +config GPIO_TPS65086 + tristate "TI TPS65086 GPO" + depends on MFD_TPS65086 + help + This driver supports the GPO on TI TPS65086x PMICs. + config GPIO_TPS6586X bool "TPS6586X GPIO" depends on MFD_TPS6586X diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index ece7d7c..c759190 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -95,6 +95,7 @@ obj-$(CONFIG_GPIO_TC3589X) += gpio-tc3589x.o obj-$(CONFIG_ARCH_TEGRA) += gpio-tegra.o obj-$(CONFIG_GPIO_TIMBERDALE) += gpio-timberdale.o obj-$(CONFIG_GPIO_PALMAS) += gpio-palmas.o +obj-$(CONFIG_GPIO_TPS65086) += gpio-tps65086.o obj-$(CONFIG_GPIO_TPS6586X) += gpio-tps6586x.o obj-$(CONFIG_GPIO_TPS65910) += gpio-tps65910.o obj-$(CONFIG_GPIO_TPS65912) += gpio-tps65912.o diff --git a/drivers/gpio/gpio-tps65086.c b/drivers/gpio/gpio-tps65086.c new file mode 100644 index 0000000..d5d9e47 --- /dev/null +++ b/drivers/gpio/gpio-tps65086.c @@ -0,0 +1,144 @@ +/* + * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/ + * Andrew F. Davis <afd@ti.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed "as is" WITHOUT ANY WARRANTY of any + * kind, whether expressed or implied; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License version 2 for more details. + * + * Based on the TPS65912 driver + */ + +#include <linux/gpio.h> +#include <linux/module.h> +#include <linux/platform_device.h> + +#include <linux/mfd/tps65086.h> + +struct tps65086_gpio { + struct gpio_chip chip; + struct tps65086 *tps; +}; + +static inline struct tps65086_gpio *to_tps65086_gpio(struct gpio_chip *chip) +{ + return container_of(chip, struct tps65086_gpio, chip); +} + +static int tps65086_gpio_get_direction(struct gpio_chip *chip, + unsigned offset) +{ + /* This device is output only */ + return 0; +} + +static int tps65086_gpio_direction_input(struct gpio_chip *chip, + unsigned offset) +{ + /* This device is output only */ + return -EINVAL; +} + +static int tps65086_gpio_direction_output(struct gpio_chip *chip, + unsigned offset, int value) +{ + struct tps65086_gpio *gpio = to_tps65086_gpio(chip); + + /* Set the initial value */ + regmap_update_bits(gpio->tps->regmap, TPS65086_GPOCTRL, + BIT(4 + offset), value ? BIT(4 + offset) : 0); + + return 0; +} + +static int tps65086_gpio_get(struct gpio_chip *chip, unsigned offset) +{ + struct tps65086_gpio *gpio = to_tps65086_gpio(chip); + int ret, val; + + ret = regmap_read(gpio->tps->regmap, TPS65086_GPOCTRL, &val); + if (ret < 0) + return ret; + + return val & BIT(4 + offset); +} + +static void tps65086_gpio_set(struct gpio_chip *chip, unsigned offset, + int value) +{ + struct tps65086_gpio *gpio = to_tps65086_gpio(chip); + + regmap_update_bits(gpio->tps->regmap, TPS65086_GPOCTRL, + BIT(4 + offset), value ? BIT(4 + offset) : 0); +} + +static struct gpio_chip template_chip = { + .label = "tps65086-gpio", + .owner = THIS_MODULE, + .get_direction = tps65086_gpio_get_direction, + .direction_input = tps65086_gpio_direction_input, + .direction_output = tps65086_gpio_direction_output, + .get = tps65086_gpio_get, + .set = tps65086_gpio_set, + .base = -1, + .ngpio = 4, + .can_sleep = true, +}; + +static int tps65086_gpio_probe(struct platform_device *pdev) +{ + struct tps65086_gpio *gpio; + int ret; + + gpio = devm_kzalloc(&pdev->dev, sizeof(*gpio), GFP_KERNEL); + if (!gpio) + return -ENOMEM; + + platform_set_drvdata(pdev, gpio); + + gpio->tps = dev_get_drvdata(pdev->dev.parent); + gpio->chip = template_chip; + gpio->chip.parent = gpio->tps->dev; + + ret = gpiochip_add(&gpio->chip); + if (ret < 0) { + dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret); + return ret; + } + + return 0; +} + +static int tps65086_gpio_remove(struct platform_device *pdev) +{ + struct tps65086_gpio *gpio = platform_get_drvdata(pdev); + + gpiochip_remove(&gpio->chip); + + return 0; +} + +static const struct platform_device_id tps65086_gpio_id_table[] = { + { "tps65086-gpio", }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(platform, tps65086_gpio_id_table); + +static struct platform_driver tps65086_gpio_driver = { + .driver = { + .name = "tps65086-gpio", + }, + .probe = tps65086_gpio_probe, + .remove = tps65086_gpio_remove, + .id_table = tps65086_gpio_id_table, +}; +module_platform_driver(tps65086_gpio_driver); + +MODULE_AUTHOR("Andrew F. Davis <afd@ti.com>"); +MODULE_DESCRIPTION("TPS65086 GPIO driver"); +MODULE_LICENSE("GPL v2");
Add support for the TPS65086 PMIC GPOs. TPS65086 has four configurable GPOs that can be used for several purposes. These are output only. Signed-off-by: Andrew F. Davis <afd@ti.com> --- drivers/gpio/Kconfig | 6 ++ drivers/gpio/Makefile | 1 + drivers/gpio/gpio-tps65086.c | 144 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 151 insertions(+) create mode 100644 drivers/gpio/gpio-tps65086.c