Skip to content

Commit 1421c3a

Browse files
wenslag-linaro
authored andcommitted
mfd: axp20x: Set explicit ID for regulator cell if no IRQ line is present
Originally an explicit ID for the AXP313/AXP323 regulator was set to avoid a conflict with the primary AXP717 PMIC on Allwinner A523 family boards. This didn't entirely work since on some or all of these boards, the interrupt line on this secondary PMIC was left unconnected, and thus the driver would fall back to the generic "no interrupt; only regulators" case, which didn't have the explicit ID set, thus undoing the intended fix. Also set an explicit ID for the regulator cell in the no IRQ generic fall back case. This fixes the conflict for the AXP717 + AXP313/AXP323 case. For the actual single PMIC with no IRQ connected case, the ID does not affect functionality, only the device naming of the regulator cell, and by extension the name and path under sysfs. Fixes: 249abf9b1e25 ("mfd: axp20x: Set explicit ID for AXP313 regulator") Signed-off-by: Chen-Yu Tsai <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Lee Jones <[email protected]>
1 parent 147dea6 commit 1421c3a

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

drivers/mfd/axp20x.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1231,9 +1231,8 @@ static const struct mfd_cell axp15060_cells[] = {
12311231

12321232
/* For boards that don't have IRQ line connected to SOC. */
12331233
static const struct mfd_cell axp_regulator_only_cells[] = {
1234-
{
1235-
.name = "axp20x-regulator",
1236-
},
1234+
/* PMIC without IRQ line may be secondary PMIC */
1235+
MFD_CELL_BASIC("axp20x-regulator", NULL, NULL, 0, 1),
12371236
};
12381237

12391238
static int axp20x_power_off(struct sys_off_data *data)

0 commit comments

Comments
 (0)