From mboxrd@z Thu Jan 1 00:00:00 1970 From: Grant Likely Subject: Re: [PATCH 1/2 v3] power: bq20z75: devicetree init support Date: Wed, 14 Sep 2011 09:54:45 -0600 Message-ID: <20110914155445.GD3134@ponder.secretlab.ca> References: <1315948860-21482-1-git-send-email-rklein@nvidia.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1315948860-21482-1-git-send-email-rklein-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Sender: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org To: Rhyland Klein Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, Anton Vorontsov List-Id: devicetree@vger.kernel.org On Tue, Sep 13, 2011 at 02:20:59PM -0700, Rhyland Klein wrote: > Adding support to generate platform data when kernel is configured > through device tree. > > Signed-off-by: Rhyland Klein > --- > v3: Changed to use "ti," properties > Changed to use gpio property with flag for polarity > Removed unnecessary call to of_match_device > > drivers/power/bq20z75.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 75 insertions(+), 0 deletions(-) > > diff --git a/drivers/power/bq20z75.c b/drivers/power/bq20z75.c > index 9c5e5be..bb4afb2 100644 > --- a/drivers/power/bq20z75.c > +++ b/drivers/power/bq20z75.c > @@ -613,6 +613,78 @@ static void bq20z75_delayed_work(struct work_struct *work) > } > } > > +#if defined(CONFIG_OF) > +#include > +static const struct of_device_id bq20z75_dt_ids[] = { > + { .compatible = "ti,bq20z75" }, > + { } > +}; > +MODULE_DEVICE_TABLE(platform, bq20z75_dt_ids); > + > +static struct bq20z75_platform_data *bq20z75_of_populate_pdata( > + struct i2c_client *client) > +{ > + const struct of_device_id *dtid; > + struct device_node *of_node = client->dev.of_node; > + struct bq20z75_platform_data *pdata = client->dev.platform_data; > + enum of_gpio_flags gpio_flags; > + int rc; > + u32 prop; > + > + /* verify this driver matches this device */ > + if (!of_node) > + return NULL; > + > + /* if platform data is set, honor it */ > + if (pdata) > + return pdata; > + > + /* first make sure at least one property is set, otherwise > + * it won't change behavior from running without pdata. > + */ > + if (!of_get_property(of_node, "ti,i2c-retry-count", NULL) && > + !of_get_property(of_node, "ti,poll-retry-count", NULL) && > + !of_get_property(of_node, "ti,battery-detect-gpios", NULL)) > + goto of_out; > + > + pdata = devm_kzalloc(&client->dev, sizeof(struct bq20z75_platform_data), > + GFP_KERNEL); > + if (!pdata) > + goto of_out; > + > + rc = of_property_read_u32(of_node, "ti,i2c-retry-count", &prop); > + if (!rc) > + pdata->i2c_retry_count = prop; > + > + rc = of_property_read_u32(of_node, "ti,poll-retry-count", &prop); > + if (!rc) > + pdata->poll_retry_count = prop; > + > + if (!of_get_property(of_node, "ti,battery-detect-gpios", NULL)) { > + pdata->battery_detect = -1; > + goto of_out; > + } > + > + pdata->battery_detect = of_get_named_gpio_flags(of_node, > + "ti,battery-detect-gpios", 0, &gpio_flags); > + > + if (gpio_flags & OF_GPIO_ACTIVE_LOW) > + pdata->battery_detect_present = 0; > + else > + pdata->battery_detect_present = 1; > + > +of_out: > + return pdata; > +} > +#else > +#define bq20z75_dt_ids NULL > +static struct bq20z75_platform_data *bq20z75_of_populate_pdata( > + struct i2c_client *client) > +{ > + return NULL; > +} This looks like the driver will break when !CONFIG_OF. The caller of bq20z75_of_populate_pdata will get NULL and therefore won't have any pdata. > +#endif > + > static int __devinit bq20z75_probe(struct i2c_client *client, > const struct i2c_device_id *id) > { > @@ -642,6 +714,8 @@ static int __devinit bq20z75_probe(struct i2c_client *client, > bq20z75_device->power_supply.external_power_changed = > bq20z75_external_power_changed; > > + pdata = bq20z75_of_populate_pdata(client); > + > if (pdata) { > bq20z75_device->gpio_detect = > gpio_is_valid(pdata->battery_detect); > @@ -775,6 +849,7 @@ static struct i2c_driver bq20z75_battery_driver = { > .id_table = bq20z75_id, > .driver = { > .name = "bq20z75-battery", > + .of_match_table = bq20z75_dt_ids, > }, > }; > > -- > 1.7.6 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel