* [PATCH v4 0/2] power: supply: add sbs-charger driver
@ 2016-12-20 15:31 Nicolas Saenz Julienne
2016-12-20 15:31 ` [PATCH v4 1/2] " Nicolas Saenz Julienne
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Nicolas Saenz Julienne @ 2016-12-20 15:31 UTC (permalink / raw)
To: sre, robh+dt, mark.rutland
Cc: linux-pm, devicetree, linux-kernel, nicolas.saenz
Hi,
This series adds support for all SBS compatible battery chargers, as defined
here: http://sbs-forum.org/specs/sbc110.pdf.
Regards,
Nicolas
changes since v3:
- update dt-binding to use part number and fallback
changes since v2:
- updated driver and dt-binding with Sebatian's comments
changes since v1:
- added dt bindings
- updated driver with Sebastian's comments
- s/Nicola/Nicolas/ in commits
Nicolas Saenz Julienne (2):
power: supply: add sbs-charger driver
dt-bindings: power: add bindings for sbs-charger
.../bindings/power/supply/sbs_sbs-charger.txt | 23 ++
drivers/power/supply/Kconfig | 6 +
drivers/power/supply/Makefile | 1 +
drivers/power/supply/sbs-charger.c | 274 +++++++++++++++++++++
4 files changed, 304 insertions(+)
create mode 100644 Documentation/devicetree/bindings/power/supply/sbs_sbs-charger.txt
create mode 100644 drivers/power/supply/sbs-charger.c
--
2.7.4
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH v4 1/2] power: supply: add sbs-charger driver 2016-12-20 15:31 [PATCH v4 0/2] power: supply: add sbs-charger driver Nicolas Saenz Julienne @ 2016-12-20 15:31 ` Nicolas Saenz Julienne 2016-12-20 16:54 ` Manish Badarkhe 2016-12-20 15:31 ` [PATCH v4 2/2] dt-bindings: power: add bindings for sbs-charger Nicolas Saenz Julienne 2016-12-22 18:04 ` [PATCH v4 0/2] power: supply: add sbs-charger driver Sebastian Reichel 2 siblings, 1 reply; 7+ messages in thread From: Nicolas Saenz Julienne @ 2016-12-20 15:31 UTC (permalink / raw) To: sre, robh+dt, mark.rutland Cc: linux-pm, devicetree, linux-kernel, nicolas.saenz This adds support for sbs-charger compilant chips as defined here: http://sbs-forum.org/specs/sbc110.pdf This was tested on a arm board connected to an LTC4100 battery charger chip. Signed-off-by: Nicolas Saenz Julienne <nicolas.saenz@prodys.net> --- v3 -> v4 - drop "lltc,ltc4100" compatible string for now v2 -> v3: - add readable_reg() function to regmap config - update compatible strings with part number v1 -> v2: - add spec link in header - use proper gpio/interrupt interface - update regmap configuration (max register & endianness) - dropped oldschool .supplied_to assignments - use devm_* APIs drivers/power/supply/Kconfig | 6 + drivers/power/supply/Makefile | 1 + drivers/power/supply/sbs-charger.c | 274 +++++++++++++++++++++++++++++++++++++ 3 files changed, 281 insertions(+) create mode 100644 drivers/power/supply/sbs-charger.c diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig index 76806a0..42877ff 100644 --- a/drivers/power/supply/Kconfig +++ b/drivers/power/supply/Kconfig @@ -164,6 +164,12 @@ config BATTERY_SBS Say Y to include support for SBS battery driver for SBS-compliant gas gauges. +config CHARGER_SBS + tristate "SBS Compliant charger" + depends on I2C + help + Say Y to include support for SBS compilant battery chargers. + config BATTERY_BQ27XXX tristate "BQ27xxx battery driver" help diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile index 36c599d..06d9ef5 100644 --- a/drivers/power/supply/Makefile +++ b/drivers/power/supply/Makefile @@ -31,6 +31,7 @@ obj-$(CONFIG_BATTERY_COLLIE) += collie_battery.o obj-$(CONFIG_BATTERY_IPAQ_MICRO) += ipaq_micro_battery.o obj-$(CONFIG_BATTERY_WM97XX) += wm97xx_battery.o obj-$(CONFIG_BATTERY_SBS) += sbs-battery.o +obj-$(CONFIG_CHARGER_SBS) += sbs-charger.o obj-$(CONFIG_BATTERY_BQ27XXX) += bq27xxx_battery.o obj-$(CONFIG_BATTERY_BQ27XXX_I2C) += bq27xxx_battery_i2c.o obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o diff --git a/drivers/power/supply/sbs-charger.c b/drivers/power/supply/sbs-charger.c new file mode 100644 index 0000000..353765a --- /dev/null +++ b/drivers/power/supply/sbs-charger.c @@ -0,0 +1,274 @@ +/* + * Copyright (c) 2016, Prodys S.L. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This adds support for sbs-charger compilant chips as defined here: + * http://sbs-forum.org/specs/sbc110.pdf + * + * Implemetation based on sbs-battery.c + */ + +#include <linux/init.h> +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/err.h> +#include <linux/power_supply.h> +#include <linux/i2c.h> +#include <linux/slab.h> +#include <linux/interrupt.h> +#include <linux/gpio.h> +#include <linux/regmap.h> +#include <linux/of_gpio.h> +#include <linux/bitops.h> + +#define SBS_CHARGER_REG_SPEC_INFO 0x11 +#define SBS_CHARGER_REG_STATUS 0x13 +#define SBS_CHARGER_REG_ALARM_WARNING 0x16 + +#define SBS_CHARGER_STATUS_CHARGE_INHIBITED BIT(1) +#define SBS_CHARGER_STATUS_RES_COLD BIT(9) +#define SBS_CHARGER_STATUS_RES_HOT BIT(10) +#define SBS_CHARGER_STATUS_BATTERY_PRESENT BIT(14) +#define SBS_CHARGER_STATUS_AC_PRESENT BIT(15) + +#define SBS_CHARGER_POLL_TIME 500 + +struct sbs_info { + struct i2c_client *client; + struct power_supply *power_supply; + struct regmap *regmap; + struct delayed_work work; + unsigned int last_state; +}; + +static int sbs_get_property(struct power_supply *psy, + enum power_supply_property psp, + union power_supply_propval *val) +{ + struct sbs_info *chip = power_supply_get_drvdata(psy); + unsigned int reg; + + reg = chip->last_state; + + switch (psp) { + case POWER_SUPPLY_PROP_PRESENT: + val->intval = !!(reg & SBS_CHARGER_STATUS_BATTERY_PRESENT); + break; + + case POWER_SUPPLY_PROP_ONLINE: + val->intval = !!(reg & SBS_CHARGER_STATUS_AC_PRESENT); + break; + + case POWER_SUPPLY_PROP_STATUS: + val->intval = POWER_SUPPLY_STATUS_UNKNOWN; + + if (!(reg & SBS_CHARGER_STATUS_BATTERY_PRESENT)) + val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING; + else if (reg & SBS_CHARGER_STATUS_AC_PRESENT && + !(reg & SBS_CHARGER_STATUS_CHARGE_INHIBITED)) + val->intval = POWER_SUPPLY_STATUS_CHARGING; + else + val->intval = POWER_SUPPLY_STATUS_DISCHARGING; + + break; + + case POWER_SUPPLY_PROP_HEALTH: + if (reg & SBS_CHARGER_STATUS_RES_COLD) + val->intval = POWER_SUPPLY_HEALTH_COLD; + if (reg & SBS_CHARGER_STATUS_RES_HOT) + val->intval = POWER_SUPPLY_HEALTH_OVERHEAT; + else + val->intval = POWER_SUPPLY_HEALTH_GOOD; + + break; + + default: + return -EINVAL; + } + + return 0; +} + +static int sbs_check_state(struct sbs_info *chip) +{ + unsigned int reg; + int ret; + + ret = regmap_read(chip->regmap, SBS_CHARGER_REG_STATUS, ®); + if (!ret && reg != chip->last_state) { + chip->last_state = reg; + power_supply_changed(chip->power_supply); + return 1; + } + + return 0; +} + +static void sbs_delayed_work(struct work_struct *work) +{ + struct sbs_info *chip = container_of(work, struct sbs_info, work.work); + + sbs_check_state(chip); + + schedule_delayed_work(&chip->work, + msecs_to_jiffies(SBS_CHARGER_POLL_TIME)); +} + +static irqreturn_t sbs_irq_thread(int irq, void *data) +{ + struct sbs_info *chip = data; + int ret; + + ret = sbs_check_state(chip); + + return ret ? IRQ_HANDLED : IRQ_NONE; +} + +static enum power_supply_property sbs_properties[] = { + POWER_SUPPLY_PROP_STATUS, + POWER_SUPPLY_PROP_PRESENT, + POWER_SUPPLY_PROP_ONLINE, + POWER_SUPPLY_PROP_HEALTH, +}; + +static bool sbs_readable_reg(struct device *dev, unsigned int reg) +{ + if (reg < SBS_CHARGER_REG_SPEC_INFO) + return false; + else + return true; +} + +static bool sbs_volatile_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case SBS_CHARGER_REG_STATUS: + return true; + } + + return false; +} + +static const struct regmap_config sbs_regmap = { + .reg_bits = 8, + .val_bits = 16, + .max_register = SBS_CHARGER_REG_ALARM_WARNING, + .readable_reg = sbs_readable_reg, + .volatile_reg = sbs_volatile_reg, + .val_format_endian = REGMAP_ENDIAN_LITTLE, /* since based on SMBus */ +}; + +static const struct power_supply_desc sbs_desc = { + .name = "sbs-charger", + .type = POWER_SUPPLY_TYPE_MAINS, + .properties = sbs_properties, + .num_properties = ARRAY_SIZE(sbs_properties), + .get_property = sbs_get_property, +}; + +static int sbs_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + struct power_supply_config psy_cfg = {}; + struct sbs_info *chip; + int ret, val; + + chip = devm_kzalloc(&client->dev, sizeof(struct sbs_info), GFP_KERNEL); + if (!chip) + return -ENOMEM; + + chip->client = client; + psy_cfg.of_node = client->dev.of_node; + psy_cfg.drv_data = chip; + + i2c_set_clientdata(client, chip); + + chip->regmap = devm_regmap_init_i2c(client, &sbs_regmap); + if (IS_ERR(chip->regmap)) + return PTR_ERR(chip->regmap); + + /* + * Before we register, we need to make sure we can actually talk + * to the battery. + */ + ret = regmap_read(chip->regmap, SBS_CHARGER_REG_STATUS, &val); + if (ret) { + dev_err(&client->dev, "Failed to get device status\n"); + return ret; + } + chip->last_state = val; + + chip->power_supply = devm_power_supply_register(&client->dev, &sbs_desc, + &psy_cfg); + if (IS_ERR(chip->power_supply)) { + dev_err(&client->dev, "Failed to register power supply\n"); + return PTR_ERR(chip->power_supply); + } + + /* + * The sbs-charger spec doesn't impose the use of an interrupt. So in + * the case it wasn't provided we use polling in order get the charger's + * status. + */ + if (client->irq) { + ret = devm_request_threaded_irq(&client->dev, client->irq, + NULL, sbs_irq_thread, + IRQF_TRIGGER_FALLING | IRQF_ONESHOT, + dev_name(&client->dev), chip); + if (ret) { + dev_err(&client->dev, "Failed to request irq, %d\n", ret); + return ret; + } + } else { + INIT_DELAYED_WORK(&chip->work, sbs_delayed_work); + schedule_delayed_work(&chip->work, + msecs_to_jiffies(SBS_CHARGER_POLL_TIME)); + } + + dev_info(&client->dev, + "%s: smart charger device registered\n", client->name); + + return 0; +} + +static int sbs_remove(struct i2c_client *client) +{ + struct sbs_info *chip = i2c_get_clientdata(client); + + cancel_delayed_work_sync(&chip->work); + + return 0; +} + +#ifdef CONFIG_OF +static const struct of_device_id sbs_dt_ids[] = { + { .compatible = "sbs,sbs-charger" }, + { }, +}; +MODULE_DEVICE_TABLE(of, sbs_dt_ids); +#endif + +static const struct i2c_device_id sbs_id[] = { + { "sbs-charger", 0 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, sbs_id); + +static struct i2c_driver sbs_driver = { + .probe = sbs_probe, + .remove = sbs_remove, + .id_table = sbs_id, + .driver = { + .name = "sbs-charger", + .of_match_table = of_match_ptr(sbs_dt_ids), + }, +}; +module_i2c_driver(sbs_driver); + +MODULE_AUTHOR("Nicolas Saenz Julienne <nicolassaenzj@gmail.com>"); +MODULE_DESCRIPTION("SBS smart charger driver"); +MODULE_LICENSE("GPL v2"); -- 2.7.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v4 1/2] power: supply: add sbs-charger driver 2016-12-20 15:31 ` [PATCH v4 1/2] " Nicolas Saenz Julienne @ 2016-12-20 16:54 ` Manish Badarkhe 2016-12-21 9:30 ` Nicolas Saenz Julienne 0 siblings, 1 reply; 7+ messages in thread From: Manish Badarkhe @ 2016-12-20 16:54 UTC (permalink / raw) To: Nicolas Saenz Julienne Cc: sre, robh+dt, Mark Rutland, linux-pm, devicetree, linux-kernel Hi Nicola On Tue, Dec 20, 2016 at 9:01 PM, Nicolas Saenz Julienne <nicolas.saenz@prodys.net> wrote: > This adds support for sbs-charger compilant chips as defined here: > http://sbs-forum.org/specs/sbc110.pdf > > This was tested on a arm board connected to an LTC4100 battery charger > chip. > > Signed-off-by: Nicolas Saenz Julienne <nicolas.saenz@prodys.net> > --- > v3 -> v4 > - drop "lltc,ltc4100" compatible string for now > > v2 -> v3: > - add readable_reg() function to regmap config > - update compatible strings with part number > > v1 -> v2: > - add spec link in header > - use proper gpio/interrupt interface > - update regmap configuration (max register & endianness) > - dropped oldschool .supplied_to assignments > - use devm_* APIs > drivers/power/supply/Kconfig | 6 + > drivers/power/supply/Makefile | 1 + > drivers/power/supply/sbs-charger.c | 274 +++++++++++++++++++++++++++++++++++++ > 3 files changed, 281 insertions(+) > create mode 100644 drivers/power/supply/sbs-charger.c Just some general comment, Can you add some more properties here to know voltage and current? Also, can you add other properties present in charging status register like POWER_FAIL, VOLTAGE_OR, CURRENT_OR etc. Don't know weather it is feasible to add or not and Also, let me know, if it is already been covered in some part of the code. Thanks Manish Badarkhe ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v4 1/2] power: supply: add sbs-charger driver 2016-12-20 16:54 ` Manish Badarkhe @ 2016-12-21 9:30 ` Nicolas Saenz Julienne 2016-12-21 10:09 ` Manish Badarkhe 0 siblings, 1 reply; 7+ messages in thread From: Nicolas Saenz Julienne @ 2016-12-21 9:30 UTC (permalink / raw) To: Manish Badarkhe Cc: sre, robh+dt, Mark Rutland, linux-pm, devicetree, linux-kernel Hi Manish, thanks for the interest. On 20/12/16 17:54, Manish Badarkhe wrote: > Hi Nicola > [...] > > Just some general comment, Can you add some more properties here to > know voltage and current? I assume you are mentioning reading current and voltage values. These properties are not supported by the sbs-charger standard. All you can do is set (write only) the charging current and charging voltage values. Yet in all the boards I've worked with it's the sbs-battery compliant chip that takes care of it. > Also, can you add other properties present in charging status register > like POWER_FAIL, VOLTAGE_OR, > CURRENT_OR etc. CURRENT_OR and VOLTAGE_OR relate to wrong values in the charging voltage/current registers. Since the sbs-battery chip takes care of it I don't see any use for it. POWER_FAIL marks there is not enough voltage to charge the battery. I don't need that information so I did nothing to integrate it. Having a quick look at the power supply defines I don't see were it could easily fit. > Don't know weather it is feasible to add or not and Also, let me know, > if it is already been covered in > some part of the code. > > Thanks > Manish Badarkhe > Regards, Nicolas ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v4 1/2] power: supply: add sbs-charger driver 2016-12-21 9:30 ` Nicolas Saenz Julienne @ 2016-12-21 10:09 ` Manish Badarkhe 0 siblings, 0 replies; 7+ messages in thread From: Manish Badarkhe @ 2016-12-21 10:09 UTC (permalink / raw) To: Nicolas Saenz Julienne Cc: sre, robh+dt, Mark Rutland, linux-pm, devicetree, linux-kernel Hi Nicolas On Wed, Dec 21, 2016 at 3:00 PM, Nicolas Saenz Julienne <nicolas.saenz@prodys.net> wrote: > Hi Manish, thanks for the interest. > > On 20/12/16 17:54, Manish Badarkhe wrote: >> Hi Nicola >> > [...] >> >> Just some general comment, Can you add some more properties here to >> know voltage and current? > > I assume you are mentioning reading current and voltage values. These > properties are not supported by the sbs-charger standard. All you can do > is set (write only) the charging current and charging voltage values. > Yet in all the boards I've worked with it's the sbs-battery compliant > chip that takes care of it. thanks for clarifying me. >> Also, can you add other properties present in charging status register >> like POWER_FAIL, VOLTAGE_OR, >> CURRENT_OR etc. > > CURRENT_OR and VOLTAGE_OR relate to wrong values in the charging > voltage/current registers. Since the sbs-battery chip takes care of it I > don't see any use for it. > POWER_FAIL marks there is not enough voltage to charge the battery. I > don't need that information so I did nothing to integrate it. Having a > quick look at the power supply defines I don't see were it could easily fit. thanks for clarifying me. Regards Manish Badarkhe ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v4 2/2] dt-bindings: power: add bindings for sbs-charger 2016-12-20 15:31 [PATCH v4 0/2] power: supply: add sbs-charger driver Nicolas Saenz Julienne 2016-12-20 15:31 ` [PATCH v4 1/2] " Nicolas Saenz Julienne @ 2016-12-20 15:31 ` Nicolas Saenz Julienne 2016-12-22 18:04 ` [PATCH v4 0/2] power: supply: add sbs-charger driver Sebastian Reichel 2 siblings, 0 replies; 7+ messages in thread From: Nicolas Saenz Julienne @ 2016-12-20 15:31 UTC (permalink / raw) To: sre, robh+dt, mark.rutland Cc: linux-pm, devicetree, linux-kernel, nicolas.saenz Adds device tree documentation for SBS charger compilant devices as defined here: http://sbs-forum.org/specs/sbc110.pdf Signed-off-by: Nicolas Saenz Julienne <nicolas.saenz@prodys.net> --- v3 -> v4: - use part-number/fallback compatible string structure v2 -> v3: - add part number as compatible .../bindings/power/supply/sbs_sbs-charger.txt | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 Documentation/devicetree/bindings/power/supply/sbs_sbs-charger.txt diff --git a/Documentation/devicetree/bindings/power/supply/sbs_sbs-charger.txt b/Documentation/devicetree/bindings/power/supply/sbs_sbs-charger.txt new file mode 100644 index 0000000..a371962 --- /dev/null +++ b/Documentation/devicetree/bindings/power/supply/sbs_sbs-charger.txt @@ -0,0 +1,23 @@ +SBS sbs-charger +~~~~~~~~~~ + +Required properties: + - compatible: "<vendor>,<part-number>", "sbs,sbs-charger" as fallback. The part + number compatible string might be used in order to take care of vendor + specific registers. + +Optional properties: +- interrupt-parent: Should be the phandle for the interrupt controller. Use in + conjunction with "interrupts". +- interrupts: Interrupt mapping for GPIO IRQ. Use in conjunction with + "interrupt-parent". If an interrupt is not provided the driver will switch + automatically to polling. + +Example: + + ltc4100@9 { + compatible = "lltc,ltc4100", "sbs,sbs-charger"; + reg = <0x9>; + interrupt-parent = <&gpio6>; + interrupts = <7 IRQ_TYPE_LEVEL_LOW>; + }; -- 2.7.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v4 0/2] power: supply: add sbs-charger driver 2016-12-20 15:31 [PATCH v4 0/2] power: supply: add sbs-charger driver Nicolas Saenz Julienne 2016-12-20 15:31 ` [PATCH v4 1/2] " Nicolas Saenz Julienne 2016-12-20 15:31 ` [PATCH v4 2/2] dt-bindings: power: add bindings for sbs-charger Nicolas Saenz Julienne @ 2016-12-22 18:04 ` Sebastian Reichel 2 siblings, 0 replies; 7+ messages in thread From: Sebastian Reichel @ 2016-12-22 18:04 UTC (permalink / raw) To: Nicolas Saenz Julienne Cc: robh+dt, mark.rutland, linux-pm, devicetree, linux-kernel [-- Attachment #1: Type: text/plain, Size: 1132 bytes --] Hi, On Tue, Dec 20, 2016 at 04:31:12PM +0100, Nicolas Saenz Julienne wrote: > This series adds support for all SBS compatible battery chargers, as defined > here: http://sbs-forum.org/specs/sbc110.pdf. > > [...] > > Nicolas Saenz Julienne (2): > power: supply: add sbs-charger driver > dt-bindings: power: add bindings for sbs-charger > > .../bindings/power/supply/sbs_sbs-charger.txt | 23 ++ > drivers/power/supply/Kconfig | 6 + > drivers/power/supply/Makefile | 1 + > drivers/power/supply/sbs-charger.c | 274 +++++++++++++++++++++ > 4 files changed, 304 insertions(+) > create mode 100644 Documentation/devicetree/bindings/power/supply/sbs_sbs-charger.txt > create mode 100644 drivers/power/supply/sbs-charger.c Thanks for your patchset. We are currently in the merge window and your patchset will appear in linux-next once 4.10-rc1 has been tagged by Linus Torvalds. Until then I queued it into this branch: https://git.kernel.org/cgit/linux/kernel/git/sre/linux-power-supply.git/log/?h=for-next-next -- Sebastian [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-12-22 18:04 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2016-12-20 15:31 [PATCH v4 0/2] power: supply: add sbs-charger driver Nicolas Saenz Julienne 2016-12-20 15:31 ` [PATCH v4 1/2] " Nicolas Saenz Julienne 2016-12-20 16:54 ` Manish Badarkhe 2016-12-21 9:30 ` Nicolas Saenz Julienne 2016-12-21 10:09 ` Manish Badarkhe 2016-12-20 15:31 ` [PATCH v4 2/2] dt-bindings: power: add bindings for sbs-charger Nicolas Saenz Julienne 2016-12-22 18:04 ` [PATCH v4 0/2] power: supply: add sbs-charger driver Sebastian Reichel
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).