Skip to content

Commit 626bb0a

Browse files
mwallelag-linaro
mwalle
authored and
lag-linaro
committed
mfd: tps6594: Add TI TPS652G1 support
The TPS652G1 is a stripped down version of the TPS65224. From a software point of view, it lacks any voltage monitoring, the watchdog, the ESM and the ADC. Signed-off-by: Michael Walle <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Lee Jones <[email protected]>
1 parent 19272b3 commit 626bb0a

File tree

4 files changed

+99
-10
lines changed

4 files changed

+99
-10
lines changed

‎drivers/mfd/tps6594-core.c‎

Lines changed: 82 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* Core functions for TI TPS65224/TPS6594/TPS6593/LP8764 PMICs
3+
* Core functions for following TI PMICs:
4+
* - LP8764
5+
* - TPS65224
6+
* - TPS652G1
7+
* - TPS6593
8+
* - TPS6594
49
*
510
* Copyright (C) 2023 BayLibre Incorporated - https://www.baylibre.com/
611
*/
@@ -414,6 +419,61 @@ static const unsigned int tps65224_irq_reg[] = {
414419
TPS6594_REG_INT_FSM_ERR,
415420
};
416421

422+
/* TPS652G1 Resources */
423+
424+
static const struct mfd_cell tps652g1_common_cells[] = {
425+
MFD_CELL_RES("tps6594-pfsm", tps65224_pfsm_resources),
426+
MFD_CELL_RES("tps6594-pinctrl", tps65224_pinctrl_resources),
427+
MFD_CELL_NAME("tps6594-regulator"),
428+
};
429+
430+
static const struct regmap_irq tps652g1_irqs[] = {
431+
/* INT_GPIO register */
432+
REGMAP_IRQ_REG(TPS65224_IRQ_GPIO1, 2, TPS65224_BIT_GPIO1_INT),
433+
REGMAP_IRQ_REG(TPS65224_IRQ_GPIO2, 2, TPS65224_BIT_GPIO2_INT),
434+
REGMAP_IRQ_REG(TPS65224_IRQ_GPIO3, 2, TPS65224_BIT_GPIO3_INT),
435+
REGMAP_IRQ_REG(TPS65224_IRQ_GPIO4, 2, TPS65224_BIT_GPIO4_INT),
436+
REGMAP_IRQ_REG(TPS65224_IRQ_GPIO5, 2, TPS65224_BIT_GPIO5_INT),
437+
REGMAP_IRQ_REG(TPS65224_IRQ_GPIO6, 2, TPS65224_BIT_GPIO6_INT),
438+
439+
/* INT_STARTUP register */
440+
REGMAP_IRQ_REG(TPS65224_IRQ_VSENSE, 3, TPS65224_BIT_VSENSE_INT),
441+
REGMAP_IRQ_REG(TPS65224_IRQ_ENABLE, 3, TPS6594_BIT_ENABLE_INT),
442+
REGMAP_IRQ_REG(TPS65224_IRQ_PB_SHORT, 3, TPS65224_BIT_PB_SHORT_INT),
443+
REGMAP_IRQ_REG(TPS65224_IRQ_FSD, 3, TPS6594_BIT_FSD_INT),
444+
REGMAP_IRQ_REG(TPS65224_IRQ_SOFT_REBOOT, 3, TPS6594_BIT_SOFT_REBOOT_INT),
445+
446+
/* INT_MISC register */
447+
REGMAP_IRQ_REG(TPS65224_IRQ_BIST_PASS, 4, TPS6594_BIT_BIST_PASS_INT),
448+
REGMAP_IRQ_REG(TPS65224_IRQ_EXT_CLK, 4, TPS6594_BIT_EXT_CLK_INT),
449+
REGMAP_IRQ_REG(TPS65224_IRQ_REG_UNLOCK, 4, TPS65224_BIT_REG_UNLOCK_INT),
450+
REGMAP_IRQ_REG(TPS65224_IRQ_TWARN, 4, TPS6594_BIT_TWARN_INT),
451+
REGMAP_IRQ_REG(TPS65224_IRQ_PB_LONG, 4, TPS65224_BIT_PB_LONG_INT),
452+
REGMAP_IRQ_REG(TPS65224_IRQ_PB_FALL, 4, TPS65224_BIT_PB_FALL_INT),
453+
REGMAP_IRQ_REG(TPS65224_IRQ_PB_RISE, 4, TPS65224_BIT_PB_RISE_INT),
454+
REGMAP_IRQ_REG(TPS65224_IRQ_ADC_CONV_READY, 4, TPS65224_BIT_ADC_CONV_READY_INT),
455+
456+
/* INT_MODERATE_ERR register */
457+
REGMAP_IRQ_REG(TPS65224_IRQ_TSD_ORD, 5, TPS6594_BIT_TSD_ORD_INT),
458+
REGMAP_IRQ_REG(TPS65224_IRQ_BIST_FAIL, 5, TPS6594_BIT_BIST_FAIL_INT),
459+
REGMAP_IRQ_REG(TPS65224_IRQ_REG_CRC_ERR, 5, TPS6594_BIT_REG_CRC_ERR_INT),
460+
REGMAP_IRQ_REG(TPS65224_IRQ_RECOV_CNT, 5, TPS6594_BIT_RECOV_CNT_INT),
461+
462+
/* INT_SEVERE_ERR register */
463+
REGMAP_IRQ_REG(TPS65224_IRQ_TSD_IMM, 6, TPS6594_BIT_TSD_IMM_INT),
464+
REGMAP_IRQ_REG(TPS65224_IRQ_VCCA_OVP, 6, TPS6594_BIT_VCCA_OVP_INT),
465+
REGMAP_IRQ_REG(TPS65224_IRQ_PFSM_ERR, 6, TPS6594_BIT_PFSM_ERR_INT),
466+
REGMAP_IRQ_REG(TPS65224_IRQ_BG_XMON, 6, TPS65224_BIT_BG_XMON_INT),
467+
468+
/* INT_FSM_ERR register */
469+
REGMAP_IRQ_REG(TPS65224_IRQ_IMM_SHUTDOWN, 7, TPS6594_BIT_IMM_SHUTDOWN_INT),
470+
REGMAP_IRQ_REG(TPS65224_IRQ_ORD_SHUTDOWN, 7, TPS6594_BIT_ORD_SHUTDOWN_INT),
471+
REGMAP_IRQ_REG(TPS65224_IRQ_MCU_PWR_ERR, 7, TPS6594_BIT_MCU_PWR_ERR_INT),
472+
REGMAP_IRQ_REG(TPS65224_IRQ_SOC_PWR_ERR, 7, TPS6594_BIT_SOC_PWR_ERR_INT),
473+
REGMAP_IRQ_REG(TPS65224_IRQ_COMM_ERR, 7, TPS6594_BIT_COMM_ERR_INT),
474+
REGMAP_IRQ_REG(TPS65224_IRQ_I2C2_ERR, 7, TPS65224_BIT_I2C2_ERR_INT),
475+
};
476+
417477
static inline unsigned int tps6594_get_irq_reg(struct regmap_irq_chip_data *data,
418478
unsigned int base, int index)
419479
{
@@ -443,7 +503,7 @@ static int tps6594_handle_post_irq(void *irq_drv_data)
443503
* a new interrupt.
444504
*/
445505
if (tps->use_crc) {
446-
if (tps->chip_id == TPS65224) {
506+
if (tps->chip_id == TPS65224 || tps->chip_id == TPS652G1) {
447507
regmap_reg = TPS6594_REG_INT_FSM_ERR;
448508
mask_val = TPS6594_BIT_COMM_ERR_INT;
449509
} else {
@@ -481,6 +541,18 @@ static struct regmap_irq_chip tps65224_irq_chip = {
481541
.handle_post_irq = tps6594_handle_post_irq,
482542
};
483543

544+
static struct regmap_irq_chip tps652g1_irq_chip = {
545+
.ack_base = TPS6594_REG_INT_BUCK,
546+
.ack_invert = 1,
547+
.clear_ack = 1,
548+
.init_ack_masked = 1,
549+
.num_regs = ARRAY_SIZE(tps65224_irq_reg),
550+
.irqs = tps652g1_irqs,
551+
.num_irqs = ARRAY_SIZE(tps652g1_irqs),
552+
.get_irq_reg = tps65224_get_irq_reg,
553+
.handle_post_irq = tps6594_handle_post_irq,
554+
};
555+
484556
static const struct regmap_range tps6594_volatile_ranges[] = {
485557
regmap_reg_range(TPS6594_REG_INT_TOP, TPS6594_REG_STAT_READBACK_ERR),
486558
regmap_reg_range(TPS6594_REG_RTC_STATUS, TPS6594_REG_RTC_STATUS),
@@ -507,7 +579,7 @@ static int tps6594_check_crc_mode(struct tps6594 *tps, bool primary_pmic)
507579
int ret;
508580
unsigned int regmap_reg, mask_val;
509581

510-
if (tps->chip_id == TPS65224) {
582+
if (tps->chip_id == TPS65224 || tps->chip_id == TPS652G1) {
511583
regmap_reg = TPS6594_REG_CONFIG_2;
512584
mask_val = TPS65224_BIT_I2C1_SPI_CRC_EN;
513585
} else {
@@ -537,7 +609,7 @@ static int tps6594_set_crc_feature(struct tps6594 *tps)
537609
int ret;
538610
unsigned int regmap_reg, mask_val;
539611

540-
if (tps->chip_id == TPS65224) {
612+
if (tps->chip_id == TPS65224 || tps->chip_id == TPS652G1) {
541613
regmap_reg = TPS6594_REG_CONFIG_2;
542614
mask_val = TPS65224_BIT_I2C1_SPI_CRC_EN;
543615
} else {
@@ -628,6 +700,10 @@ int tps6594_device_init(struct tps6594 *tps, bool enable_crc)
628700
irq_chip = &tps65224_irq_chip;
629701
n_cells = ARRAY_SIZE(tps65224_common_cells);
630702
cells = tps65224_common_cells;
703+
} else if (tps->chip_id == TPS652G1) {
704+
irq_chip = &tps652g1_irq_chip;
705+
n_cells = ARRAY_SIZE(tps652g1_common_cells);
706+
cells = tps652g1_common_cells;
631707
} else {
632708
irq_chip = &tps6594_irq_chip;
633709
n_cells = ARRAY_SIZE(tps6594_common_cells);
@@ -651,8 +727,8 @@ int tps6594_device_init(struct tps6594 *tps, bool enable_crc)
651727
if (ret)
652728
return dev_err_probe(dev, ret, "Failed to add common child devices\n");
653729

654-
/* No RTC for LP8764 and TPS65224 */
655-
if (tps->chip_id != LP8764 && tps->chip_id != TPS65224) {
730+
/* No RTC for LP8764, TPS65224 and TPS652G1 */
731+
if (tps->chip_id != LP8764 && tps->chip_id != TPS65224 && tps->chip_id != TPS652G1) {
656732
ret = devm_mfd_add_devices(dev, PLATFORM_DEVID_AUTO, tps6594_rtc_cells,
657733
ARRAY_SIZE(tps6594_rtc_cells), NULL, 0,
658734
regmap_irq_get_domain(tps->irq_data));

‎drivers/mfd/tps6594-i2c.c‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* I2C access driver for TI TPS65224/TPS6594/TPS6593/LP8764 PMICs
3+
* I2C access driver for the following TI PMICs:
4+
* - LP8764
5+
* - TPS65224
6+
* - TPS652G1
7+
* - TPS6593
8+
* - TPS6594
49
*
510
* Copyright (C) 2023 BayLibre Incorporated - https://www.baylibre.com/
611
*/
@@ -197,6 +202,7 @@ static const struct of_device_id tps6594_i2c_of_match_table[] = {
197202
{ .compatible = "ti,tps6593-q1", .data = (void *)TPS6593, },
198203
{ .compatible = "ti,lp8764-q1", .data = (void *)LP8764, },
199204
{ .compatible = "ti,tps65224-q1", .data = (void *)TPS65224, },
205+
{ .compatible = "ti,tps652g1", .data = (void *)TPS652G1, },
200206
{}
201207
};
202208
MODULE_DEVICE_TABLE(of, tps6594_i2c_of_match_table);
@@ -222,7 +228,7 @@ static int tps6594_i2c_probe(struct i2c_client *client)
222228
return dev_err_probe(dev, -EINVAL, "Failed to find matching chip ID\n");
223229
tps->chip_id = (unsigned long)match->data;
224230

225-
if (tps->chip_id == TPS65224)
231+
if (tps->chip_id == TPS65224 || tps->chip_id == TPS652G1)
226232
tps6594_i2c_regmap_config.volatile_table = &tps65224_volatile_table;
227233

228234
tps->regmap = devm_regmap_init(dev, NULL, client, &tps6594_i2c_regmap_config);

‎drivers/mfd/tps6594-spi.c‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
// SPDX-License-Identifier: GPL-2.0
22
/*
3-
* SPI access driver for TI TPS65224/TPS6594/TPS6593/LP8764 PMICs
3+
* SPI access driver for the following TI PMICs:
4+
* - LP8764
5+
* - TPS65224
6+
* - TPS652G1
7+
* - TPS6593
8+
* - TPS6594
49
*
510
* Copyright (C) 2023 BayLibre Incorporated - https://www.baylibre.com/
611
*/
@@ -82,6 +87,7 @@ static const struct of_device_id tps6594_spi_of_match_table[] = {
8287
{ .compatible = "ti,tps6593-q1", .data = (void *)TPS6593, },
8388
{ .compatible = "ti,lp8764-q1", .data = (void *)LP8764, },
8489
{ .compatible = "ti,tps65224-q1", .data = (void *)TPS65224, },
90+
{ .compatible = "ti,tps652g1", .data = (void *)TPS652G1, },
8591
{}
8692
};
8793
MODULE_DEVICE_TABLE(of, tps6594_spi_of_match_table);
@@ -107,7 +113,7 @@ static int tps6594_spi_probe(struct spi_device *spi)
107113
return dev_err_probe(dev, -EINVAL, "Failed to find matching chip ID\n");
108114
tps->chip_id = (unsigned long)match->data;
109115

110-
if (tps->chip_id == TPS65224)
116+
if (tps->chip_id == TPS65224 || tps->chip_id == TPS652G1)
111117
tps6594_spi_regmap_config.volatile_table = &tps65224_volatile_table;
112118

113119
tps->regmap = devm_regmap_init(dev, NULL, spi, &tps6594_spi_regmap_config);

‎include/linux/mfd/tps6594.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ enum pmic_id {
1919
TPS6593,
2020
LP8764,
2121
TPS65224,
22+
TPS652G1,
2223
};
2324

2425
/* Macro to get page index from register address */

0 commit comments

Comments
 (0)