Hi, On 1/4/2025 12:10 PM, Roger Quadros wrote: > > On 04/01/2025 00:57, Shree Ramamoorthy wrote: >> Use chip ID and chip_data struct to differentiate between devices in >> probe(). Add TPS65215 resource information. Update descriptions and >> copyright information to reflect the driver supports 2 PMIC devices. >> >> Signed-off-by: Shree Ramamoorthy <s-ramamoorthy@xxxxxx> >> --- >> drivers/mfd/tps65219.c | 157 +++++++++++++++++++++++++++++++++-- >> include/linux/mfd/tps65219.h | 70 +++++++++++++++- >> 2 files changed, 214 insertions(+), 13 deletions(-) >> >> diff --git a/drivers/mfd/tps65219.c b/drivers/mfd/tps65219.c >> index 081c5a30b04a..816b271990a2 100644 >> --- a/drivers/mfd/tps65219.c >> +++ b/drivers/mfd/tps65219.c >> @@ -1,8 +1,9 @@ >> // SPDX-License-Identifier: GPL-2.0 >> // >> -// Driver for TPS65219 Integrated Power Management Integrated Chips (PMIC) >> +// Driver for TPS65215/TPS65219 Integrated Power Management Integrated Chips (PMIC) >> // >> // Copyright (C) 2022 BayLibre Incorporated - https://www.baylibre.com/ >> +// Copyright (C) 2024 Texas Instruments Incorporated - https://www.ti.com/ >> >> #include <linux/i2c.h> >> #include <linux/reboot.h> >> @@ -59,6 +60,46 @@ static const struct resource tps65219_pwrbutton_resources[] = { >> DEFINE_RES_IRQ_NAMED(TPS65219_INT_PB_RISING_EDGE_DETECT, "rising"), >> }; >> >> +static const struct resource tps65215_regulator_resources[] = { >> + DEFINE_RES_IRQ_NAMED(TPS65215_INT_LDO1_SCG, "LDO1_SCG"), >> + DEFINE_RES_IRQ_NAMED(TPS65215_INT_LDO1_OC, "LDO1_OC"), >> + DEFINE_RES_IRQ_NAMED(TPS65215_INT_LDO1_UV, "LDO1_UV"), >> + DEFINE_RES_IRQ_NAMED(TPS65215_INT_LDO2_SCG, "LDO2_SCG"), >> + DEFINE_RES_IRQ_NAMED(TPS65215_INT_LDO2_OC, "LDO2_OC"), >> + DEFINE_RES_IRQ_NAMED(TPS65215_INT_LDO2_UV, "LDO2_UV"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_BUCK3_SCG, "BUCK3_SCG"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_BUCK3_OC, "BUCK3_OC"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_BUCK3_NEG_OC, "BUCK3_NEG_OC"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_BUCK3_UV, "BUCK3_UV"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_BUCK1_SCG, "BUCK1_SCG"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_BUCK1_OC, "BUCK1_OC"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_BUCK1_NEG_OC, "BUCK1_NEG_OC"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_BUCK1_UV, "BUCK1_UV"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_BUCK2_SCG, "BUCK2_SCG"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_BUCK2_OC, "BUCK2_OC"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_BUCK2_NEG_OC, "BUCK2_NEG_OC"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_BUCK2_UV, "BUCK2_UV"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_BUCK1_RV, "BUCK1_RV"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_BUCK2_RV, "BUCK2_RV"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_BUCK3_RV, "BUCK3_RV"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_LDO1_RV, "LDO1_RV"), >> + DEFINE_RES_IRQ_NAMED(TPS65215_INT_LDO2_RV, "LDO2_RV"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_BUCK1_RV_SD, "BUCK1_RV_SD"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_BUCK2_RV_SD, "BUCK2_RV_SD"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_BUCK3_RV_SD, "BUCK3_RV_SD"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_LDO1_RV_SD, "LDO1_RV_SD"), >> + DEFINE_RES_IRQ_NAMED(TPS65215_INT_LDO2_RV_SD, "LDO2_RV_SD"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_TIMEOUT, "TIMEOUT"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_SENSOR_3_WARM, "SENSOR_3_WARM"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_SENSOR_2_WARM, "SENSOR_2_WARM"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_SENSOR_1_WARM, "SENSOR_1_WARM"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_SENSOR_0_WARM, "SENSOR_0_WARM"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_SENSOR_3_HOT, "SENSOR_3_HOT"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_SENSOR_2_HOT, "SENSOR_2_HOT"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_SENSOR_1_HOT, "SENSOR_1_HOT"), >> + DEFINE_RES_IRQ_NAMED(TPS65219_INT_SENSOR_0_HOT, "SENSOR_0_HOT"), >> +}; >> + >> static const struct resource tps65219_regulator_resources[] = { >> DEFINE_RES_IRQ_NAMED(TPS65219_INT_LDO3_SCG, "LDO3_SCG"), >> DEFINE_RES_IRQ_NAMED(TPS65219_INT_LDO3_OC, "LDO3_OC"), >> @@ -109,6 +150,11 @@ static const struct resource tps65219_regulator_resources[] = { >> DEFINE_RES_IRQ_NAMED(TPS65219_INT_SENSOR_0_HOT, "SENSOR_0_HOT"), >> }; >> >> +static const struct mfd_cell tps65215_cells[] = { >> + MFD_CELL_RES("tps65215-regulator", tps65215_regulator_resources), >> + MFD_CELL_NAME("tps65215-gpio"), >> +}; >> + >> static const struct mfd_cell tps65219_cells[] = { >> MFD_CELL_RES("tps65219-regulator", tps65219_regulator_resources), >> MFD_CELL_NAME("tps65219-gpio"), >> @@ -136,9 +182,11 @@ static unsigned int bit3_offsets[] = { TPS65219_REG_INT_BUCK_1_2_POS }; /* Buck >> static unsigned int bit4_offsets[] = { TPS65219_REG_INT_BUCK_3_POS }; /* Buck 3 */ >> static unsigned int bit5_offsets[] = { TPS65219_REG_INT_LDO_1_2_POS }; /* LDO 1-2 */ >> static unsigned int bit6_offsets[] = { TPS65219_REG_INT_LDO_3_4_POS }; /* LDO 3-4 */ >> +static unsigned int tps65215_bit5_offsets[] = { TPS65215_REG_INT_LDO_1_POS }; >> +static unsigned int tps65215_bit6_offsets[] = { TPS65215_REG_INT_LDO_2_POS }; >> static unsigned int bit7_offsets[] = { TPS65219_REG_INT_PB_POS }; /* Power Button */ >> >> -static struct regmap_irq_sub_irq_map tps65219_sub_irq_offsets[] = { >> +static const struct regmap_irq_sub_irq_map tps65219_sub_irq_offsets[] = { >> REGMAP_IRQ_MAIN_REG_OFFSET(bit0_offsets), >> REGMAP_IRQ_MAIN_REG_OFFSET(bit1_offsets), >> REGMAP_IRQ_MAIN_REG_OFFSET(bit2_offsets), >> @@ -149,9 +197,62 @@ static struct regmap_irq_sub_irq_map tps65219_sub_irq_offsets[] = { >> REGMAP_IRQ_MAIN_REG_OFFSET(bit7_offsets), >> }; >> >> +static const struct regmap_irq_sub_irq_map tps65215_sub_irq_offsets[] = { >> + REGMAP_IRQ_MAIN_REG_OFFSET(bit0_offsets), >> + REGMAP_IRQ_MAIN_REG_OFFSET(bit1_offsets), >> + REGMAP_IRQ_MAIN_REG_OFFSET(bit2_offsets), >> + REGMAP_IRQ_MAIN_REG_OFFSET(bit3_offsets), >> + REGMAP_IRQ_MAIN_REG_OFFSET(bit4_offsets), >> + REGMAP_IRQ_MAIN_REG_OFFSET(tps65215_bit5_offsets), >> + REGMAP_IRQ_MAIN_REG_OFFSET(tps65215_bit6_offsets), >> + REGMAP_IRQ_MAIN_REG_OFFSET(bit7_offsets), >> +}; >> + >> #define TPS65219_REGMAP_IRQ_REG(int_name, register_position) \ >> REGMAP_IRQ_REG(int_name, register_position, int_name##_MASK) >> >> +static const struct regmap_irq tps65215_irqs[] = { >> + TPS65219_REGMAP_IRQ_REG(TPS65215_INT_LDO1_SCG, TPS65215_REG_INT_LDO_1_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65215_INT_LDO1_OC, TPS65215_REG_INT_LDO_1_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65215_INT_LDO1_UV, TPS65215_REG_INT_LDO_1_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65215_INT_LDO2_SCG, TPS65215_REG_INT_LDO_2_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65215_INT_LDO2_OC, TPS65215_REG_INT_LDO_2_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65215_INT_LDO2_UV, TPS65215_REG_INT_LDO_2_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_BUCK3_SCG, TPS65219_REG_INT_BUCK_3_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_BUCK3_OC, TPS65219_REG_INT_BUCK_3_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_BUCK3_NEG_OC, TPS65219_REG_INT_BUCK_3_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_BUCK3_UV, TPS65219_REG_INT_BUCK_3_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_BUCK2_SCG, TPS65219_REG_INT_BUCK_1_2_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_BUCK2_OC, TPS65219_REG_INT_BUCK_1_2_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_BUCK2_NEG_OC, TPS65219_REG_INT_BUCK_1_2_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_BUCK2_UV, TPS65219_REG_INT_BUCK_1_2_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_BUCK1_SCG, TPS65219_REG_INT_BUCK_1_2_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_BUCK1_OC, TPS65219_REG_INT_BUCK_1_2_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_BUCK1_NEG_OC, TPS65219_REG_INT_BUCK_1_2_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_BUCK1_UV, TPS65219_REG_INT_BUCK_1_2_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_SENSOR_3_WARM, TPS65219_REG_INT_SYS_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_SENSOR_2_WARM, TPS65219_REG_INT_SYS_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_SENSOR_1_WARM, TPS65219_REG_INT_SYS_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_SENSOR_0_WARM, TPS65219_REG_INT_SYS_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_SENSOR_3_HOT, TPS65219_REG_INT_SYS_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_SENSOR_2_HOT, TPS65219_REG_INT_SYS_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_SENSOR_1_HOT, TPS65219_REG_INT_SYS_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_SENSOR_0_HOT, TPS65219_REG_INT_SYS_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_BUCK1_RV, TPS65219_REG_INT_RV_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_BUCK2_RV, TPS65219_REG_INT_RV_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_BUCK3_RV, TPS65219_REG_INT_RV_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_LDO1_RV, TPS65219_REG_INT_RV_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65215_INT_LDO2_RV, TPS65219_REG_INT_RV_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_BUCK1_RV_SD, TPS65219_REG_INT_TO_RV_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_BUCK2_RV_SD, TPS65219_REG_INT_TO_RV_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_BUCK3_RV_SD, TPS65219_REG_INT_TO_RV_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_LDO1_RV_SD, TPS65219_REG_INT_TO_RV_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65215_INT_LDO2_RV_SD, TPS65219_REG_INT_TO_RV_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_TIMEOUT, TPS65219_REG_INT_TO_RV_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_PB_FALLING_EDGE_DETECT, TPS65219_REG_INT_PB_POS), >> + TPS65219_REGMAP_IRQ_REG(TPS65219_INT_PB_RISING_EDGE_DETECT, TPS65219_REG_INT_PB_POS), >> +}; >> + >> static const struct regmap_irq tps65219_irqs[] = { >> TPS65219_REGMAP_IRQ_REG(TPS65219_INT_LDO3_SCG, TPS65219_REG_INT_LDO_3_4_POS), >> TPS65219_REGMAP_IRQ_REG(TPS65219_INT_LDO3_OC, TPS65219_REG_INT_LDO_3_4_POS), >> @@ -204,6 +305,20 @@ static const struct regmap_irq tps65219_irqs[] = { >> TPS65219_REGMAP_IRQ_REG(TPS65219_INT_PB_RISING_EDGE_DETECT, TPS65219_REG_INT_PB_POS), >> }; >> >> +static const struct regmap_irq_chip tps65215_irq_chip = { >> + .name = "tps65215_irq", >> + .main_status = TPS65219_REG_INT_SOURCE, >> + .num_main_regs = 1, >> + .num_main_status_bits = 8, >> + .irqs = tps65215_irqs, >> + .num_irqs = ARRAY_SIZE(tps65215_irqs), >> + .status_base = TPS65215_REG_INT_LDO_2, >> + .ack_base = TPS65215_REG_INT_LDO_2, >> + .clear_ack = 1, >> + .num_regs = 8, >> + .sub_reg_offsets = tps65215_sub_irq_offsets, >> +}; >> + >> static const struct regmap_irq_chip tps65219_irq_chip = { >> .name = "tps65219_irq", >> .main_status = TPS65219_REG_INT_SOURCE, >> @@ -218,10 +333,29 @@ static const struct regmap_irq_chip tps65219_irq_chip = { >> .sub_reg_offsets = tps65219_sub_irq_offsets, >> }; >> >> +struct tps65219_chip_data { >> + const struct regmap_irq_chip *irq_chip; >> + const struct mfd_cell *cells; >> + int n_cells; >> +}; >> + >> +static struct tps65219_chip_data chip_info_table[] = { >> + [TPS65215] = { >> + .irq_chip = &tps65215_irq_chip, >> + .cells = tps65215_cells, >> + .n_cells = ARRAY_SIZE(tps65215_cells), >> + }, >> + [TPS65219] = { >> + .irq_chip = &tps65219_irq_chip, >> + .cells = tps65219_cells, >> + .n_cells = ARRAY_SIZE(tps65219_cells), >> + }, >> +}; >> + >> static int tps65219_probe(struct i2c_client *client) >> { >> struct tps65219 *tps; >> - unsigned int chipid; >> + struct tps65219_chip_data *pmic; >> bool pwr_button; >> int ret; >> >> @@ -232,6 +366,8 @@ static int tps65219_probe(struct i2c_client *client) >> i2c_set_clientdata(client, tps); >> >> tps->dev = &client->dev; >> + tps->chip_id = (uintptr_t)i2c_get_match_data(client); > This alread sets chip_id into tps->chip_id. > >> + pmic = &chip_info_table[tps->chip_id]; >> >> tps->regmap = devm_regmap_init_i2c(client, &tps65219_regmap_config); >> if (IS_ERR(tps->regmap)) { >> @@ -240,20 +376,20 @@ static int tps65219_probe(struct i2c_client *client) >> return ret; >> } >> >> - ret = devm_regmap_add_irq_chip(&client->dev, tps->regmap, client->irq, >> - IRQF_ONESHOT, 0, &tps65219_irq_chip, >> + ret = devm_regmap_add_irq_chip(tps->dev, tps->regmap, client->irq, >> + IRQF_ONESHOT, 0, pmic->irq_chip, >> &tps->irq_data); >> if (ret) >> return ret; >> >> - ret = regmap_read(tps->regmap, TPS65219_REG_TI_DEV_ID, &chipid); >> + ret = regmap_read(tps->regmap, TPS65219_REG_TI_DEV_ID, &tps->chip_id); > What's the purpose of overriding tps->chip_id here? > > Maybe you could read it to temporary location and fail probe if the read > value doesn't match tps->chip_id? This will be resolved in the next version. I will reorder the MFD commits to have the REGMAP patch first, then Add TPS65215 PMIC support patch to avoid this issue. >> if (ret) { >> dev_err(tps->dev, "Failed to read device ID: %d\n", ret); >> return ret; >> } >> >> ret = devm_mfd_add_devices(tps->dev, PLATFORM_DEVID_AUTO, >> - tps65219_cells, ARRAY_SIZE(tps65219_cells), >> + pmic->cells, pmic->n_cells, >> NULL, 0, regmap_irq_get_domain(tps->irq_data)); >> if (ret) { >> dev_err(tps->dev, "Failed to add child devices: %d\n", ret); >> @@ -291,7 +427,10 @@ static int tps65219_probe(struct i2c_client *client) >> } >> >> static const struct of_device_id of_tps65219_match_table[] = { >> - { .compatible = "ti,tps65219", }, >> + { .compatible = "ti,tps65215", .data = (void *)TPS65215, }, >> + { .compatible = "ti,tps65219", .data = (void *)TPS65219, }, >> + { .compatible = "ti,tps65219", .data = (void *)TPS65219, }, >> + { .compatible = "ti,tps65215", .data = (void *)TPS65215, }, >> {} >> }; >> MODULE_DEVICE_TABLE(of, of_tps65219_match_table); >> @@ -306,5 +445,5 @@ static struct i2c_driver tps65219_driver = { >> module_i2c_driver(tps65219_driver); >> >> MODULE_AUTHOR("Jerome Neanne <jneanne@xxxxxxxxxxxx>"); >> -MODULE_DESCRIPTION("TPS65219 power management IC driver"); >> +MODULE_DESCRIPTION("TPS65215/TPS65219 PMIC driver"); >> MODULE_LICENSE("GPL"); >> diff --git a/include/linux/mfd/tps65219.h b/include/linux/mfd/tps65219.h >> index 546bceec7173..9892b6e4c85c 100644 >> --- a/include/linux/mfd/tps65219.h >> +++ b/include/linux/mfd/tps65219.h >> @@ -1,8 +1,10 @@ >> /* SPDX-License-Identifier: GPL-2.0 */ >> /* >> - * Functions to access TPS65219 Power Management IC. >> + * Functions to access TPS65215/TPS65219 Integrated Power Management >> + * Integrated Chips (PMIC) >> * >> * Copyright (C) 2022 BayLibre Incorporated - https://www.baylibre.com/ >> + * Copyright (C) 2024 Texas Instruments Incorporated - https://www.ti.com/ >> */ >> >> #ifndef MFD_TPS65219_H >> @@ -15,6 +17,11 @@ >> >> /* TPS chip id list */ >> #define TPS65219 0xF0 >> +/* Chip id list*/ >> +enum pmic_id { >> + TPS65215, >> + TPS65219, > How about adding _ID suffix to these so we know by reading what it really is? > >> +}; >> >> /* I2C ID for TPS65219 part */ >> #define TPS65219_I2C_ID 0x24 >> @@ -26,6 +33,7 @@ >> #define TPS65219_REG_BUCKS_CONFIG 0x03 >> #define TPS65219_REG_LDO4_VOUT 0x04 >> #define TPS65219_REG_LDO3_VOUT 0x05 >> +#define TPS65215_REG_LDO2_VOUT 0x05 >> #define TPS65219_REG_LDO2_VOUT 0x06 >> #define TPS65219_REG_LDO1_VOUT 0x07 >> #define TPS65219_REG_BUCK3_VOUT 0x8 >> @@ -33,6 +41,7 @@ >> #define TPS65219_REG_BUCK1_VOUT 0xA >> #define TPS65219_REG_LDO4_SEQUENCE_SLOT 0xB >> #define TPS65219_REG_LDO3_SEQUENCE_SLOT 0xC >> +#define TPS65215_REG_LDO2_SEQUENCE_SLOT 0xC >> #define TPS65219_REG_LDO2_SEQUENCE_SLOT 0xD >> #define TPS65219_REG_LDO1_SEQUENCE_SLOT 0xE >> #define TPS65219_REG_BUCK3_SEQUENCE_SLOT 0xF >> @@ -67,9 +76,16 @@ >> #define TPS65219_REG_DISCHARGE_CONFIG 0x2A >> /* main irq registers */ >> #define TPS65219_REG_INT_SOURCE 0x2B >> -/* 'sub irq' registers */ >> + >> +/* TPS65219 'sub irq' registers */ >> #define TPS65219_REG_INT_LDO_3_4 0x2C >> #define TPS65219_REG_INT_LDO_1_2 0x2D >> + >> +/* TPS65215 specific 'sub irq' registers */ >> +#define TPS65215_REG_INT_LDO_2 0x2C >> +#define TPS65215_REG_INT_LDO_1 0x2D >> + >> +/* Common TPS65215 & TPS65219 'sub irq' registers */ >> #define TPS65219_REG_INT_BUCK_3 0x2E >> #define TPS65219_REG_INT_BUCK_1_2 0x2F >> #define TPS65219_REG_INT_SYSTEM 0x30 >> @@ -86,6 +102,9 @@ >> #define TPS65219_REG_INT_TO_RV_POS 6 >> #define TPS65219_REG_INT_PB_POS 7 >> >> +#define TPS65215_REG_INT_LDO_2_POS 0 >> +#define TPS65215_REG_INT_LDO_1_POS 1 >> + >> #define TPS65219_REG_USER_NVM_CMD 0x34 >> #define TPS65219_REG_POWER_UP_STATUS 0x35 >> #define TPS65219_REG_SPARE_2 0x36 >> @@ -107,6 +126,7 @@ >> #define TPS65219_ENABLE_LDO1_EN_MASK BIT(3) >> #define TPS65219_ENABLE_LDO2_EN_MASK BIT(4) >> #define TPS65219_ENABLE_LDO3_EN_MASK BIT(5) >> +#define TPS65215_ENABLE_LDO2_EN_MASK BIT(5) >> #define TPS65219_ENABLE_LDO4_EN_MASK BIT(6) >> /* power ON-OFF sequence slot */ >> #define TPS65219_BUCKS_LDOS_SEQUENCE_OFF_SLOT_MASK GENMASK(3, 0) >> @@ -172,6 +192,13 @@ >> #define TPS65219_INT_LDO2_SCG_MASK BIT(3) >> #define TPS65219_INT_LDO2_OC_MASK BIT(4) >> #define TPS65219_INT_LDO2_UV_MASK BIT(5) >> +/* TPS65215 LDO1-2*/ >> +#define TPS65215_INT_LDO1_SCG_MASK BIT(0) >> +#define TPS65215_INT_LDO1_OC_MASK BIT(1) >> +#define TPS65215_INT_LDO1_UV_MASK BIT(2) >> +#define TPS65215_INT_LDO2_SCG_MASK BIT(0) >> +#define TPS65215_INT_LDO2_OC_MASK BIT(1) >> +#define TPS65215_INT_LDO2_UV_MASK BIT(2) >> /* BUCK3 */ >> #define TPS65219_INT_BUCK3_SCG_MASK BIT(0) >> #define TPS65219_INT_BUCK3_OC_MASK BIT(1) >> @@ -202,6 +229,7 @@ >> #define TPS65219_INT_LDO1_RV_MASK BIT(3) >> #define TPS65219_INT_LDO2_RV_MASK BIT(4) >> #define TPS65219_INT_LDO3_RV_MASK BIT(5) >> +#define TPS65215_INT_LDO2_RV_MASK BIT(5) >> #define TPS65219_INT_LDO4_RV_MASK BIT(6) >> /* Residual Voltage ShutDown */ >> #define TPS65219_INT_BUCK1_RV_SD_MASK BIT(0) >> @@ -210,6 +238,7 @@ >> #define TPS65219_INT_LDO1_RV_SD_MASK BIT(3) >> #define TPS65219_INT_LDO2_RV_SD_MASK BIT(4) >> #define TPS65219_INT_LDO3_RV_SD_MASK BIT(5) >> +#define TPS65215_INT_LDO2_RV_SD_MASK BIT(5) >> #define TPS65219_INT_LDO4_RV_SD_MASK BIT(6) >> #define TPS65219_INT_TIMEOUT_MASK BIT(7) >> /* Power Button */ >> @@ -235,6 +264,14 @@ enum { >> TPS65219_INT_LDO4_SCG, >> TPS65219_INT_LDO4_OC, >> TPS65219_INT_LDO4_UV, >> + /* TPS65215 LDO1*/ >> + TPS65215_INT_LDO1_SCG, >> + TPS65215_INT_LDO1_OC, >> + TPS65215_INT_LDO1_UV, >> + /* TPS65215 LDO2*/ >> + TPS65215_INT_LDO2_SCG, >> + TPS65215_INT_LDO2_OC, >> + TPS65215_INT_LDO2_UV, >> /* LDO1-2 */ >> TPS65219_INT_LDO1_SCG, >> TPS65219_INT_LDO1_OC, >> @@ -271,6 +308,7 @@ enum { >> TPS65219_INT_BUCK3_RV, >> TPS65219_INT_LDO1_RV, >> TPS65219_INT_LDO2_RV, >> + TPS65215_INT_LDO2_RV, >> TPS65219_INT_LDO3_RV, >> TPS65219_INT_LDO4_RV, >> /* Residual Voltage ShutDown */ >> @@ -278,6 +316,7 @@ enum { >> TPS65219_INT_BUCK2_RV_SD, >> TPS65219_INT_BUCK3_RV_SD, >> TPS65219_INT_LDO1_RV_SD, >> + TPS65215_INT_LDO2_RV_SD, >> TPS65219_INT_LDO2_RV_SD, >> TPS65219_INT_LDO3_RV_SD, >> TPS65219_INT_LDO4_RV_SD, >> @@ -287,6 +326,12 @@ enum { >> TPS65219_INT_PB_RISING_EDGE_DETECT, >> }; >> >> +enum tps65215_regulator_id { >> + /* DCDC's same as TPS65219 */ >> + /* LDO1 is the same as TPS65219 */ >> + TPS65215_LDO_2 = 4, >> +}; >> + >> enum tps65219_regulator_id { >> /* DCDC's */ >> TPS65219_BUCK_1, >> @@ -300,11 +345,26 @@ enum tps65219_regulator_id { >> }; >> >> /* Number of step-down converters available */ >> -#define TPS65219_NUM_DCDC 3 >> +#define TPS6521X_NUM_BUCKS 3 >> /* Number of LDO voltage regulators available */ >> #define TPS65219_NUM_LDO 4 >> +#define TPS65215_NUM_LDO 2 >> /* Number of total regulators available */ >> -#define TPS65219_NUM_REGULATOR (TPS65219_NUM_DCDC + TPS65219_NUM_LDO) >> +#define TPS65219_NUM_REGULATOR (TPS6521X_NUM_BUCKS + TPS65219_NUM_LDO) >> +#define TPS65215_NUM_REGULATOR (TPS6521X_NUM_BUCKS + TPS65215_NUM_LDO) >> + >> +/* Define the TPS65215 IRQ numbers */ >> +enum tps65215_irqs { >> + /* INT source registers */ >> + TPS65215_TO_RV_SD_SET_IRQ, >> + TPS65215_RV_SET_IRQ, >> + TPS65215_SYS_SET_IRQ, >> + TPS65215_BUCK_1_2_SET_IRQ, >> + TPS65215_BUCK_3_SET_IRQ, >> + TPS65215_LDO_1_SET_IRQ, >> + TPS65215_LDO_2_SET_IRQ, >> + TPS65215_PB_SET_IRQ, >> +}; >> >> /* Define the TPS65219 IRQ numbers */ >> enum tps65219_irqs { >> @@ -326,6 +386,7 @@ enum tps65219_irqs { >> * >> * @dev: MFD device >> * @regmap: Regmap for accessing the device registers >> + * @chip_id: Chip ID >> * @irq_data: Regmap irq data used for the irq chip >> * @nb: notifier block for the restart handler >> */ >> @@ -333,6 +394,7 @@ struct tps65219 { >> struct device *dev; >> struct regmap *regmap; >> >> + unsigned int chip_id; >> struct regmap_irq_chip_data *irq_data; >> struct notifier_block nb; >> };
