| Message ID | 20240320102559.464981-11-bhargav.r@ltts.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add support for TI TPS65224 PMIC | expand |
On 3/20/24 11:25, Bhargav Raviprakash wrote: > From: Nirmala Devi Mal Nadar <m.nirmaladevi@ltts.com> > > Add support for TPS65224 pinctrl and GPIOs to TPS6594 driver as they have > significant functional overlap. > TPS65224 PMIC has 6 GPIOS which can be configured as GPIO or other > dedicated device functions. > > Signed-off-by: Nirmala Devi Mal Nadar <m.nirmaladevi@ltts.com> > Signed-off-by: Bhargav Raviprakash <bhargav.r@ltts.com> > Acked-by: Linus Walleij <linus.walleij@linaro.org> With this patch, an issue is observed on am62a: root@am62axx-evm:~# dmesg | grep tps ... [ 12.122631] tps6594-pinctrl tps6594-pinctrl.2.auto: error -EINVAL: Couldn't register gpio_regmap driver [ 12.133216] tps6594-pinctrl: probe of tps6594-pinctrl.2.auto failed with error -22 Without this patch, the issue disappears. Do you observe the same result with your am62p ? Julien Panis
On 3/21/24 12:10, Julien Panis wrote: > On 3/20/24 11:25, Bhargav Raviprakash wrote: >> From: Nirmala Devi Mal Nadar <m.nirmaladevi@ltts.com> >> >> Add support for TPS65224 pinctrl and GPIOs to TPS6594 driver as they have >> significant functional overlap. >> TPS65224 PMIC has 6 GPIOS which can be configured as GPIO or other >> dedicated device functions. >> >> Signed-off-by: Nirmala Devi Mal Nadar <m.nirmaladevi@ltts.com> >> Signed-off-by: Bhargav Raviprakash <bhargav.r@ltts.com> >> Acked-by: Linus Walleij <linus.walleij@linaro.org> > > With this patch, an issue is observed on am62a: > > root@am62axx-evm:~# dmesg | grep tps > ... > [ 12.122631] tps6594-pinctrl tps6594-pinctrl.2.auto: error -EINVAL: Couldn't register > gpio_regmap driver > [ 12.133216] tps6594-pinctrl: probe of tps6594-pinctrl.2.auto failed with error -22 > > Without this patch, the issue disappears. Do you observe > the same result with your am62p ? > > Julien Panis > Hi Barghav. I found the issue in your patch. In probe function you handle TPS652254 and TPS6594 'switch' cases, but you do not handle TPS6593 and LP8764 cases. Since AM62A uses a TPS6593, it currently falls in the default case, and as a result probe fails. Please fix it for v5. Julien Panis
On Fri, 22 Mar 2024 09:06:13 +0100, Julien Panis wrote: > On 3/21/24 12:10, Julien Panis wrote: > > On 3/20/24 11:25, Bhargav Raviprakash wrote: > >> From: Nirmala Devi Mal Nadar <m.nirmaladevi@ltts.com> > >> > >> Add support for TPS65224 pinctrl and GPIOs to TPS6594 driver as they have > >> significant functional overlap. > >> TPS65224 PMIC has 6 GPIOS which can be configured as GPIO or other > >> dedicated device functions. > >> > >> Signed-off-by: Nirmala Devi Mal Nadar <m.nirmaladevi@ltts.com> > >> Signed-off-by: Bhargav Raviprakash <bhargav.r@ltts.com> > >> Acked-by: Linus Walleij <linus.walleij@linaro.org> > > > > With this patch, an issue is observed on am62a: > > > > root@am62axx-evm:~# dmesg | grep tps > > ... > > [ 12.122631] tps6594-pinctrl tps6594-pinctrl.2.auto: error -EINVAL: Couldn't register > > gpio_regmap driver > > [ 12.133216] tps6594-pinctrl: probe of tps6594-pinctrl.2.auto failed with error -22 > > > > Without this patch, the issue disappears. Do you observe > > the same result with your am62p ? > > > > Julien Panis > > > > Hi Barghav. > > I found the issue in your patch. > > In probe function you handle TPS652254 and TPS6594 'switch' cases, > but you do not handle TPS6593 and LP8764 cases. > Since AM62A uses a TPS6593, it currently falls in the default case, > and as a result probe fails. > > Please fix it for v5. > > Julien Panis Hi Julien, Thanks for pointing it out. We added support for TPS6594 alone as mentioned in header description "Pinmux and GPIO driver for tps6594 PMIC". TPS6594 and TPS6593 has similar gpio map, however gpio map for LP8764 is different from TPS6594 / TPS6593. Regards, Bhargav
Hi Bhargav, LP8764 is not supported but the driver was wrongly instanciated on the MFD. For V5 could you: - Disable this driver for LD8764. - Make sure this driver correctly supports TPS6593 Best Regards,
On Wed Mar 20, 2024 at 11:25 AM CET, Bhargav Raviprakash wrote: > From: Nirmala Devi Mal Nadar <m.nirmaladevi@ltts.com> > > Add support for TPS65224 pinctrl and GPIOs to TPS6594 driver as they have > significant functional overlap. > TPS65224 PMIC has 6 GPIOS which can be configured as GPIO or other > dedicated device functions. > > Signed-off-by: Nirmala Devi Mal Nadar <m.nirmaladevi@ltts.com> > Signed-off-by: Bhargav Raviprakash <bhargav.r@ltts.com> > Acked-by: Linus Walleij <linus.walleij@linaro.org> > --- > drivers/pinctrl/pinctrl-tps6594.c | 258 +++++++++++++++++++++++++----- > 1 file changed, 215 insertions(+), 43 deletions(-) > > diff --git a/drivers/pinctrl/pinctrl-tps6594.c b/drivers/pinctrl/pinctrl-tps6594.c > index 66985e54b..db0f5d2a8 100644 > --- a/drivers/pinctrl/pinctrl-tps6594.c > +++ b/drivers/pinctrl/pinctrl-tps6594.c > @@ -320,8 +451,18 @@ static int tps6594_pinctrl_probe(struct platform_device *pdev) > return -ENOMEM; > pctrl_desc->name = dev_name(dev); > pctrl_desc->owner = THIS_MODULE; > - pctrl_desc->pins = tps6594_pins; > - pctrl_desc->npins = ARRAY_SIZE(tps6594_pins); > + switch (tps->chip_id) { > + case TPS65224: > + pctrl_desc->pins = tps65224_pins; > + pctrl_desc->npins = ARRAY_SIZE(tps65224_pins); > + break; > + case TPS6594: > + pctrl_desc->pins = tps6594_pins; > + pctrl_desc->npins = ARRAY_SIZE(tps6594_pins); > + break; > + default: > + break; > + } > pctrl_desc->pctlops = &tps6594_pctrl_ops; > pctrl_desc->pmxops = &tps6594_pmx_ops; See below. > @@ -329,8 +470,28 @@ static int tps6594_pinctrl_probe(struct platform_device *pdev) > if (!pinctrl) > return -ENOMEM; > pinctrl->tps = dev_get_drvdata(dev->parent); > - pinctrl->funcs = pinctrl_functions; > - pinctrl->pins = tps6594_pins; > + switch (pinctrl->tps->chip_id) { You could use tps->chip_id like in the previous switch. > + case TPS65224: > + pinctrl->funcs = tps65224_pinctrl_functions; > + pinctrl->func_cnt = ARRAY_SIZE(tps65224_pinctrl_functions); > + pinctrl->pins = tps65224_pins; > + pinctrl->num_pins = ARRAY_SIZE(tps65224_pins); > + pinctrl->mux_sel_mask = TPS65224_MASK_GPIO_SEL; > + pinctrl->remap = tps65224_muxval_remap; > + pinctrl->remap_cnt = ARRAY_SIZE(tps65224_muxval_remap); > + break; > + case TPS6594: > + pinctrl->funcs = pinctrl_functions; This should be tps6594_pinctrl_functions > + pinctrl->func_cnt = ARRAY_SIZE(pinctrl_functions); > + pinctrl->pins = tps6594_pins; > + pinctrl->num_pins = ARRAY_SIZE(tps6594_pins); > + pinctrl->mux_sel_mask = TPS6594_MASK_GPIO_SEL; > + pinctrl->remap = tps6594_muxval_remap; > + pinctrl->remap_cnt = ARRAY_SIZE(tps6594_muxval_remap); > + break; > + default: > + break; > + } See blow. > pinctrl->pctl_dev = devm_pinctrl_register(dev, pctrl_desc, pinctrl); > if (IS_ERR(pinctrl->pctl_dev)) > return dev_err_probe(dev, PTR_ERR(pinctrl->pctl_dev), > @@ -338,8 +499,18 @@ static int tps6594_pinctrl_probe(struct platform_device *pdev) > > config.parent = tps->dev; > config.regmap = tps->regmap; > - config.ngpio = TPS6594_PINCTRL_PINS_NB; > - config.ngpio_per_reg = 8; > + switch (pinctrl->tps->chip_id) { Same here, use tps->chip_id > + case TPS65224: > + config.ngpio = ARRAY_SIZE(tps65224_gpio_func_group_names); > + config.ngpio_per_reg = TPS65224_NGPIO_PER_REG; > + break; > + case TPS6594: > + config.ngpio = ARRAY_SIZE(tps6594_gpio_func_group_names); > + config.ngpio_per_reg = TPS6594_NGPIO_PER_REG; > + break; > + default: > + break; > + } > config.reg_dat_base = TPS6594_REG_GPIO_IN_1; > config.reg_set_base = TPS6594_REG_GPIO_OUT_1; > config.reg_dir_out_base = TPS6594_REG_GPIOX_CONF(0); Regarding all the switch case, they should be use to set all the struct fields that are known at runtime only. For example, pinctrl->funcs, and pinctrl->func_cnt are known at compile time. You should create template structs, one for TPS6594 the other TPS65224, initialise the allocated struct with the template and then fill the remaining fields with the runtime values. Something like this: ```c struct test { int a; int *b; }; static struct test template = { .a = 42, }; int main(void) { struct test *test = malloc(sizeof(*test)); *test = sample; test->b = NULL; return 0; } ``` You could also try to reduce the number of switch case, there is no good reason to have 2 switch instead of one for pctrl_desc and pinctrl structs. Best regards,
Hi, On Fri, 22 Mar 2024 17:03:08 +0100, Esteban Blanc wrote: > On Wed Mar 20, 2024 at 11:25 AM CET, Bhargav Raviprakash wrote: > > From: Nirmala Devi Mal Nadar <m.nirmaladevi@ltts.com> > > > > Add support for TPS65224 pinctrl and GPIOs to TPS6594 driver as they have > > significant functional overlap. > > TPS65224 PMIC has 6 GPIOS which can be configured as GPIO or other > > dedicated device functions. > > > > Signed-off-by: Nirmala Devi Mal Nadar <m.nirmaladevi@ltts.com> > > Signed-off-by: Bhargav Raviprakash <bhargav.r@ltts.com> > > Acked-by: Linus Walleij <linus.walleij@linaro.org> > > --- > > drivers/pinctrl/pinctrl-tps6594.c | 258 +++++++++++++++++++++++++----- > > 1 file changed, 215 insertions(+), 43 deletions(-) > > > > diff --git a/drivers/pinctrl/pinctrl-tps6594.c b/drivers/pinctrl/pinctrl-tps6594.c > > index 66985e54b..db0f5d2a8 100644 > > --- a/drivers/pinctrl/pinctrl-tps6594.c > > +++ b/drivers/pinctrl/pinctrl-tps6594.c > > @@ -320,8 +451,18 @@ static int tps6594_pinctrl_probe(struct platform_device *pdev) > > return -ENOMEM; > > pctrl_desc->name = dev_name(dev); > > pctrl_desc->owner = THIS_MODULE; > > - pctrl_desc->pins = tps6594_pins; > > - pctrl_desc->npins = ARRAY_SIZE(tps6594_pins); > > + switch (tps->chip_id) { > > + case TPS65224: > > + pctrl_desc->pins = tps65224_pins; > > + pctrl_desc->npins = ARRAY_SIZE(tps65224_pins); > > + break; > > + case TPS6594: > > + pctrl_desc->pins = tps6594_pins; > > + pctrl_desc->npins = ARRAY_SIZE(tps6594_pins); > > + break; > > + default: > > + break; > > + } > > pctrl_desc->pctlops = &tps6594_pctrl_ops; > > pctrl_desc->pmxops = &tps6594_pmx_ops; > > See below. > > > @@ -329,8 +470,28 @@ static int tps6594_pinctrl_probe(struct platform_device *pdev) > > if (!pinctrl) > > return -ENOMEM; > > pinctrl->tps = dev_get_drvdata(dev->parent); > > - pinctrl->funcs = pinctrl_functions; > > - pinctrl->pins = tps6594_pins; > > + switch (pinctrl->tps->chip_id) { > > You could use tps->chip_id like in the previous switch. > > > + case TPS65224: > > + pinctrl->funcs = tps65224_pinctrl_functions; > > + pinctrl->func_cnt = ARRAY_SIZE(tps65224_pinctrl_functions); > > + pinctrl->pins = tps65224_pins; > > + pinctrl->num_pins = ARRAY_SIZE(tps65224_pins); > > + pinctrl->mux_sel_mask = TPS65224_MASK_GPIO_SEL; > > + pinctrl->remap = tps65224_muxval_remap; > > + pinctrl->remap_cnt = ARRAY_SIZE(tps65224_muxval_remap); > > + break; > > + case TPS6594: > > + pinctrl->funcs = pinctrl_functions; > > This should be tps6594_pinctrl_functions > > > + pinctrl->func_cnt = ARRAY_SIZE(pinctrl_functions); > > + pinctrl->pins = tps6594_pins; > > + pinctrl->num_pins = ARRAY_SIZE(tps6594_pins); > > + pinctrl->mux_sel_mask = TPS6594_MASK_GPIO_SEL; > > + pinctrl->remap = tps6594_muxval_remap; > > + pinctrl->remap_cnt = ARRAY_SIZE(tps6594_muxval_remap); > > + break; > > + default: > > + break; > > + } > > See blow. > > > pinctrl->pctl_dev = devm_pinctrl_register(dev, pctrl_desc, pinctrl); > > if (IS_ERR(pinctrl->pctl_dev)) > > return dev_err_probe(dev, PTR_ERR(pinctrl->pctl_dev), > > @@ -338,8 +499,18 @@ static int tps6594_pinctrl_probe(struct platform_device *pdev) > > > > config.parent = tps->dev; > > config.regmap = tps->regmap; > > - config.ngpio = TPS6594_PINCTRL_PINS_NB; > > - config.ngpio_per_reg = 8; > > + switch (pinctrl->tps->chip_id) { > > Same here, use tps->chip_id > Sure, will do! > > + case TPS65224: > > + config.ngpio = ARRAY_SIZE(tps65224_gpio_func_group_names); > > + config.ngpio_per_reg = TPS65224_NGPIO_PER_REG; > > + break; > > + case TPS6594: > > + config.ngpio = ARRAY_SIZE(tps6594_gpio_func_group_names); > > + config.ngpio_per_reg = TPS6594_NGPIO_PER_REG; > > + break; > > + default: > > + break; > > + } > > config.reg_dat_base = TPS6594_REG_GPIO_IN_1; > > config.reg_set_base = TPS6594_REG_GPIO_OUT_1; > > config.reg_dir_out_base = TPS6594_REG_GPIOX_CONF(0); > > Regarding all the switch case, they should be use to set all the struct > fields that are known at runtime only. For example, pinctrl->funcs, and > pinctrl->func_cnt are known at compile time. You should create template > structs, one for TPS6594 the other TPS65224, initialise the allocated > struct with the template and then fill the remaining fields with the > runtime values. Something like this: > > ```c > struct test { > int a; > int *b; > }; > > static struct test template = { > .a = 42, > }; > > int main(void) { > struct test *test = malloc(sizeof(*test)); > *test = sample; > test->b = NULL; > > return 0; > } > ``` > > You could also try to reduce the number of switch case, there is no good > reason to have 2 switch instead of one for pctrl_desc and pinctrl > structs. > > Best regards, > > -- > Esteban "Skallwar" Blanc > BayLibre Thank you for bringing these issues to our attention. We will follow the template struct way as suggested and also try to reduce the number of switch cases. These changes will be available in the next version. Regards, Bhargav
Hello, On Fri, 22 Mar 2024 16:24:07 +0100, Esteban Blanc wrote: > Hi Bhargav, > > LP8764 is not supported but the driver was wrongly instanciated on the > MFD. For V5 could you: > - Disable this driver for LD8764. > - Make sure this driver correctly supports TPS6593 > > Best Regards, > > -- > Esteban "Skallwar" Blanc > BayLibre Thanks! We will make sure the driver properly supports TPS6593. This issue will be fixed in v5. Regards, Bhargav
diff --git a/drivers/pinctrl/pinctrl-tps6594.c b/drivers/pinctrl/pinctrl-tps6594.c index 66985e54b..db0f5d2a8 100644 --- a/drivers/pinctrl/pinctrl-tps6594.c +++ b/drivers/pinctrl/pinctrl-tps6594.c @@ -14,8 +14,6 @@ #include <linux/mfd/tps6594.h> -#define TPS6594_PINCTRL_PINS_NB 11 - #define TPS6594_PINCTRL_GPIO_FUNCTION 0 #define TPS6594_PINCTRL_SCL_I2C2_CS_SPI_FUNCTION 1 #define TPS6594_PINCTRL_TRIG_WDOG_FUNCTION 1 @@ -40,17 +38,40 @@ #define TPS6594_PINCTRL_SYNCCLKOUT_FUNCTION_GPIO8 3 #define TPS6594_PINCTRL_CLK32KOUT_FUNCTION_GPIO9 3 +/* TPS65224 pin muxval */ +#define TPS65224_PINCTRL_SDA_I2C2_SDO_SPI_FUNCTION 1 +#define TPS65224_PINCTRL_SCL_I2C2_CS_SPI_FUNCTION 1 +#define TPS65224_PINCTRL_VMON1_FUNCTION 1 +#define TPS65224_PINCTRL_VMON2_FUNCTION 1 +#define TPS65224_PINCTRL_WKUP_FUNCTION 1 +#define TPS65224_PINCTRL_NSLEEP2_FUNCTION 2 +#define TPS65224_PINCTRL_NSLEEP1_FUNCTION 2 +#define TPS65224_PINCTRL_SYNCCLKIN_FUNCTION 2 +#define TPS65224_PINCTRL_NERR_MCU_FUNCTION 2 +#define TPS65224_PINCTRL_NINT_FUNCTION 3 +#define TPS65224_PINCTRL_TRIG_WDOG_FUNCTION 3 +#define TPS65224_PINCTRL_PB_FUNCTION 3 +#define TPS65224_PINCTRL_ADC_IN_FUNCTION 3 + +/* TPS65224 Special muxval for recalcitrant pins */ +#define TPS65224_PINCTRL_NSLEEP2_FUNCTION_GPIO5 1 +#define TPS65224_PINCTRL_WKUP_FUNCTION_GPIO5 4 +#define TPS65224_PINCTRL_SYNCCLKIN_FUNCTION_GPIO5 3 + #define TPS6594_OFFSET_GPIO_SEL 5 -#define FUNCTION(fname, v) \ +#define TPS65224_NGPIO_PER_REG 6 +#define TPS6594_NGPIO_PER_REG 8 + +#define FUNCTION(dev_name, fname, v) \ { \ .pinfunction = PINCTRL_PINFUNCTION(#fname, \ - tps6594_##fname##_func_group_names, \ - ARRAY_SIZE(tps6594_##fname##_func_group_names)),\ + dev_name##_##fname##_func_group_names, \ + ARRAY_SIZE(dev_name##_##fname##_func_group_names)),\ .muxval = v, \ } -static const struct pinctrl_pin_desc tps6594_pins[TPS6594_PINCTRL_PINS_NB] = { +static const struct pinctrl_pin_desc tps6594_pins[] = { PINCTRL_PIN(0, "GPIO0"), PINCTRL_PIN(1, "GPIO1"), PINCTRL_PIN(2, "GPIO2"), PINCTRL_PIN(3, "GPIO3"), PINCTRL_PIN(4, "GPIO4"), PINCTRL_PIN(5, "GPIO5"), @@ -143,30 +164,127 @@ static const char *const tps6594_syncclkin_func_group_names[] = { "GPIO9", }; +static const struct pinctrl_pin_desc tps65224_pins[] = { + PINCTRL_PIN(0, "GPIO0"), PINCTRL_PIN(1, "GPIO1"), + PINCTRL_PIN(2, "GPIO2"), PINCTRL_PIN(3, "GPIO3"), + PINCTRL_PIN(4, "GPIO4"), PINCTRL_PIN(5, "GPIO5"), +}; + +static const char *const tps65224_gpio_func_group_names[] = { + "GPIO0", "GPIO1", "GPIO2", "GPIO3", "GPIO4", "GPIO5", +}; + +static const char *const tps65224_sda_i2c2_sdo_spi_func_group_names[] = { + "GPIO0", +}; + +static const char *const tps65224_nsleep2_func_group_names[] = { + "GPIO0", "GPIO5", +}; + +static const char *const tps65224_nint_func_group_names[] = { + "GPIO0", +}; + +static const char *const tps65224_scl_i2c2_cs_spi_func_group_names[] = { + "GPIO1", +}; + +static const char *const tps65224_nsleep1_func_group_names[] = { + "GPIO1", "GPIO2", "GPIO3", +}; + +static const char *const tps65224_trig_wdog_func_group_names[] = { + "GPIO1", +}; + +static const char *const tps65224_vmon1_func_group_names[] = { + "GPIO2", +}; + +static const char *const tps65224_pb_func_group_names[] = { + "GPIO2", +}; + +static const char *const tps65224_vmon2_func_group_names[] = { + "GPIO3", +}; + +static const char *const tps65224_adc_in_func_group_names[] = { + "GPIO3", "GPIO4", +}; + +static const char *const tps65224_wkup_func_group_names[] = { + "GPIO4", "GPIO5", +}; + +static const char *const tps65224_syncclkin_func_group_names[] = { + "GPIO4", "GPIO5", +}; + +static const char *const tps65224_nerr_mcu_func_group_names[] = { + "GPIO5", +}; + struct tps6594_pinctrl_function { struct pinfunction pinfunction; u8 muxval; }; +struct muxval_remap { + unsigned int group; + u8 muxval; + u8 remap; +}; + +struct muxval_remap tps65224_muxval_remap[] = { + {5, TPS6594_PINCTRL_DISABLE_WDOG_FUNCTION, TPS65224_PINCTRL_WKUP_FUNCTION_GPIO5}, + {5, TPS65224_PINCTRL_SYNCCLKIN_FUNCTION, TPS65224_PINCTRL_SYNCCLKIN_FUNCTION_GPIO5}, + {5, TPS65224_PINCTRL_NSLEEP2_FUNCTION, TPS65224_PINCTRL_NSLEEP2_FUNCTION_GPIO5}, +}; + +struct muxval_remap tps6594_muxval_remap[] = { + {8, TPS6594_PINCTRL_DISABLE_WDOG_FUNCTION, TPS6594_PINCTRL_DISABLE_WDOG_FUNCTION_GPIO8}, + {8, TPS6594_PINCTRL_SYNCCLKOUT_FUNCTION, TPS6594_PINCTRL_SYNCCLKOUT_FUNCTION_GPIO8}, + {9, TPS6594_PINCTRL_CLK32KOUT_FUNCTION, TPS6594_PINCTRL_CLK32KOUT_FUNCTION_GPIO9}, +}; + static const struct tps6594_pinctrl_function pinctrl_functions[] = { - FUNCTION(gpio, TPS6594_PINCTRL_GPIO_FUNCTION), - FUNCTION(nsleep1, TPS6594_PINCTRL_NSLEEP1_FUNCTION), - FUNCTION(nsleep2, TPS6594_PINCTRL_NSLEEP2_FUNCTION), - FUNCTION(wkup1, TPS6594_PINCTRL_WKUP1_FUNCTION), - FUNCTION(wkup2, TPS6594_PINCTRL_WKUP2_FUNCTION), - FUNCTION(scl_i2c2_cs_spi, TPS6594_PINCTRL_SCL_I2C2_CS_SPI_FUNCTION), - FUNCTION(nrstout_soc, TPS6594_PINCTRL_NRSTOUT_SOC_FUNCTION), - FUNCTION(trig_wdog, TPS6594_PINCTRL_TRIG_WDOG_FUNCTION), - FUNCTION(sda_i2c2_sdo_spi, TPS6594_PINCTRL_SDA_I2C2_SDO_SPI_FUNCTION), - FUNCTION(clk32kout, TPS6594_PINCTRL_CLK32KOUT_FUNCTION), - FUNCTION(nerr_soc, TPS6594_PINCTRL_NERR_SOC_FUNCTION), - FUNCTION(sclk_spmi, TPS6594_PINCTRL_SCLK_SPMI_FUNCTION), - FUNCTION(sdata_spmi, TPS6594_PINCTRL_SDATA_SPMI_FUNCTION), - FUNCTION(nerr_mcu, TPS6594_PINCTRL_NERR_MCU_FUNCTION), - FUNCTION(syncclkout, TPS6594_PINCTRL_SYNCCLKOUT_FUNCTION), - FUNCTION(disable_wdog, TPS6594_PINCTRL_DISABLE_WDOG_FUNCTION), - FUNCTION(pdog, TPS6594_PINCTRL_PDOG_FUNCTION), - FUNCTION(syncclkin, TPS6594_PINCTRL_SYNCCLKIN_FUNCTION), + FUNCTION(tps6594, gpio, TPS6594_PINCTRL_GPIO_FUNCTION), + FUNCTION(tps6594, nsleep1, TPS6594_PINCTRL_NSLEEP1_FUNCTION), + FUNCTION(tps6594, nsleep2, TPS6594_PINCTRL_NSLEEP2_FUNCTION), + FUNCTION(tps6594, wkup1, TPS6594_PINCTRL_WKUP1_FUNCTION), + FUNCTION(tps6594, wkup2, TPS6594_PINCTRL_WKUP2_FUNCTION), + FUNCTION(tps6594, scl_i2c2_cs_spi, TPS6594_PINCTRL_SCL_I2C2_CS_SPI_FUNCTION), + FUNCTION(tps6594, nrstout_soc, TPS6594_PINCTRL_NRSTOUT_SOC_FUNCTION), + FUNCTION(tps6594, trig_wdog, TPS6594_PINCTRL_TRIG_WDOG_FUNCTION), + FUNCTION(tps6594, sda_i2c2_sdo_spi, TPS6594_PINCTRL_SDA_I2C2_SDO_SPI_FUNCTION), + FUNCTION(tps6594, clk32kout, TPS6594_PINCTRL_CLK32KOUT_FUNCTION), + FUNCTION(tps6594, nerr_soc, TPS6594_PINCTRL_NERR_SOC_FUNCTION), + FUNCTION(tps6594, sclk_spmi, TPS6594_PINCTRL_SCLK_SPMI_FUNCTION), + FUNCTION(tps6594, sdata_spmi, TPS6594_PINCTRL_SDATA_SPMI_FUNCTION), + FUNCTION(tps6594, nerr_mcu, TPS6594_PINCTRL_NERR_MCU_FUNCTION), + FUNCTION(tps6594, syncclkout, TPS6594_PINCTRL_SYNCCLKOUT_FUNCTION), + FUNCTION(tps6594, disable_wdog, TPS6594_PINCTRL_DISABLE_WDOG_FUNCTION), + FUNCTION(tps6594, pdog, TPS6594_PINCTRL_PDOG_FUNCTION), + FUNCTION(tps6594, syncclkin, TPS6594_PINCTRL_SYNCCLKIN_FUNCTION), +}; + +static const struct tps6594_pinctrl_function tps65224_pinctrl_functions[] = { + FUNCTION(tps65224, gpio, TPS6594_PINCTRL_GPIO_FUNCTION), + FUNCTION(tps65224, sda_i2c2_sdo_spi, TPS65224_PINCTRL_SDA_I2C2_SDO_SPI_FUNCTION), + FUNCTION(tps65224, nsleep2, TPS65224_PINCTRL_NSLEEP2_FUNCTION), + FUNCTION(tps65224, nint, TPS65224_PINCTRL_NINT_FUNCTION), + FUNCTION(tps65224, scl_i2c2_cs_spi, TPS65224_PINCTRL_SCL_I2C2_CS_SPI_FUNCTION), + FUNCTION(tps65224, nsleep1, TPS65224_PINCTRL_NSLEEP1_FUNCTION), + FUNCTION(tps65224, trig_wdog, TPS65224_PINCTRL_TRIG_WDOG_FUNCTION), + FUNCTION(tps65224, vmon1, TPS65224_PINCTRL_VMON1_FUNCTION), + FUNCTION(tps65224, pb, TPS65224_PINCTRL_PB_FUNCTION), + FUNCTION(tps65224, vmon2, TPS65224_PINCTRL_VMON2_FUNCTION), + FUNCTION(tps65224, adc_in, TPS65224_PINCTRL_ADC_IN_FUNCTION), + FUNCTION(tps65224, wkup, TPS65224_PINCTRL_WKUP_FUNCTION), + FUNCTION(tps65224, syncclkin, TPS65224_PINCTRL_SYNCCLKIN_FUNCTION), + FUNCTION(tps65224, nerr_mcu, TPS65224_PINCTRL_NERR_MCU_FUNCTION), }; struct tps6594_pinctrl { @@ -175,6 +293,11 @@ struct tps6594_pinctrl { struct pinctrl_dev *pctl_dev; const struct tps6594_pinctrl_function *funcs; const struct pinctrl_pin_desc *pins; + int func_cnt; + int num_pins; + u8 mux_sel_mask; + unsigned int remap_cnt; + struct muxval_remap *remap; }; static int tps6594_gpio_regmap_xlate(struct gpio_regmap *gpio, @@ -201,7 +324,9 @@ static int tps6594_gpio_regmap_xlate(struct gpio_regmap *gpio, static int tps6594_pmx_func_cnt(struct pinctrl_dev *pctldev) { - return ARRAY_SIZE(pinctrl_functions); + struct tps6594_pinctrl *pinctrl = pinctrl_dev_get_drvdata(pctldev); + + return pinctrl->func_cnt; } static const char *tps6594_pmx_func_name(struct pinctrl_dev *pctldev, @@ -229,10 +354,16 @@ static int tps6594_pmx_set(struct tps6594_pinctrl *pinctrl, unsigned int pin, u8 muxval) { u8 mux_sel_val = muxval << TPS6594_OFFSET_GPIO_SEL; + u8 mux_sel_mask = pinctrl->mux_sel_mask; + + if (pinctrl->tps->chip_id == TPS65224 && pin == 5) { + /* GPIO6 has a different mask in TPS65224*/ + mux_sel_mask = TPS65224_MASK_GPIO_SEL_GPIO6; + } return regmap_update_bits(pinctrl->tps->regmap, TPS6594_REG_GPIOX_CONF(pin), - TPS6594_MASK_GPIO_SEL, mux_sel_val); + mux_sel_mask, mux_sel_val); } static int tps6594_pmx_set_mux(struct pinctrl_dev *pctldev, @@ -240,16 +371,14 @@ static int tps6594_pmx_set_mux(struct pinctrl_dev *pctldev, { struct tps6594_pinctrl *pinctrl = pinctrl_dev_get_drvdata(pctldev); u8 muxval = pinctrl->funcs[function].muxval; - - /* Some pins don't have the same muxval for the same function... */ - if (group == 8) { - if (muxval == TPS6594_PINCTRL_DISABLE_WDOG_FUNCTION) - muxval = TPS6594_PINCTRL_DISABLE_WDOG_FUNCTION_GPIO8; - else if (muxval == TPS6594_PINCTRL_SYNCCLKOUT_FUNCTION) - muxval = TPS6594_PINCTRL_SYNCCLKOUT_FUNCTION_GPIO8; - } else if (group == 9) { - if (muxval == TPS6594_PINCTRL_CLK32KOUT_FUNCTION) - muxval = TPS6594_PINCTRL_CLK32KOUT_FUNCTION_GPIO9; + unsigned int remap_cnt = pinctrl->remap_cnt; + struct muxval_remap *remap = pinctrl->remap; + + for (unsigned int i = 0; i < remap_cnt; i++) { + if (group == remap[i].group && muxval == remap[i].muxval) { + muxval = remap[i].remap; + break; + } } return tps6594_pmx_set(pinctrl, group, muxval); @@ -276,7 +405,9 @@ static const struct pinmux_ops tps6594_pmx_ops = { static int tps6594_groups_cnt(struct pinctrl_dev *pctldev) { - return ARRAY_SIZE(tps6594_pins); + struct tps6594_pinctrl *pinctrl = pinctrl_dev_get_drvdata(pctldev); + + return pinctrl->num_pins; } static int tps6594_group_pins(struct pinctrl_dev *pctldev, @@ -320,8 +451,18 @@ static int tps6594_pinctrl_probe(struct platform_device *pdev) return -ENOMEM; pctrl_desc->name = dev_name(dev); pctrl_desc->owner = THIS_MODULE; - pctrl_desc->pins = tps6594_pins; - pctrl_desc->npins = ARRAY_SIZE(tps6594_pins); + switch (tps->chip_id) { + case TPS65224: + pctrl_desc->pins = tps65224_pins; + pctrl_desc->npins = ARRAY_SIZE(tps65224_pins); + break; + case TPS6594: + pctrl_desc->pins = tps6594_pins; + pctrl_desc->npins = ARRAY_SIZE(tps6594_pins); + break; + default: + break; + } pctrl_desc->pctlops = &tps6594_pctrl_ops; pctrl_desc->pmxops = &tps6594_pmx_ops; @@ -329,8 +470,28 @@ static int tps6594_pinctrl_probe(struct platform_device *pdev) if (!pinctrl) return -ENOMEM; pinctrl->tps = dev_get_drvdata(dev->parent); - pinctrl->funcs = pinctrl_functions; - pinctrl->pins = tps6594_pins; + switch (pinctrl->tps->chip_id) { + case TPS65224: + pinctrl->funcs = tps65224_pinctrl_functions; + pinctrl->func_cnt = ARRAY_SIZE(tps65224_pinctrl_functions); + pinctrl->pins = tps65224_pins; + pinctrl->num_pins = ARRAY_SIZE(tps65224_pins); + pinctrl->mux_sel_mask = TPS65224_MASK_GPIO_SEL; + pinctrl->remap = tps65224_muxval_remap; + pinctrl->remap_cnt = ARRAY_SIZE(tps65224_muxval_remap); + break; + case TPS6594: + pinctrl->funcs = pinctrl_functions; + pinctrl->func_cnt = ARRAY_SIZE(pinctrl_functions); + pinctrl->pins = tps6594_pins; + pinctrl->num_pins = ARRAY_SIZE(tps6594_pins); + pinctrl->mux_sel_mask = TPS6594_MASK_GPIO_SEL; + pinctrl->remap = tps6594_muxval_remap; + pinctrl->remap_cnt = ARRAY_SIZE(tps6594_muxval_remap); + break; + default: + break; + } pinctrl->pctl_dev = devm_pinctrl_register(dev, pctrl_desc, pinctrl); if (IS_ERR(pinctrl->pctl_dev)) return dev_err_probe(dev, PTR_ERR(pinctrl->pctl_dev), @@ -338,8 +499,18 @@ static int tps6594_pinctrl_probe(struct platform_device *pdev) config.parent = tps->dev; config.regmap = tps->regmap; - config.ngpio = TPS6594_PINCTRL_PINS_NB; - config.ngpio_per_reg = 8; + switch (pinctrl->tps->chip_id) { + case TPS65224: + config.ngpio = ARRAY_SIZE(tps65224_gpio_func_group_names); + config.ngpio_per_reg = TPS65224_NGPIO_PER_REG; + break; + case TPS6594: + config.ngpio = ARRAY_SIZE(tps6594_gpio_func_group_names); + config.ngpio_per_reg = TPS6594_NGPIO_PER_REG; + break; + default: + break; + } config.reg_dat_base = TPS6594_REG_GPIO_IN_1; config.reg_set_base = TPS6594_REG_GPIO_OUT_1; config.reg_dir_out_base = TPS6594_REG_GPIOX_CONF(0); @@ -369,5 +540,6 @@ static struct platform_driver tps6594_pinctrl_driver = { module_platform_driver(tps6594_pinctrl_driver); MODULE_AUTHOR("Esteban Blanc <eblanc@baylibre.com>"); +MODULE_AUTHOR("Nirmala Devi Mal Nadar <m.nirmaladevi@ltts.com>"); MODULE_DESCRIPTION("TPS6594 pinctrl and GPIO driver"); MODULE_LICENSE("GPL");