Skip to content

Commit

Permalink
mfd: tps65218: Use mfd_add_devices instead of of_platform_populate
Browse files Browse the repository at this point in the history
mfd_add_devices enables parsing device tree nodes without compatibles
for regulators and gpio modules. Replace of_platform_populate with
mfd_add_devices. mfd_cell currently is populated with regulators,
gpio and powerbutton.

Signed-off-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
  • Loading branch information
Keerthy authored and Lee Jones committed Oct 26, 2016
1 parent 77aa992 commit 4531156
Showing 1 changed file with 16 additions and 2 deletions.
18 changes: 16 additions & 2 deletions drivers/mfd/tps65218.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,18 @@

#define TPS65218_PASSWORD_REGS_UNLOCK 0x7D

static const struct mfd_cell tps65218_cells[] = {
{
.name = "tps65218-pwrbutton",
.of_compatible = "ti,tps65218-pwrbutton",
},
{
.name = "tps65218-gpio",
.of_compatible = "ti,tps65218-gpio",
},
{ .name = "tps65218-regulator", },
};

/**
* tps65218_reg_write: Write a single tps65218 register.
*
Expand Down Expand Up @@ -245,8 +257,10 @@ static int tps65218_probe(struct i2c_client *client,

tps->rev = chipid & TPS65218_CHIPID_REV_MASK;

ret = of_platform_populate(client->dev.of_node, NULL, NULL,
&client->dev);
ret = mfd_add_devices(tps->dev, PLATFORM_DEVID_AUTO, tps65218_cells,
ARRAY_SIZE(tps65218_cells), NULL, 0,
regmap_irq_get_domain(tps->irq_data));

if (ret < 0)
goto err_irq;

Expand Down

0 comments on commit 4531156

Please sign in to comment.