tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

pinctrl: pinctrl-tps6594: Add TPS65224 PMIC pinctrl and GPIO

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>
Link: https://lore.kernel.org/r/0109018f2fdce15d-c13bd809-a11b-4202-9b7f-c9380d51b070-000000@ap-south-1.amazonses.com
Signed-off-by: Lee Jones <lee@kernel.org>

authored by

Nirmala Devi Mal Nadar and committed by
Lee Jones 20882971 00c82652

+224 -51
+224 -51
drivers/pinctrl/pinctrl-tps6594.c
··· 14 14 15 15 #include <linux/mfd/tps6594.h> 16 16 17 - #define TPS6594_PINCTRL_PINS_NB 11 18 - 19 17 #define TPS6594_PINCTRL_GPIO_FUNCTION 0 20 18 #define TPS6594_PINCTRL_SCL_I2C2_CS_SPI_FUNCTION 1 21 19 #define TPS6594_PINCTRL_TRIG_WDOG_FUNCTION 1 ··· 38 40 #define TPS6594_PINCTRL_SYNCCLKOUT_FUNCTION_GPIO8 3 39 41 #define TPS6594_PINCTRL_CLK32KOUT_FUNCTION_GPIO9 3 40 42 43 + /* TPS65224 pin muxval */ 44 + #define TPS65224_PINCTRL_SDA_I2C2_SDO_SPI_FUNCTION 1 45 + #define TPS65224_PINCTRL_SCL_I2C2_CS_SPI_FUNCTION 1 46 + #define TPS65224_PINCTRL_VMON1_FUNCTION 1 47 + #define TPS65224_PINCTRL_VMON2_FUNCTION 1 48 + #define TPS65224_PINCTRL_WKUP_FUNCTION 1 49 + #define TPS65224_PINCTRL_NSLEEP2_FUNCTION 2 50 + #define TPS65224_PINCTRL_NSLEEP1_FUNCTION 2 51 + #define TPS65224_PINCTRL_SYNCCLKIN_FUNCTION 2 52 + #define TPS65224_PINCTRL_NERR_MCU_FUNCTION 2 53 + #define TPS65224_PINCTRL_NINT_FUNCTION 3 54 + #define TPS65224_PINCTRL_TRIG_WDOG_FUNCTION 3 55 + #define TPS65224_PINCTRL_PB_FUNCTION 3 56 + #define TPS65224_PINCTRL_ADC_IN_FUNCTION 3 57 + 58 + /* TPS65224 Special muxval for recalcitrant pins */ 59 + #define TPS65224_PINCTRL_NSLEEP2_FUNCTION_GPIO5 1 60 + #define TPS65224_PINCTRL_WKUP_FUNCTION_GPIO5 4 61 + #define TPS65224_PINCTRL_SYNCCLKIN_FUNCTION_GPIO5 3 62 + 41 63 #define TPS6594_OFFSET_GPIO_SEL 5 42 64 43 - #define FUNCTION(fname, v) \ 65 + #define TPS65224_NGPIO_PER_REG 6 66 + #define TPS6594_NGPIO_PER_REG 8 67 + 68 + #define FUNCTION(dev_name, fname, v) \ 44 69 { \ 45 70 .pinfunction = PINCTRL_PINFUNCTION(#fname, \ 46 - tps6594_##fname##_func_group_names, \ 47 - ARRAY_SIZE(tps6594_##fname##_func_group_names)),\ 71 + dev_name##_##fname##_func_group_names, \ 72 + ARRAY_SIZE(dev_name##_##fname##_func_group_names)),\ 48 73 .muxval = v, \ 49 74 } 50 75 51 - static const struct pinctrl_pin_desc tps6594_pins[TPS6594_PINCTRL_PINS_NB] = { 76 + static const struct pinctrl_pin_desc tps6594_pins[] = { 52 77 PINCTRL_PIN(0, "GPIO0"), PINCTRL_PIN(1, "GPIO1"), 53 78 PINCTRL_PIN(2, "GPIO2"), PINCTRL_PIN(3, "GPIO3"), 54 79 PINCTRL_PIN(4, "GPIO4"), PINCTRL_PIN(5, "GPIO5"), ··· 164 143 "GPIO9", 165 144 }; 166 145 146 + static const struct pinctrl_pin_desc tps65224_pins[] = { 147 + PINCTRL_PIN(0, "GPIO0"), PINCTRL_PIN(1, "GPIO1"), 148 + PINCTRL_PIN(2, "GPIO2"), PINCTRL_PIN(3, "GPIO3"), 149 + PINCTRL_PIN(4, "GPIO4"), PINCTRL_PIN(5, "GPIO5"), 150 + }; 151 + 152 + static const char *const tps65224_gpio_func_group_names[] = { 153 + "GPIO0", "GPIO1", "GPIO2", "GPIO3", "GPIO4", "GPIO5", 154 + }; 155 + 156 + static const char *const tps65224_sda_i2c2_sdo_spi_func_group_names[] = { 157 + "GPIO0", 158 + }; 159 + 160 + static const char *const tps65224_nsleep2_func_group_names[] = { 161 + "GPIO0", "GPIO5", 162 + }; 163 + 164 + static const char *const tps65224_nint_func_group_names[] = { 165 + "GPIO0", 166 + }; 167 + 168 + static const char *const tps65224_scl_i2c2_cs_spi_func_group_names[] = { 169 + "GPIO1", 170 + }; 171 + 172 + static const char *const tps65224_nsleep1_func_group_names[] = { 173 + "GPIO1", "GPIO2", "GPIO3", 174 + }; 175 + 176 + static const char *const tps65224_trig_wdog_func_group_names[] = { 177 + "GPIO1", 178 + }; 179 + 180 + static const char *const tps65224_vmon1_func_group_names[] = { 181 + "GPIO2", 182 + }; 183 + 184 + static const char *const tps65224_pb_func_group_names[] = { 185 + "GPIO2", 186 + }; 187 + 188 + static const char *const tps65224_vmon2_func_group_names[] = { 189 + "GPIO3", 190 + }; 191 + 192 + static const char *const tps65224_adc_in_func_group_names[] = { 193 + "GPIO3", "GPIO4", 194 + }; 195 + 196 + static const char *const tps65224_wkup_func_group_names[] = { 197 + "GPIO4", "GPIO5", 198 + }; 199 + 200 + static const char *const tps65224_syncclkin_func_group_names[] = { 201 + "GPIO4", "GPIO5", 202 + }; 203 + 204 + static const char *const tps65224_nerr_mcu_func_group_names[] = { 205 + "GPIO5", 206 + }; 207 + 167 208 struct tps6594_pinctrl_function { 168 209 struct pinfunction pinfunction; 169 210 u8 muxval; 170 211 }; 171 212 213 + struct muxval_remap { 214 + unsigned int group; 215 + u8 muxval; 216 + u8 remap; 217 + }; 218 + 219 + struct muxval_remap tps65224_muxval_remap[] = { 220 + {5, TPS6594_PINCTRL_DISABLE_WDOG_FUNCTION, TPS65224_PINCTRL_WKUP_FUNCTION_GPIO5}, 221 + {5, TPS65224_PINCTRL_SYNCCLKIN_FUNCTION, TPS65224_PINCTRL_SYNCCLKIN_FUNCTION_GPIO5}, 222 + {5, TPS65224_PINCTRL_NSLEEP2_FUNCTION, TPS65224_PINCTRL_NSLEEP2_FUNCTION_GPIO5}, 223 + }; 224 + 225 + struct muxval_remap tps6594_muxval_remap[] = { 226 + {8, TPS6594_PINCTRL_DISABLE_WDOG_FUNCTION, TPS6594_PINCTRL_DISABLE_WDOG_FUNCTION_GPIO8}, 227 + {8, TPS6594_PINCTRL_SYNCCLKOUT_FUNCTION, TPS6594_PINCTRL_SYNCCLKOUT_FUNCTION_GPIO8}, 228 + {9, TPS6594_PINCTRL_CLK32KOUT_FUNCTION, TPS6594_PINCTRL_CLK32KOUT_FUNCTION_GPIO9}, 229 + }; 230 + 172 231 static const struct tps6594_pinctrl_function pinctrl_functions[] = { 173 - FUNCTION(gpio, TPS6594_PINCTRL_GPIO_FUNCTION), 174 - FUNCTION(nsleep1, TPS6594_PINCTRL_NSLEEP1_FUNCTION), 175 - FUNCTION(nsleep2, TPS6594_PINCTRL_NSLEEP2_FUNCTION), 176 - FUNCTION(wkup1, TPS6594_PINCTRL_WKUP1_FUNCTION), 177 - FUNCTION(wkup2, TPS6594_PINCTRL_WKUP2_FUNCTION), 178 - FUNCTION(scl_i2c2_cs_spi, TPS6594_PINCTRL_SCL_I2C2_CS_SPI_FUNCTION), 179 - FUNCTION(nrstout_soc, TPS6594_PINCTRL_NRSTOUT_SOC_FUNCTION), 180 - FUNCTION(trig_wdog, TPS6594_PINCTRL_TRIG_WDOG_FUNCTION), 181 - FUNCTION(sda_i2c2_sdo_spi, TPS6594_PINCTRL_SDA_I2C2_SDO_SPI_FUNCTION), 182 - FUNCTION(clk32kout, TPS6594_PINCTRL_CLK32KOUT_FUNCTION), 183 - FUNCTION(nerr_soc, TPS6594_PINCTRL_NERR_SOC_FUNCTION), 184 - FUNCTION(sclk_spmi, TPS6594_PINCTRL_SCLK_SPMI_FUNCTION), 185 - FUNCTION(sdata_spmi, TPS6594_PINCTRL_SDATA_SPMI_FUNCTION), 186 - FUNCTION(nerr_mcu, TPS6594_PINCTRL_NERR_MCU_FUNCTION), 187 - FUNCTION(syncclkout, TPS6594_PINCTRL_SYNCCLKOUT_FUNCTION), 188 - FUNCTION(disable_wdog, TPS6594_PINCTRL_DISABLE_WDOG_FUNCTION), 189 - FUNCTION(pdog, TPS6594_PINCTRL_PDOG_FUNCTION), 190 - FUNCTION(syncclkin, TPS6594_PINCTRL_SYNCCLKIN_FUNCTION), 232 + FUNCTION(tps6594, gpio, TPS6594_PINCTRL_GPIO_FUNCTION), 233 + FUNCTION(tps6594, nsleep1, TPS6594_PINCTRL_NSLEEP1_FUNCTION), 234 + FUNCTION(tps6594, nsleep2, TPS6594_PINCTRL_NSLEEP2_FUNCTION), 235 + FUNCTION(tps6594, wkup1, TPS6594_PINCTRL_WKUP1_FUNCTION), 236 + FUNCTION(tps6594, wkup2, TPS6594_PINCTRL_WKUP2_FUNCTION), 237 + FUNCTION(tps6594, scl_i2c2_cs_spi, TPS6594_PINCTRL_SCL_I2C2_CS_SPI_FUNCTION), 238 + FUNCTION(tps6594, nrstout_soc, TPS6594_PINCTRL_NRSTOUT_SOC_FUNCTION), 239 + FUNCTION(tps6594, trig_wdog, TPS6594_PINCTRL_TRIG_WDOG_FUNCTION), 240 + FUNCTION(tps6594, sda_i2c2_sdo_spi, TPS6594_PINCTRL_SDA_I2C2_SDO_SPI_FUNCTION), 241 + FUNCTION(tps6594, clk32kout, TPS6594_PINCTRL_CLK32KOUT_FUNCTION), 242 + FUNCTION(tps6594, nerr_soc, TPS6594_PINCTRL_NERR_SOC_FUNCTION), 243 + FUNCTION(tps6594, sclk_spmi, TPS6594_PINCTRL_SCLK_SPMI_FUNCTION), 244 + FUNCTION(tps6594, sdata_spmi, TPS6594_PINCTRL_SDATA_SPMI_FUNCTION), 245 + FUNCTION(tps6594, nerr_mcu, TPS6594_PINCTRL_NERR_MCU_FUNCTION), 246 + FUNCTION(tps6594, syncclkout, TPS6594_PINCTRL_SYNCCLKOUT_FUNCTION), 247 + FUNCTION(tps6594, disable_wdog, TPS6594_PINCTRL_DISABLE_WDOG_FUNCTION), 248 + FUNCTION(tps6594, pdog, TPS6594_PINCTRL_PDOG_FUNCTION), 249 + FUNCTION(tps6594, syncclkin, TPS6594_PINCTRL_SYNCCLKIN_FUNCTION), 250 + }; 251 + 252 + static const struct tps6594_pinctrl_function tps65224_pinctrl_functions[] = { 253 + FUNCTION(tps65224, gpio, TPS6594_PINCTRL_GPIO_FUNCTION), 254 + FUNCTION(tps65224, sda_i2c2_sdo_spi, TPS65224_PINCTRL_SDA_I2C2_SDO_SPI_FUNCTION), 255 + FUNCTION(tps65224, nsleep2, TPS65224_PINCTRL_NSLEEP2_FUNCTION), 256 + FUNCTION(tps65224, nint, TPS65224_PINCTRL_NINT_FUNCTION), 257 + FUNCTION(tps65224, scl_i2c2_cs_spi, TPS65224_PINCTRL_SCL_I2C2_CS_SPI_FUNCTION), 258 + FUNCTION(tps65224, nsleep1, TPS65224_PINCTRL_NSLEEP1_FUNCTION), 259 + FUNCTION(tps65224, trig_wdog, TPS65224_PINCTRL_TRIG_WDOG_FUNCTION), 260 + FUNCTION(tps65224, vmon1, TPS65224_PINCTRL_VMON1_FUNCTION), 261 + FUNCTION(tps65224, pb, TPS65224_PINCTRL_PB_FUNCTION), 262 + FUNCTION(tps65224, vmon2, TPS65224_PINCTRL_VMON2_FUNCTION), 263 + FUNCTION(tps65224, adc_in, TPS65224_PINCTRL_ADC_IN_FUNCTION), 264 + FUNCTION(tps65224, wkup, TPS65224_PINCTRL_WKUP_FUNCTION), 265 + FUNCTION(tps65224, syncclkin, TPS65224_PINCTRL_SYNCCLKIN_FUNCTION), 266 + FUNCTION(tps65224, nerr_mcu, TPS65224_PINCTRL_NERR_MCU_FUNCTION), 191 267 }; 192 268 193 269 struct tps6594_pinctrl { ··· 293 175 struct pinctrl_dev *pctl_dev; 294 176 const struct tps6594_pinctrl_function *funcs; 295 177 const struct pinctrl_pin_desc *pins; 178 + int func_cnt; 179 + int num_pins; 180 + u8 mux_sel_mask; 181 + unsigned int remap_cnt; 182 + struct muxval_remap *remap; 183 + }; 184 + 185 + static struct tps6594_pinctrl tps65224_template_pinctrl = { 186 + .funcs = tps65224_pinctrl_functions, 187 + .func_cnt = ARRAY_SIZE(tps65224_pinctrl_functions), 188 + .pins = tps65224_pins, 189 + .num_pins = ARRAY_SIZE(tps65224_pins), 190 + .mux_sel_mask = TPS65224_MASK_GPIO_SEL, 191 + .remap = tps65224_muxval_remap, 192 + .remap_cnt = ARRAY_SIZE(tps65224_muxval_remap), 193 + }; 194 + 195 + static struct tps6594_pinctrl tps6594_template_pinctrl = { 196 + .funcs = pinctrl_functions, 197 + .func_cnt = ARRAY_SIZE(pinctrl_functions), 198 + .pins = tps6594_pins, 199 + .num_pins = ARRAY_SIZE(tps6594_pins), 200 + .mux_sel_mask = TPS6594_MASK_GPIO_SEL, 201 + .remap = tps6594_muxval_remap, 202 + .remap_cnt = ARRAY_SIZE(tps6594_muxval_remap), 296 203 }; 297 204 298 205 static int tps6594_gpio_regmap_xlate(struct gpio_regmap *gpio, ··· 344 201 345 202 static int tps6594_pmx_func_cnt(struct pinctrl_dev *pctldev) 346 203 { 347 - return ARRAY_SIZE(pinctrl_functions); 204 + struct tps6594_pinctrl *pinctrl = pinctrl_dev_get_drvdata(pctldev); 205 + 206 + return pinctrl->func_cnt; 348 207 } 349 208 350 209 static const char *tps6594_pmx_func_name(struct pinctrl_dev *pctldev, ··· 374 229 u8 muxval) 375 230 { 376 231 u8 mux_sel_val = muxval << TPS6594_OFFSET_GPIO_SEL; 232 + u8 mux_sel_mask = pinctrl->mux_sel_mask; 233 + 234 + if (pinctrl->tps->chip_id == TPS65224 && pin == 5) { 235 + /* GPIO6 has a different mask in TPS65224*/ 236 + mux_sel_mask = TPS65224_MASK_GPIO_SEL_GPIO6; 237 + } 377 238 378 239 return regmap_update_bits(pinctrl->tps->regmap, 379 240 TPS6594_REG_GPIOX_CONF(pin), 380 - TPS6594_MASK_GPIO_SEL, mux_sel_val); 241 + mux_sel_mask, mux_sel_val); 381 242 } 382 243 383 244 static int tps6594_pmx_set_mux(struct pinctrl_dev *pctldev, ··· 391 240 { 392 241 struct tps6594_pinctrl *pinctrl = pinctrl_dev_get_drvdata(pctldev); 393 242 u8 muxval = pinctrl->funcs[function].muxval; 243 + unsigned int remap_cnt = pinctrl->remap_cnt; 244 + struct muxval_remap *remap = pinctrl->remap; 394 245 395 - /* Some pins don't have the same muxval for the same function... */ 396 - if (group == 8) { 397 - if (muxval == TPS6594_PINCTRL_DISABLE_WDOG_FUNCTION) 398 - muxval = TPS6594_PINCTRL_DISABLE_WDOG_FUNCTION_GPIO8; 399 - else if (muxval == TPS6594_PINCTRL_SYNCCLKOUT_FUNCTION) 400 - muxval = TPS6594_PINCTRL_SYNCCLKOUT_FUNCTION_GPIO8; 401 - } else if (group == 9) { 402 - if (muxval == TPS6594_PINCTRL_CLK32KOUT_FUNCTION) 403 - muxval = TPS6594_PINCTRL_CLK32KOUT_FUNCTION_GPIO9; 246 + for (unsigned int i = 0; i < remap_cnt; i++) { 247 + if (group == remap[i].group && muxval == remap[i].muxval) { 248 + muxval = remap[i].remap; 249 + break; 250 + } 404 251 } 405 252 406 253 return tps6594_pmx_set(pinctrl, group, muxval); ··· 425 276 426 277 static int tps6594_groups_cnt(struct pinctrl_dev *pctldev) 427 278 { 428 - return ARRAY_SIZE(tps6594_pins); 279 + struct tps6594_pinctrl *pinctrl = pinctrl_dev_get_drvdata(pctldev); 280 + 281 + return pinctrl->num_pins; 429 282 } 430 283 431 284 static int tps6594_group_pins(struct pinctrl_dev *pctldev, ··· 469 318 pctrl_desc = devm_kzalloc(dev, sizeof(*pctrl_desc), GFP_KERNEL); 470 319 if (!pctrl_desc) 471 320 return -ENOMEM; 472 - pctrl_desc->name = dev_name(dev); 473 - pctrl_desc->owner = THIS_MODULE; 474 - pctrl_desc->pins = tps6594_pins; 475 - pctrl_desc->npins = ARRAY_SIZE(tps6594_pins); 476 - pctrl_desc->pctlops = &tps6594_pctrl_ops; 477 - pctrl_desc->pmxops = &tps6594_pmx_ops; 478 321 479 322 pinctrl = devm_kzalloc(dev, sizeof(*pinctrl), GFP_KERNEL); 480 323 if (!pinctrl) 481 324 return -ENOMEM; 482 - pinctrl->tps = dev_get_drvdata(dev->parent); 483 - pinctrl->funcs = pinctrl_functions; 484 - pinctrl->pins = tps6594_pins; 485 - pinctrl->pctl_dev = devm_pinctrl_register(dev, pctrl_desc, pinctrl); 486 - if (IS_ERR(pinctrl->pctl_dev)) 487 - return dev_err_probe(dev, PTR_ERR(pinctrl->pctl_dev), 488 - "Couldn't register pinctrl driver\n"); 325 + 326 + switch (tps->chip_id) { 327 + case TPS65224: 328 + pctrl_desc->pins = tps65224_pins; 329 + pctrl_desc->npins = ARRAY_SIZE(tps65224_pins); 330 + 331 + *pinctrl = tps65224_template_pinctrl; 332 + 333 + config.ngpio = ARRAY_SIZE(tps65224_gpio_func_group_names); 334 + config.ngpio_per_reg = TPS65224_NGPIO_PER_REG; 335 + break; 336 + case TPS6593: 337 + case TPS6594: 338 + pctrl_desc->pins = tps6594_pins; 339 + pctrl_desc->npins = ARRAY_SIZE(tps6594_pins); 340 + 341 + *pinctrl = tps6594_template_pinctrl; 342 + 343 + config.ngpio = ARRAY_SIZE(tps6594_gpio_func_group_names); 344 + config.ngpio_per_reg = TPS6594_NGPIO_PER_REG; 345 + break; 346 + default: 347 + break; 348 + } 349 + 350 + pinctrl->tps = tps; 351 + 352 + pctrl_desc->name = dev_name(dev); 353 + pctrl_desc->owner = THIS_MODULE; 354 + pctrl_desc->pctlops = &tps6594_pctrl_ops; 355 + pctrl_desc->pmxops = &tps6594_pmx_ops; 489 356 490 357 config.parent = tps->dev; 491 358 config.regmap = tps->regmap; 492 - config.ngpio = TPS6594_PINCTRL_PINS_NB; 493 - config.ngpio_per_reg = 8; 494 359 config.reg_dat_base = TPS6594_REG_GPIO_IN_1; 495 360 config.reg_set_base = TPS6594_REG_GPIO_OUT_1; 496 361 config.reg_dir_out_base = TPS6594_REG_GPIOX_CONF(0); 497 362 config.reg_mask_xlate = tps6594_gpio_regmap_xlate; 363 + 364 + pinctrl->pctl_dev = devm_pinctrl_register(dev, pctrl_desc, pinctrl); 365 + if (IS_ERR(pinctrl->pctl_dev)) 366 + return dev_err_probe(dev, PTR_ERR(pinctrl->pctl_dev), 367 + "Couldn't register pinctrl driver\n"); 498 368 499 369 pinctrl->gpio_regmap = devm_gpio_regmap_register(dev, &config); 500 370 if (IS_ERR(pinctrl->gpio_regmap)) ··· 541 369 module_platform_driver(tps6594_pinctrl_driver); 542 370 543 371 MODULE_AUTHOR("Esteban Blanc <eblanc@baylibre.com>"); 372 + MODULE_AUTHOR("Nirmala Devi Mal Nadar <m.nirmaladevi@ltts.com>"); 544 373 MODULE_DESCRIPTION("TPS6594 pinctrl and GPIO driver"); 545 374 MODULE_LICENSE("GPL");