On Wed, Sep 16, 2015 at 02:55:12PM +0900, Krzysztof Kozlowski wrote:
> On 16.09.2015 02:58, Andreas Dannenberg wrote:
> > A new optional device property called "ti,ovp-voltage" is introduced to
> > allow configuring the input over voltage protection setting.
> >
> > This commit also adds the basic sysfs support for custom properties
> > which is being used to allow userspace to read the current ovp-voltage
> > setting.
> >
> > Signed-off-by: Andreas Dannenberg <dannenberg@xxxxxx>
> > ---
> > drivers/power/bq24257_charger.c | 67 +++++++++++++++++++++++++++++++++++++++--
> > 1 file changed, 64 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/power/bq24257_charger.c b/drivers/power/bq24257_charger.c
> > index d7488cf..47af858 100644
> > --- a/drivers/power/bq24257_charger.c
> > +++ b/drivers/power/bq24257_charger.c
> > @@ -75,6 +75,7 @@ struct bq24257_init_data {
> > u8 vbat; /* regulation voltage */
> > u8 iterm; /* termination current */
> > u8 in_ilimit; /* input current limit */
> > + u8 vovp; /* over voltage protection voltage */
> > };
> >
> > struct bq24257_state {
> > @@ -198,6 +199,13 @@ static const u32 bq24257_iilimit_map[] = {
> >
> > #define BQ24257_IILIMIT_MAP_SIZE ARRAY_SIZE(bq24257_iilimit_map)
> >
> > +static const u32 bq24257_vovp_map[] = {
> > + 6000000, 6500000, 7000000, 8000000, 9000000, 9500000, 10000000,
> > + 10500000
> > +};
> > +
> > +#define BQ24257_VOVP_MAP_SIZE ARRAY_SIZE(bq24257_vovp_map)
> > +
> > static int bq24257_field_read(struct bq24257_device *bq,
> > enum bq24257_fields field_id)
> > {
> > @@ -413,6 +421,17 @@ enum bq24257_in_ilimit {
> > IILIMIT_NONE,
> > };
> >
> > +enum bq24257_vovp {
> > + VOVP_6000,
> > + VOVP_6500,
> > + VOVP_7000,
> > + VOVP_8000,
> > + VOVP_9000,
> > + VOVP_9500,
> > + VOVP_10000,
> > + VOVP_10500
> > +};
>
> What is the purpose of this enum? It is duplicating values from the map
> (so you can make a mistake in its order) but actually is not used. I
> don't see benefit.
It's used in bq24257_power_supply_init() below (with "it" meaning one of
the values is used). I wouldn't really expect any mistakes to be made
since those tables are not something somebody can insert values into
(only append if ever).
> > +
> > enum bq24257_port_type {
> > PORT_TYPE_DCP, /* Dedicated Charging Port */
> > PORT_TYPE_CDP, /* Charging Downstream Port */
> > @@ -594,7 +613,8 @@ static int bq24257_hw_init(struct bq24257_device *bq)
> > } init_data[] = {
> > {F_ICHG, bq->init_data.ichg},
> > {F_VBAT, bq->init_data.vbat},
> > - {F_ITERM, bq->init_data.iterm}
> > + {F_ITERM, bq->init_data.iterm},
> > + {F_VOVP, bq->init_data.vovp},
> > };
> >
> > /*
> > @@ -664,6 +684,28 @@ static const struct power_supply_desc bq24257_power_supply_desc = {
> > .get_property = bq24257_power_supply_get_property,
> > };
> >
> > +static ssize_t bq24257_show_ovp_voltage(struct device *dev,
> > + struct device_attribute *attr,
> > + char *buf)
> > +{
> > + struct power_supply *psy = dev_get_drvdata(dev);
> > + struct bq24257_device *bq = power_supply_get_drvdata(psy);
> > +
> > + return scnprintf(buf, PAGE_SIZE, "%d\n",
>
> "%u", you are printing u32.
Good catch.
> > +}
> > +
> > +static DEVICE_ATTR(ovp_voltage, S_IRUGO, bq24257_show_ovp_voltage, NULL);
> > +
> > +static struct attribute *bq24257_charger_attr[] = {
> > + &dev_attr_ovp_voltage.attr,
> > + NULL,
> > +};
> > +
> > +static const struct attribute_group bq24257_attr_group = {
> > + .attrs = bq24257_charger_attr,
> > +};
> > +
> > static int bq24257_power_supply_init(struct bq24257_device *bq)
> > {
> > struct power_supply_config psy_cfg = { .drv_data = bq, };
> > @@ -750,6 +792,15 @@ static int bq24257_fw_probe(struct bq24257_device *bq)
> > BQ24257_IILIMIT_MAP_SIZE);
> > }
> >
> > + ret = device_property_read_u32(bq->dev, "ti,ovp-voltage",
> > + &property);
> > + if (ret < 0)
> > + bq->init_data.vovp = VOVP_6500;
> > + else
> > + bq->init_data.vovp = bq24257_find_idx(property,
> > + bq24257_vovp_map,
> > + BQ24257_VOVP_MAP_SIZE);
> > +
> > return 0;
> > }
> >
> > @@ -889,10 +940,18 @@ static int bq24257_probe(struct i2c_client *client,
> > return ret;
> >
> > ret = bq24257_power_supply_init(bq);
> > - if (ret < 0)
> > + if (ret < 0) {
> > dev_err(dev, "Failed to register power supply\n");
> > + return ret;
> > + }
> >
> > - return ret;
> > + ret = sysfs_create_group(&bq->charger->dev.kobj, &bq24257_attr_group);
> > + if (ret < 0) {
> > + dev_err(dev, "Can't create sysfs entries\n");
>
> power_supply_unregister(bq->charger);
> or convert in separate patch to devm-like method.
Nice find! I prefer using devm* methods any day if they exist. Will add
an extra patch to fold that in.
Regards,
--
Andreas Dannenberg
Texas Instruments Inc
>
> Best regards,
> Krzysztof
>
> > + return ret;
> > + }
> > +
> > + return 0;
> > }
> >
> > static int bq24257_remove(struct i2c_client *client)
> > @@ -902,6 +961,8 @@ static int bq24257_remove(struct i2c_client *client)
> > if (!bq->in_ilimit_autoset_disable)
> > cancel_delayed_work_sync(&bq->iilimit_setup_work);
> >
> > + sysfs_remove_group(&bq->charger->dev.kobj, &bq24257_attr_group);
> > +
> > power_supply_unregister(bq->charger);
> >
> > bq24257_field_write(bq, F_RESET, 1); /* reset to defaults */
> >
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
