[PATCH v6 2/2] gpio: tps65219: Add support for TI TPS65214 PMIC

Shree Ramamoorthy posted 2 patches 3 months ago
There is a newer version of this series
[PATCH v6 2/2] gpio: tps65219: Add support for TI TPS65214 PMIC
Posted by Shree Ramamoorthy 3 months ago
Add support for the TI TPS65214 PMIC with the addition of an id_table,
separate TPS65214 template_chip, and device-specific _change_direction
functions.

- Use platform_get_device_id() to assign dev-specific information.
- Use different change_direction() functions since TPS65214's GPIO
  configuration bits are changeable during device operation through bit
  GPIO_CONFIG in GENERAL_CONFIG register.
- Remove MODULE_ALIAS since it is now generated by MODULE_DEVICE_TABLE.

Reviewed-by: Jonathan Cormier <jcormier@criticallink.com>
Tested-by: Jonathan Cormier <jcormier@criticallink.com>
Signed-off-by: Shree Ramamoorthy <s-ramamoorthy@ti.com>
---
 drivers/gpio/gpio-tps65219.c | 95 +++++++++++++++++++++++++++++++++---
 1 file changed, 88 insertions(+), 7 deletions(-)

diff --git a/drivers/gpio/gpio-tps65219.c b/drivers/gpio/gpio-tps65219.c
index 2355eec0cee6..f6a99402ae46 100644
--- a/drivers/gpio/gpio-tps65219.c
+++ b/drivers/gpio/gpio-tps65219.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * GPIO driver for TI TPS65215/TPS65219 PMICs
+ * GPIO driver for TI TPS65214/TPS65215/TPS65219 PMICs
  *
  * Copyright (C) 2022, 2025 Texas Instruments Incorporated - http://www.ti.com/
  */
@@ -13,10 +13,15 @@
 #include <linux/regmap.h>
 
 #define TPS65219_GPIO0_DIR_MASK		BIT(3)
+#define TPS65214_GPIO0_DIR_MASK		BIT(1)
 #define TPS6521X_GPIO0_OFFSET		2
 #define TPS6521X_GPIO0_IDX		0
 
 /*
+ * TPS65214 GPIO mapping
+ * Linux gpio offset 0 -> GPIO (pin16) -> bit_offset 2
+ * Linux gpio offset 1 -> GPO1 (pin9 ) -> bit_offset 0
+ *
  * TPS65215 & TPS65219 GPIO mapping
  * Linux gpio offset 0 -> GPIO (pin16) -> bit_offset 2
  * Linux gpio offset 1 -> GPO1 (pin8 ) -> bit_offset 0
@@ -24,10 +29,26 @@
  */
 
 struct tps65219_gpio {
+	int (*change_dir)(struct gpio_chip *gc, unsigned int offset, unsigned int dir);
 	struct gpio_chip gpio_chip;
 	struct tps65219 *tps;
 };
 
+static int tps65214_gpio_get_direction(struct gpio_chip *gc, unsigned int offset)
+{
+	struct tps65219_gpio *gpio = gpiochip_get_data(gc);
+	int ret, val;
+
+	if (offset != TPS6521X_GPIO0_IDX)
+		return GPIO_LINE_DIRECTION_OUT;
+
+	ret = regmap_read(gpio->tps->regmap, TPS65219_REG_GENERAL_CONFIG, &val);
+	if (ret)
+		return ret;
+
+	return !(val & TPS65214_GPIO0_DIR_MASK);
+}
+
 static int tps65219_gpio_get_direction(struct gpio_chip *gc, unsigned int offset)
 {
 	struct tps65219_gpio *gpio = gpiochip_get_data(gc);
@@ -119,6 +140,34 @@ static int tps65219_gpio_change_direction(struct gpio_chip *gc, unsigned int off
 	return -ENOTSUPP;
 }
 
+static int tps65214_gpio_change_direction(struct gpio_chip *gc, unsigned int offset,
+					  unsigned int direction)
+{
+	struct tps65219_gpio *gpio = gpiochip_get_data(gc);
+	struct device *dev = gpio->tps->dev;
+	int val, ret;
+
+	/* Verified if GPIO or GPO in parent function
+	 * Masked value: 0 = GPIO, 1 = VSEL
+	 */
+	ret = regmap_read(gpio->tps->regmap, TPS65219_REG_MFP_1_CONFIG, &val);
+	if (ret)
+		return ret;
+
+	ret = !!(val & BIT(TPS65219_GPIO0_DIR_MASK));
+	if (ret)
+		dev_err(dev, "GPIO%d configured as VSEL, not GPIO\n", offset);
+
+	ret = regmap_update_bits(gpio->tps->regmap, TPS65219_REG_GENERAL_CONFIG,
+				 TPS65214_GPIO0_DIR_MASK, direction);
+	if (ret)
+		dev_err(dev,
+			"Fail to change direction to %u for GPIO%d.\n",
+			direction, offset);
+
+	return ret;
+}
+
 static int tps65219_gpio_direction_input(struct gpio_chip *gc, unsigned int offset)
 {
 	struct tps65219_gpio *gpio = gpiochip_get_data(gc);
@@ -132,11 +181,13 @@ static int tps65219_gpio_direction_input(struct gpio_chip *gc, unsigned int offs
 	if (tps65219_gpio_get_direction(gc, offset) == GPIO_LINE_DIRECTION_IN)
 		return 0;
 
-	return tps65219_gpio_change_direction(gc, offset, GPIO_LINE_DIRECTION_IN);
+	return gpio->change_dir(gc, offset, GPIO_LINE_DIRECTION_IN);
 }
 
 static int tps65219_gpio_direction_output(struct gpio_chip *gc, unsigned int offset, int value)
 {
+	struct tps65219_gpio *gpio = gpiochip_get_data(gc);
+
 	tps65219_gpio_set(gc, offset, value);
 	if (offset != TPS6521X_GPIO0_IDX)
 		return 0;
@@ -144,9 +195,22 @@ static int tps65219_gpio_direction_output(struct gpio_chip *gc, unsigned int off
 	if (tps65219_gpio_get_direction(gc, offset) == GPIO_LINE_DIRECTION_OUT)
 		return 0;
 
-	return tps65219_gpio_change_direction(gc, offset, GPIO_LINE_DIRECTION_OUT);
+	return gpio->change_dir(gc, offset, GPIO_LINE_DIRECTION_OUT);
 }
 
+static const struct gpio_chip tps65214_template_chip = {
+	.label			= "tps65214-gpio",
+	.owner			= THIS_MODULE,
+	.get_direction		= tps65214_gpio_get_direction,
+	.direction_input	= tps65219_gpio_direction_input,
+	.direction_output	= tps65219_gpio_direction_output,
+	.get			= tps65219_gpio_get,
+	.set_rv			= tps65219_gpio_set,
+	.base			= -1,
+	.ngpio			= 2,
+	.can_sleep		= true,
+};
+
 static const struct gpio_chip tps65219_template_chip = {
 	.label			= "tps65219-gpio",
 	.owner			= THIS_MODULE,
@@ -154,7 +218,7 @@ static const struct gpio_chip tps65219_template_chip = {
 	.direction_input	= tps65219_gpio_direction_input,
 	.direction_output	= tps65219_gpio_direction_output,
 	.get			= tps65219_gpio_get,
-	.set			= tps65219_gpio_set,
+	.set_rv			= tps65219_gpio_set,
 	.base			= -1,
 	.ngpio			= 3,
 	.can_sleep		= true,
@@ -162,6 +226,7 @@ static const struct gpio_chip tps65219_template_chip = {
 
 static int tps65219_gpio_probe(struct platform_device *pdev)
 {
+	enum pmic_id chip = platform_get_device_id(pdev)->driver_data;
 	struct tps65219 *tps = dev_get_drvdata(pdev->dev.parent);
 	struct tps65219_gpio *gpio;
 
@@ -169,22 +234,38 @@ static int tps65219_gpio_probe(struct platform_device *pdev)
 	if (!gpio)
 		return -ENOMEM;
 
+	if (chip == TPS65214) {
+		gpio->gpio_chip = tps65214_template_chip;
+		gpio->change_dir = tps65214_gpio_change_direction;
+	} else if (chip == TPS65219) {
+		gpio->gpio_chip = tps65219_template_chip;
+		gpio->change_dir = tps65219_gpio_change_direction;
+	} else {
+		return -ENODATA;
+	}
+
 	gpio->tps = tps;
-	gpio->gpio_chip = tps65219_template_chip;
 	gpio->gpio_chip.parent = tps->dev;
 
 	return devm_gpiochip_add_data(&pdev->dev, &gpio->gpio_chip, gpio);
 }
 
+static const struct platform_device_id tps6521x_gpio_id_table[] = {
+	{ "tps65214-gpio", TPS65214 },
+	{ "tps65219-gpio", TPS65219 },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(platform, tps6521x_gpio_id_table);
+
 static struct platform_driver tps65219_gpio_driver = {
 	.driver = {
 		.name = "tps65219-gpio",
 	},
 	.probe = tps65219_gpio_probe,
+	.id_table = tps6521x_gpio_id_table,
 };
 module_platform_driver(tps65219_gpio_driver);
 
-MODULE_ALIAS("platform:tps65219-gpio");
 MODULE_AUTHOR("Jonathan Cormier <jcormier@criticallink.com>");
-MODULE_DESCRIPTION("TPS65215/TPS65219 GPIO driver");
+MODULE_DESCRIPTION("TPS65214/TPS65215/TPS65219 GPIO driver");
 MODULE_LICENSE("GPL");
-- 
2.43.0
Re: [PATCH v6 2/2] gpio: tps65219: Add support for TI TPS65214 PMIC
Posted by kernel test robot 3 months ago
Hi Shree,

kernel test robot noticed the following build errors:

[auto build test ERROR on v6.16-rc4]
[also build test ERROR on linus/master next-20250703]
[cannot apply to tmlind-omap/for-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Shree-Ramamoorthy/gpio-tps65219-Update-_IDX-_OFFSET-macro-prefix/20250704-021048
base:   v6.16-rc4
patch link:    https://lore.kernel.org/r/20250703180751.168755-3-s-ramamoorthy%40ti.com
patch subject: [PATCH v6 2/2] gpio: tps65219: Add support for TI TPS65214 PMIC
config: hexagon-randconfig-002-20250704 (https://download.01.org/0day-ci/archive/20250704/202507041537.da8R2iEX-lkp@intel.com/config)
compiler: clang version 21.0.0git (https://github.com/llvm/llvm-project 61529d9e36fa86782a2458e6bdeedf7f376ef4b5)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250704/202507041537.da8R2iEX-lkp@intel.com/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202507041537.da8R2iEX-lkp@intel.com/

All errors (new ones prefixed by >>):

>> drivers/gpio/gpio-tps65219.c:208:14: error: incompatible function pointer types initializing 'int (*)(struct gpio_chip *, unsigned int, int)' with an expression of type 'void (struct gpio_chip *, unsigned int, int)' [-Wincompatible-function-pointer-types]
     208 |         .set_rv                 = tps65219_gpio_set,
         |                                   ^~~~~~~~~~~~~~~~~
   drivers/gpio/gpio-tps65219.c:221:14: error: incompatible function pointer types initializing 'int (*)(struct gpio_chip *, unsigned int, int)' with an expression of type 'void (struct gpio_chip *, unsigned int, int)' [-Wincompatible-function-pointer-types]
     221 |         .set_rv                 = tps65219_gpio_set,
         |                                   ^~~~~~~~~~~~~~~~~
   2 errors generated.


vim +208 drivers/gpio/gpio-tps65219.c

   200	
   201	static const struct gpio_chip tps65214_template_chip = {
   202		.label			= "tps65214-gpio",
   203		.owner			= THIS_MODULE,
   204		.get_direction		= tps65214_gpio_get_direction,
   205		.direction_input	= tps65219_gpio_direction_input,
   206		.direction_output	= tps65219_gpio_direction_output,
   207		.get			= tps65219_gpio_get,
 > 208		.set_rv			= tps65219_gpio_set,
   209		.base			= -1,
   210		.ngpio			= 2,
   211		.can_sleep		= true,
   212	};
   213	

-- 
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Re: [PATCH v6 2/2] gpio: tps65219: Add support for TI TPS65214 PMIC
Posted by Christophe JAILLET 3 months ago
Le 03/07/2025 à 20:07, Shree Ramamoorthy a écrit :
> Add support for the TI TPS65214 PMIC with the addition of an id_table,
> separate TPS65214 template_chip, and device-specific _change_direction
> functions.
> 
> - Use platform_get_device_id() to assign dev-specific information.
> - Use different change_direction() functions since TPS65214's GPIO
>    configuration bits are changeable during device operation through bit
>    GPIO_CONFIG in GENERAL_CONFIG register.
> - Remove MODULE_ALIAS since it is now generated by MODULE_DEVICE_TABLE.
> 
> Reviewed-by: Jonathan Cormier <jcormier@criticallink.com>
> Tested-by: Jonathan Cormier <jcormier@criticallink.com>
> Signed-off-by: Shree Ramamoorthy <s-ramamoorthy@ti.com>
> ---

...

> +static int tps65214_gpio_change_direction(struct gpio_chip *gc, unsigned int offset,
> +					  unsigned int direction)
> +{
> +	struct tps65219_gpio *gpio = gpiochip_get_data(gc);
> +	struct device *dev = gpio->tps->dev;
> +	int val, ret;
> +
> +	/* Verified if GPIO or GPO in parent function

Nitpick: should the /* be on a separate line?

> +	 * Masked value: 0 = GPIO, 1 = VSEL
> +	 */
> +	ret = regmap_read(gpio->tps->regmap, TPS65219_REG_MFP_1_CONFIG, &val);
> +	if (ret)
> +		return ret;
> +
> +	ret = !!(val & BIT(TPS65219_GPIO0_DIR_MASK));
> +	if (ret)
> +		dev_err(dev, "GPIO%d configured as VSEL, not GPIO\n", offset);
> +
> +	ret = regmap_update_bits(gpio->tps->regmap, TPS65219_REG_GENERAL_CONFIG,
> +				 TPS65214_GPIO0_DIR_MASK, direction);
> +	if (ret)
> +		dev_err(dev,
> +			"Fail to change direction to %u for GPIO%d.\n",

Nitpick: keep it on the previous line?

> +			direction, offset);
> +
> +	return ret;
> +}

...

> +static const struct gpio_chip tps65214_template_chip = {
> +	.label			= "tps65214-gpio",
> +	.owner			= THIS_MODULE,
> +	.get_direction		= tps65214_gpio_get_direction,
> +	.direction_input	= tps65219_gpio_direction_input,
> +	.direction_output	= tps65219_gpio_direction_output,
> +	.get			= tps65219_gpio_get,
> +	.set_rv			= tps65219_gpio_set,
> +	.base			= -1,
> +	.ngpio			= 2,
> +	.can_sleep		= true,
> +};
> +
>   static const struct gpio_chip tps65219_template_chip = {
>   	.label			= "tps65219-gpio",
>   	.owner			= THIS_MODULE,
> @@ -154,7 +218,7 @@ static const struct gpio_chip tps65219_template_chip = {
>   	.direction_input	= tps65219_gpio_direction_input,
>   	.direction_output	= tps65219_gpio_direction_output,
>   	.get			= tps65219_gpio_get,
> -	.set			= tps65219_gpio_set,
> +	.set_rv			= tps65219_gpio_set,

Is this correct? Does it even compile?
tps65219_gpio_set() returns void and .set_rv() expects a return value.

(same for tps65214_template_chip above)

>   	.base			= -1,
>   	.ngpio			= 3,
>   	.can_sleep		= true,

...

CJ
Re: [PATCH v6 2/2] gpio: tps65219: Add support for TI TPS65214 PMIC
Posted by Shree Ramamoorthy 3 months ago
On 7/3/25 2:05 PM, Christophe JAILLET wrote:
> Le 03/07/2025 à 20:07, Shree Ramamoorthy a écrit :
>> Add support for the TI TPS65214 PMIC with the addition of an id_table,
>> separate TPS65214 template_chip, and device-specific _change_direction
>> functions.
>>
>> - Use platform_get_device_id() to assign dev-specific information.
>> - Use different change_direction() functions since TPS65214's GPIO
>>    configuration bits are changeable during device operation through bit
>>    GPIO_CONFIG in GENERAL_CONFIG register.
>> - Remove MODULE_ALIAS since it is now generated by MODULE_DEVICE_TABLE.
>>
>> Reviewed-by: Jonathan Cormier <jcormier@criticallink.com>
>> Tested-by: Jonathan Cormier <jcormier@criticallink.com>
>> Signed-off-by: Shree Ramamoorthy <s-ramamoorthy@ti.com>
>> ---
>
> ...
>
>> +static int tps65214_gpio_change_direction(struct gpio_chip *gc, 
>> unsigned int offset,
>> +                      unsigned int direction)
>> +{
>> +    struct tps65219_gpio *gpio = gpiochip_get_data(gc);
>> +    struct device *dev = gpio->tps->dev;
>> +    int val, ret;
>> +
>> +    /* Verified if GPIO or GPO in parent function
>
> Nitpick: should the /* be on a separate line?
>
Will fix this.

>> +     * Masked value: 0 = GPIO, 1 = VSEL
>> +     */
>> +    ret = regmap_read(gpio->tps->regmap, TPS65219_REG_MFP_1_CONFIG, 
>> &val);
>> +    if (ret)
>> +        return ret;
>> +
>> +    ret = !!(val & BIT(TPS65219_GPIO0_DIR_MASK));
>> +    if (ret)
>> +        dev_err(dev, "GPIO%d configured as VSEL, not GPIO\n", offset);
>> +
>> +    ret = regmap_update_bits(gpio->tps->regmap, 
>> TPS65219_REG_GENERAL_CONFIG,
>> +                 TPS65214_GPIO0_DIR_MASK, direction);
>> +    if (ret)
>> +        dev_err(dev,
>> +            "Fail to change direction to %u for GPIO%d.\n",
>
> Nitpick: keep it on the previous line?

Will update this as well.

>
>> +            direction, offset);
>> +
>> +    return ret;
>> +}
>
> ...
>
>> +static const struct gpio_chip tps65214_template_chip = {
>> +    .label            = "tps65214-gpio",
>> +    .owner            = THIS_MODULE,
>> +    .get_direction        = tps65214_gpio_get_direction,
>> +    .direction_input    = tps65219_gpio_direction_input,
>> +    .direction_output    = tps65219_gpio_direction_output,
>> +    .get            = tps65219_gpio_get,
>> +    .set_rv            = tps65219_gpio_set,
>> +    .base            = -1,
>> +    .ngpio            = 2,
>> +    .can_sleep        = true,
>> +};
>> +
>>   static const struct gpio_chip tps65219_template_chip = {
>>       .label            = "tps65219-gpio",
>>       .owner            = THIS_MODULE,
>> @@ -154,7 +218,7 @@ static const struct gpio_chip 
>> tps65219_template_chip = {
>>       .direction_input    = tps65219_gpio_direction_input,
>>       .direction_output    = tps65219_gpio_direction_output,
>>       .get            = tps65219_gpio_get,
>> -    .set            = tps65219_gpio_set,
>> +    .set_rv            = tps65219_gpio_set,
>
> Is this correct? Does it even compile?
> tps65219_gpio_set() returns void and .set_rv() expects a return value.
>
> (same for tps65214_template_chip above)

I sent this out too quickly, will add in the corresponding return values & re-test. Thanks for reviewing!

>
>>       .base            = -1,
>>       .ngpio            = 3,
>>       .can_sleep        = true,
>
> ...
>
> CJ

-- 
Best,
Shree Ramamoorthy
PMIC Software Engineer