Hi, On Mon, Nov 18, 2013 at 10:29:07AM +0000, Lee Jones wrote: > > Since we still need to rely on a mix of device tree initialized > > drivers and legacy platform data initialize drivers, let's fix > > the passing of platform data to twl4030-gpio. > > > > As the twl4030 GPIO is initialized by twl-core.c, we need to register > > the auxdata for twl4030 GPIO in twl-core.c. > > > > Cc: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx> > > Cc: Lee Jones <lee.jones@xxxxxxxxxx> > > Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx> > > --- > > > > Samuel & Lee, I'd like to merge this fix via arm-soc tree if this looks > > OK to you as I have other patches that depend on this. > > > > --- > > drivers/mfd/twl-core.c | 15 ++++++++++++--- > > 1 file changed, 12 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c > > index 29473c2..d5b3dd8 100644 > > --- a/drivers/mfd/twl-core.c > > +++ b/drivers/mfd/twl-core.c > > @@ -1133,6 +1133,11 @@ static int twl_remove(struct i2c_client *client) > > return 0; > > } > > > > +static struct of_dev_auxdata twl_auxdata_lookup[] = { > > + OF_DEV_AUXDATA("ti,twl4030-gpio", 0, "twl4030-gpio", NULL), > > + { /* sentinel */ }, > > +}; > > + > > /* NOTE: This driver only handles a single twl4030/tps659x0 chip */ > > static int > > twl_probe(struct i2c_client *client, const struct i2c_device_id *id) > > @@ -1271,10 +1276,14 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id) > > twl_i2c_write_u8(TWL4030_MODULE_INTBR, temp, REG_GPPUPDCTR1); > > } > > > > - if (node) > > - status = of_platform_populate(node, NULL, NULL, &client->dev); > > - else > > + if (node) { > > + if (pdata) > > + twl_auxdata_lookup[0].platform_data = pdata->gpio; > > + status = of_platform_populate(node, NULL, twl_auxdata_lookup, > > + &client->dev); > > + } else { > > status = add_children(pdata, irq_base, id->driver_data); > > Why doesn't the TWL driver use the MFD framework for this stuff? that's reminiscent from years ago and, surely, needs to be fixed. Should we gate $subject for that, though ? This has been in tree for quite a few years already and Tony's patch is still a step forward, since most omap3 platforms would break on DT-only without it. There are quite a few folks who could volunteer to fixing that after Tony's patch is in (me included, although there could be better choices hehe). cheers -- balbi
Attachment:
signature.asc
Description: Digital signature