| Message ID | 20240924103609.12513-2-andreas@kemnade.info |
|---|---|
| State | Superseded |
| Headers | show |
| Series | mfd: twl: Add clock for TWL6030 | expand |
On 24/09/2024 13:36, Andreas Kemnade wrote: > Also the TWL6030 has some clocks, so add a subdevice for that. > > Signed-off-by: Andreas Kemnade <andreas@kemnade.info> Reviewed-by: Roger Quadros <rogerq@kernel.org>
On Tue, 24 Sep 2024, Andreas Kemnade wrote: > Also the TWL6030 has some clocks, so add a subdevice for that. > > Signed-off-by: Andreas Kemnade <andreas@kemnade.info> > --- > drivers/mfd/twl-core.c | 32 ++++++++++++++++++++++---------- > 1 file changed, 22 insertions(+), 10 deletions(-) > > diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c > index c130ffef182f..c981922f62d5 100644 > --- a/drivers/mfd/twl-core.c > +++ b/drivers/mfd/twl-core.c > @@ -711,6 +711,10 @@ static struct of_dev_auxdata twl_auxdata_lookup[] = { > { /* sentinel */ }, > }; > > +static const struct mfd_cell twl6030_cells[] = { > + { .name = "twl6030-clk" }, > +}; > + > static const struct mfd_cell twl6032_cells[] = { > { .name = "twl6032-clk" }, > }; > @@ -861,17 +865,25 @@ twl_probe(struct i2c_client *client) > TWL4030_DCDC_GLOBAL_CFG); > } > > - if (id->driver_data == (TWL6030_CLASS | TWL6032_SUBCLASS)) { > - status = devm_mfd_add_devices(&client->dev, > - PLATFORM_DEVID_NONE, > - twl6032_cells, > - ARRAY_SIZE(twl6032_cells), > - NULL, 0, NULL); > - if (status < 0) > - goto free; > - } > - > if (twl_class_is_6030()) { > + if (id->driver_data & TWL6032_SUBCLASS) { > + status = devm_mfd_add_devices(&client->dev, > + PLATFORM_DEVID_NONE, > + twl6032_cells, > + ARRAY_SIZE(twl6032_cells), > + NULL, 0, NULL); > + if (status < 0) > + goto free; > + } else { > + status = devm_mfd_add_devices(&client->dev, > + PLATFORM_DEVID_NONE, > + twl6030_cells, > + ARRAY_SIZE(twl6030_cells), > + NULL, 0, NULL); > + if (status < 0) > + goto free; > + } > + Before this gets too crazy, how about: > + if (id->driver_data & TWL6032_SUBCLASS) { > + cells = twl6032_cells; > + num_cells = ARRAY_SIZE(twl6032_cells); > + } else { > + cells = twl6030_cells; > + num_cells = ARRAY_SIZE(twl6030_cells); > + } > + > + status = devm_mfd_add_devices(&client->dev, PLATFORM_DEVID_NONE, > + cells, num_cells, NULL, 0, NULL); > + if (status < 0) > + goto free; > if (of_device_is_system_power_controller(node)) { > if (!pm_power_off) > pm_power_off = twl6030_power_off; > -- > 2.39.5 >
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index c130ffef182f..c981922f62d5 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c @@ -711,6 +711,10 @@ static struct of_dev_auxdata twl_auxdata_lookup[] = { { /* sentinel */ }, }; +static const struct mfd_cell twl6030_cells[] = { + { .name = "twl6030-clk" }, +}; + static const struct mfd_cell twl6032_cells[] = { { .name = "twl6032-clk" }, }; @@ -861,17 +865,25 @@ twl_probe(struct i2c_client *client) TWL4030_DCDC_GLOBAL_CFG); } - if (id->driver_data == (TWL6030_CLASS | TWL6032_SUBCLASS)) { - status = devm_mfd_add_devices(&client->dev, - PLATFORM_DEVID_NONE, - twl6032_cells, - ARRAY_SIZE(twl6032_cells), - NULL, 0, NULL); - if (status < 0) - goto free; - } - if (twl_class_is_6030()) { + if (id->driver_data & TWL6032_SUBCLASS) { + status = devm_mfd_add_devices(&client->dev, + PLATFORM_DEVID_NONE, + twl6032_cells, + ARRAY_SIZE(twl6032_cells), + NULL, 0, NULL); + if (status < 0) + goto free; + } else { + status = devm_mfd_add_devices(&client->dev, + PLATFORM_DEVID_NONE, + twl6030_cells, + ARRAY_SIZE(twl6030_cells), + NULL, 0, NULL); + if (status < 0) + goto free; + } + if (of_device_is_system_power_controller(node)) { if (!pm_power_off) pm_power_off = twl6030_power_off;
Also the TWL6030 has some clocks, so add a subdevice for that. Signed-off-by: Andreas Kemnade <andreas@kemnade.info> --- drivers/mfd/twl-core.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-)