* [PATCH v5 0/7] Add initial support for DA9150 Charger & Fuel-Gauge IC
@ 2014-12-22 16:50 Adam Thomson
2014-12-22 16:51 ` [PATCH v5 1/7] mfd: Add support for DA9150 combined charger & fuel-gauge device Adam Thomson
` (6 more replies)
0 siblings, 7 replies; 20+ messages in thread
From: Adam Thomson @ 2014-12-22 16:50 UTC (permalink / raw)
To: Lee Jones, Samuel Ortiz, Jonathan Cameron, Hartmut Knaack,
linux-iio, Sebastian Reichel, Dmitry Eremin-Solenikov,
David Woodhouse, linux-pm, Rob Herring, Pawel Moll, Mark Rutland,
Ian Campbell, Kumar Gala, Grant Likely, devicetree, Andrew Morton,
Joe Perches
Cc: linux-kernel, support.opensource
This patch set adds initial support for the Dialog DA9150 Integrated Charger &
Fuel-Gauge IC. The device also provides GPIO and GPADC functionality.
In this patch set the following is provided:
- MFD Core support and DT bindings documentation.
- IIO GPADC support and DT bindings documentation.
- Power Supply Charger support and DT bindings documentation.
- Update to MAINTAINERS file to add DA9150 files to Dialog support list.
- Update to IIO ABI document to add info regarding input current readings.
To keep patch submission from being too large, support for GPIO and Fuel-Gauge
will come after initial support patches are accepted.
This patch set is baselined against the v3.19-rc1 kernel version.
Changes in v5:
- Use sizeof(*gpadc) instead of sizeof(struct da9150_gpadc) in GPADC driver.
- Fix erroneous goto for IRQ failure in GPADC driver. Now returns err directly.
- Remove IIO ABI document patch as this has been taken by maintainer.
Changes in v4:
- Correct MODULE_AUTHOR lines so e-mail addresses correctly surrounded with <>.
- Update to MFD binding document to remove unnecesary I2C reference, make
module description generic, and add link to interrupt binding documentation.
- For GPADC driver, irq request moved above iio related calls in probe() to
mirror correctly the remove() function ordering, as requested.
- For charger driver, remove additional sysfs entries as these are not necessary
(debug only).
- For charger driver, add helper function for requesting IRQs, to make probe()
function cleaner/simpler.
Changes in v3:
- IRQ register and remove helper functions removed from MFD, deemed unnecessary.
Drivers using helper functions updated to use direct calls to relevant
kernel framework functions.
- MFD I2C file removed and code folded into -core file as requested.
- MFD core now buildable as driver module.
- Platform data structure definition moved into core header, pdata.h removed.
- Update functions in GPADC driver to be static, where appropriate.
- Change units of GPADC readings to match ABI documentation. Updates to charger
driver also made to align with this modification.
- Refactor GPADC temp calculations to use scale & offset method.
- Scale values now returned as FRACTIONAL to allow for accurate conversion in
user-space.
- Tidy up of GPADC scale, offset and raw functions to return from case statements
with correct return types.
- Update GPADC channel macros naming to prefix with DA9150, prevent conflict.
- GPADC GPIO voltage readings actually in 6V range, updated accordingly.
- Addition to IIO ABI document to add details on input current readings.
- Small style updates to address comments.
Changes in v2:
- Drop devicetree prefix patch as this is being dealt with separately.
- IIO framework fix patch removed from set, has already been accepted/merged.
- Use __ instead of _ for protecting #ifdefs in headers.
- Moved private data & definitions to source files and remove unwanted headers.
- Bug fix to EXPORT_SYMBOL for common functions in MFD core used by
sub-devices, so they can be correctly built as kernel modules.
- Removed unnecessary channels from GPADC IIO driver to simplify code.
- For GPADC IIO driver, VBAT reading now provides scale and offset values as it
is a linear scale.
- GPADC read code refactored to make it tidier.
- Remove use of flag to indicate GPADC availability. IIO framework should
indicate need to defer if it's not yet instantiated.
- Unwanted comments removed.
- Removed conditional shutdown of device (Charger/MFD) as this is not needed.
- Removed AC type supply from charger as device cannot differentiate. Now just
uses USB supply type.
- Removed use of invalid-tbat flag from platform data as it doesn't really add
anything to the driver except forcing battery present status.
- Bug fix for checking of usb_phy validity in Charger probe() function.
- Addition of common IRQ release function to allow sub-devices to explicitly
tidy up IRQs when devm clean up is too late.
- Improved tidy up of resources in charger.
- Fix location of IIO GPADC related devicetree binding document so it now
resides correctly under 'adc' directory.
- Add update to MAINTAINERS file to include these files in Dialog support list.
Adam Thomson (7):
mfd: Add support for DA9150 combined charger & fuel-gauge device
mfd: da9150: Add DT binding documentation for core
iio: Add support for DA9150 GPADC
iio: da9150: Add DT binding documentation for GPADC
power: Add support for DA9150 Charger
power: da9150: Add DT binding documentation for charger
MAINTAINERS: Include DA9150 files in Dialog Semiconductor support
list.
.../devicetree/bindings/iio/adc/da9150-gpadc.txt | 16 +
Documentation/devicetree/bindings/mfd/da9150.txt | 43 +
.../devicetree/bindings/power/da9150-charger.txt | 26 +
MAINTAINERS | 4 +
drivers/iio/adc/Kconfig | 9 +
drivers/iio/adc/Makefile | 1 +
drivers/iio/adc/da9150-gpadc.c | 409 +++++++
drivers/mfd/Kconfig | 12 +
drivers/mfd/Makefile | 2 +-
drivers/mfd/da9150-core.c | 413 +++++++
drivers/power/Kconfig | 12 +
drivers/power/Makefile | 1 +
drivers/power/da9150-charger.c | 666 +++++++++++
include/linux/mfd/da9150/core.h | 68 ++
include/linux/mfd/da9150/registers.h | 1155 ++++++++++++++++++++
15 files changed, 2836 insertions(+), 1 deletion(-)
create mode 100644 Documentation/devicetree/bindings/iio/adc/da9150-gpadc.txt
create mode 100644 Documentation/devicetree/bindings/mfd/da9150.txt
create mode 100644 Documentation/devicetree/bindings/power/da9150-charger.txt
create mode 100644 drivers/iio/adc/da9150-gpadc.c
create mode 100644 drivers/mfd/da9150-core.c
create mode 100644 drivers/power/da9150-charger.c
create mode 100644 include/linux/mfd/da9150/core.h
create mode 100644 include/linux/mfd/da9150/registers.h
--
1.9.3
^ permalink raw reply [flat|nested] 20+ messages in thread* [PATCH v5 1/7] mfd: Add support for DA9150 combined charger & fuel-gauge device 2014-12-22 16:50 [PATCH v5 0/7] Add initial support for DA9150 Charger & Fuel-Gauge IC Adam Thomson @ 2014-12-22 16:51 ` Adam Thomson 2015-01-19 11:33 ` Lee Jones 2014-12-22 16:51 ` [PATCH v5 2/7] mfd: da9150: Add DT binding documentation for core Adam Thomson ` (5 subsequent siblings) 6 siblings, 1 reply; 20+ messages in thread From: Adam Thomson @ 2014-12-22 16:51 UTC (permalink / raw) To: Lee Jones, Samuel Ortiz, Jonathan Cameron, Hartmut Knaack, linux-iio, Sebastian Reichel, Dmitry Eremin-Solenikov, David Woodhouse, linux-pm, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Grant Likely, devicetree, Andrew Morton, Joe Perches Cc: linux-kernel, support.opensource DA9150 is a combined Charger and Fuel-Gauge IC, with additional GPIO and GPADC functionality. Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> --- drivers/mfd/Kconfig | 12 + drivers/mfd/Makefile | 2 +- drivers/mfd/da9150-core.c | 413 ++++++++++++ include/linux/mfd/da9150/core.h | 68 ++ include/linux/mfd/da9150/registers.h | 1155 ++++++++++++++++++++++++++++++++++ 5 files changed, 1649 insertions(+), 1 deletion(-) create mode 100644 drivers/mfd/da9150-core.c create mode 100644 include/linux/mfd/da9150/core.h create mode 100644 include/linux/mfd/da9150/registers.h diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 2e6b731..56e80d2 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -195,6 +195,18 @@ config MFD_DA9063 Additional drivers must be enabled in order to use the functionality of the device. +config MFD_DA9150 + tristate "Dialog Semiconductor DA9150 Charger Fuel-Gauge chip" + depends on I2C=y + select MFD_CORE + select REGMAP_I2C + select REGMAP_IRQ + help + This adds support for the DA9150 integrated charger and fuel-gauge + chip. This driver provides common support for accessing the device. + Additional drivers must be enabled in order to use the specific + features of the device. + config MFD_DLN2 tristate "Diolan DLN2 support" select MFD_CORE diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 53467e2..f06f4c6 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -113,7 +113,7 @@ obj-$(CONFIG_MFD_DA9055) += da9055.o da9063-objs := da9063-core.o da9063-irq.o da9063-i2c.o obj-$(CONFIG_MFD_DA9063) += da9063.o - +obj-$(CONFIG_MFD_DA9150) += da9150-core.o obj-$(CONFIG_MFD_MAX14577) += max14577.o obj-$(CONFIG_MFD_MAX77686) += max77686.o obj-$(CONFIG_MFD_MAX77693) += max77693.o diff --git a/drivers/mfd/da9150-core.c b/drivers/mfd/da9150-core.c new file mode 100644 index 0000000..4d757b9 --- /dev/null +++ b/drivers/mfd/da9150-core.c @@ -0,0 +1,413 @@ +/* + * DA9150 Core MFD Driver + * + * Copyright (c) 2014 Dialog Semiconductor + * + * Author: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> + * + * 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. + */ + +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/i2c.h> +#include <linux/regmap.h> +#include <linux/slab.h> +#include <linux/irq.h> +#include <linux/interrupt.h> +#include <linux/mfd/core.h> +#include <linux/mfd/da9150/core.h> +#include <linux/mfd/da9150/registers.h> + +static bool da9150_volatile_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case DA9150_PAGE_CON: + case DA9150_STATUS_A: + case DA9150_STATUS_B: + case DA9150_STATUS_C: + case DA9150_STATUS_D: + case DA9150_STATUS_E: + case DA9150_STATUS_F: + case DA9150_STATUS_G: + case DA9150_STATUS_H: + case DA9150_STATUS_I: + case DA9150_STATUS_J: + case DA9150_STATUS_K: + case DA9150_STATUS_L: + case DA9150_STATUS_N: + case DA9150_FAULT_LOG_A: + case DA9150_FAULT_LOG_B: + case DA9150_EVENT_E: + case DA9150_EVENT_F: + case DA9150_EVENT_G: + case DA9150_EVENT_H: + case DA9150_CONTROL_B: + case DA9150_CONTROL_C: + case DA9150_GPADC_MAN: + case DA9150_GPADC_RES_A: + case DA9150_GPADC_RES_B: + case DA9150_ADETVB_CFG_C: + case DA9150_ADETD_STAT: + case DA9150_ADET_CMPSTAT: + case DA9150_ADET_CTRL_A: + case DA9150_PPR_TCTR_B: + case DA9150_COREBTLD_STAT_A: + case DA9150_CORE_DATA_A: + case DA9150_CORE_DATA_B: + case DA9150_CORE_DATA_C: + case DA9150_CORE_DATA_D: + case DA9150_CORE2WIRE_STAT_A: + case DA9150_FW_CTRL_C: + case DA9150_FG_CTRL_B: + case DA9150_FW_CTRL_B: + case DA9150_GPADC_CMAN: + case DA9150_GPADC_CRES_A: + case DA9150_GPADC_CRES_B: + case DA9150_CC_ICHG_RES_A: + case DA9150_CC_ICHG_RES_B: + case DA9150_CC_IAVG_RES_A: + case DA9150_CC_IAVG_RES_B: + case DA9150_TAUX_CTRL_A: + case DA9150_TAUX_VALUE_H: + case DA9150_TAUX_VALUE_L: + case DA9150_TBAT_RES_A: + case DA9150_TBAT_RES_B: + return true; + default: + return false; + } +} + +static const struct regmap_range_cfg da9150_range_cfg[] = { + { + .range_min = DA9150_PAGE_CON, + .range_max = DA9150_TBAT_RES_B, + .selector_reg = DA9150_PAGE_CON, + .selector_mask = DA9150_I2C_PAGE_MASK, + .selector_shift = DA9150_I2C_PAGE_SHIFT, + .window_start = 0, + .window_len = 256, + }, +}; + +static struct regmap_config da9150_regmap_config = { + .reg_bits = 8, + .val_bits = 8, + .ranges = da9150_range_cfg, + .num_ranges = ARRAY_SIZE(da9150_range_cfg), + .max_register = DA9150_TBAT_RES_B, + + .cache_type = REGCACHE_RBTREE, + + .volatile_reg = da9150_volatile_reg, +}; + +u8 da9150_reg_read(struct da9150 *da9150, u16 reg) +{ + int val, ret; + + ret = regmap_read(da9150->regmap, reg, &val); + if (ret) + dev_err(da9150->dev, "Failed to read from reg 0x%x: %d\n", + reg, ret); + + return (u8) val; +} +EXPORT_SYMBOL_GPL(da9150_reg_read); + +void da9150_reg_write(struct da9150 *da9150, u16 reg, u8 val) +{ + int ret; + + ret = regmap_write(da9150->regmap, reg, val); + if (ret) + dev_err(da9150->dev, "Failed to write to reg 0x%x: %d\n", + reg, ret); +} +EXPORT_SYMBOL_GPL(da9150_reg_write); + +void da9150_set_bits(struct da9150 *da9150, u16 reg, u8 mask, u8 val) +{ + int ret; + + ret = regmap_update_bits(da9150->regmap, reg, mask, val); + if (ret) + dev_err(da9150->dev, "Failed to set bits in reg 0x%x: %d\n", + reg, ret); +} +EXPORT_SYMBOL_GPL(da9150_set_bits); + +void da9150_bulk_read(struct da9150 *da9150, u16 reg, int count, u8 *buf) +{ + int ret; + + ret = regmap_bulk_read(da9150->regmap, reg, buf, count); + if (ret) + dev_err(da9150->dev, "Failed to bulk read from reg 0x%x: %d\n", + reg, ret); +} +EXPORT_SYMBOL_GPL(da9150_bulk_read); + +void da9150_bulk_write(struct da9150 *da9150, u16 reg, int count, const u8 *buf) +{ + int ret; + + ret = regmap_raw_write(da9150->regmap, reg, buf, count); + if (ret) + dev_err(da9150->dev, "Failed to bulk write to reg 0x%x %d\n", + reg, ret); +} +EXPORT_SYMBOL_GPL(da9150_bulk_write); + +static struct regmap_irq da9150_irqs[] = { + [DA9150_IRQ_VBUS] = { + .reg_offset = 0, + .mask = DA9150_E_VBUS_MASK, + }, + [DA9150_IRQ_CHG] = { + .reg_offset = 0, + .mask = DA9150_E_CHG_MASK, + }, + [DA9150_IRQ_TCLASS] = { + .reg_offset = 0, + .mask = DA9150_E_TCLASS_MASK, + }, + [DA9150_IRQ_TJUNC] = { + .reg_offset = 0, + .mask = DA9150_E_TJUNC_MASK, + }, + [DA9150_IRQ_VFAULT] = { + .reg_offset = 0, + .mask = DA9150_E_VFAULT_MASK, + }, + [DA9150_IRQ_CONF] = { + .reg_offset = 1, + .mask = DA9150_E_CONF_MASK, + }, + [DA9150_IRQ_DAT] = { + .reg_offset = 1, + .mask = DA9150_E_DAT_MASK, + }, + [DA9150_IRQ_DTYPE] = { + .reg_offset = 1, + .mask = DA9150_E_DTYPE_MASK, + }, + [DA9150_IRQ_ID] = { + .reg_offset = 1, + .mask = DA9150_E_ID_MASK, + }, + [DA9150_IRQ_ADP] = { + .reg_offset = 1, + .mask = DA9150_E_ADP_MASK, + }, + [DA9150_IRQ_SESS_END] = { + .reg_offset = 1, + .mask = DA9150_E_SESS_END_MASK, + }, + [DA9150_IRQ_SESS_VLD] = { + .reg_offset = 1, + .mask = DA9150_E_SESS_VLD_MASK, + }, + [DA9150_IRQ_FG] = { + .reg_offset = 2, + .mask = DA9150_E_FG_MASK, + }, + [DA9150_IRQ_GP] = { + .reg_offset = 2, + .mask = DA9150_E_GP_MASK, + }, + [DA9150_IRQ_TBAT] = { + .reg_offset = 2, + .mask = DA9150_E_TBAT_MASK, + }, + [DA9150_IRQ_GPIOA] = { + .reg_offset = 2, + .mask = DA9150_E_GPIOA_MASK, + }, + [DA9150_IRQ_GPIOB] = { + .reg_offset = 2, + .mask = DA9150_E_GPIOB_MASK, + }, + [DA9150_IRQ_GPIOC] = { + .reg_offset = 2, + .mask = DA9150_E_GPIOC_MASK, + }, + [DA9150_IRQ_GPIOD] = { + .reg_offset = 2, + .mask = DA9150_E_GPIOD_MASK, + }, + [DA9150_IRQ_GPADC] = { + .reg_offset = 2, + .mask = DA9150_E_GPADC_MASK, + }, + [DA9150_IRQ_WKUP] = { + .reg_offset = 3, + .mask = DA9150_E_WKUP_MASK, + }, +}; + +static struct regmap_irq_chip da9150_regmap_irq_chip = { + .name = "da9150_irq", + .status_base = DA9150_EVENT_E, + .mask_base = DA9150_IRQ_MASK_E, + .ack_base = DA9150_EVENT_E, + .num_regs = DA9150_NUM_IRQ_REGS, + .irqs = da9150_irqs, + .num_irqs = ARRAY_SIZE(da9150_irqs), +}; + +static struct resource da9150_gpadc_resources[] = { + { + .name = "GPADC", + .start = DA9150_IRQ_GPADC, + .end = DA9150_IRQ_GPADC, + .flags = IORESOURCE_IRQ, + }, +}; + +static struct resource da9150_charger_resources[] = { + { + .name = "CHG_STATUS", + .start = DA9150_IRQ_CHG, + .end = DA9150_IRQ_CHG, + .flags = IORESOURCE_IRQ, + }, + { + .name = "CHG_TJUNC", + .start = DA9150_IRQ_TJUNC, + .end = DA9150_IRQ_TJUNC, + .flags = IORESOURCE_IRQ, + }, + { + .name = "CHG_VFAULT", + .start = DA9150_IRQ_VFAULT, + .end = DA9150_IRQ_VFAULT, + .flags = IORESOURCE_IRQ, + }, + { + .name = "CHG_VBUS", + .start = DA9150_IRQ_VBUS, + .end = DA9150_IRQ_VBUS, + .flags = IORESOURCE_IRQ, + }, +}; + +static struct mfd_cell da9150_devs[] = { + { + .name = "da9150-gpadc", + .of_compatible = "dlg,da9150-gpadc", + .resources = da9150_gpadc_resources, + .num_resources = ARRAY_SIZE(da9150_gpadc_resources), + }, + { + .name = "da9150-charger", + .of_compatible = "dlg,da9150-charger", + .resources = da9150_charger_resources, + .num_resources = ARRAY_SIZE(da9150_charger_resources), + }, +}; + +static int da9150_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + struct da9150 *da9150; + struct da9150_pdata *pdata = dev_get_platdata(&client->dev); + int ret; + + da9150 = devm_kzalloc(&client->dev, sizeof(*da9150), GFP_KERNEL); + if (!da9150) + return -ENOMEM; + + da9150->dev = &client->dev; + da9150->irq = client->irq; + i2c_set_clientdata(client, da9150); + + da9150->regmap = devm_regmap_init_i2c(client, &da9150_regmap_config); + if (IS_ERR(da9150->regmap)) { + ret = PTR_ERR(da9150->regmap); + dev_err(da9150->dev, "Failed to allocate register map: %d\n", + ret); + return ret; + } + + da9150->irq_base = pdata ? pdata->irq_base : -1; + + ret = regmap_add_irq_chip(da9150->regmap, da9150->irq, + IRQF_TRIGGER_LOW | IRQF_ONESHOT, + da9150->irq_base, &da9150_regmap_irq_chip, + &da9150->regmap_irq_data); + if (ret) + return ret; + + da9150->irq_base = regmap_irq_chip_get_base(da9150->regmap_irq_data); + enable_irq_wake(da9150->irq); + + ret = mfd_add_devices(da9150->dev, -1, da9150_devs, + ARRAY_SIZE(da9150_devs), NULL, + da9150->irq_base, NULL); + if (ret) { + dev_err(da9150->dev, "Failed to add child devices: %d\n", ret); + regmap_del_irq_chip(da9150->irq, da9150->regmap_irq_data); + return ret; + } + + return 0; +} + +static int da9150_remove(struct i2c_client *client) +{ + struct da9150 *da9150 = i2c_get_clientdata(client); + + regmap_del_irq_chip(da9150->irq, da9150->regmap_irq_data); + mfd_remove_devices(da9150->dev); + + return 0; +} + +static void da9150_shutdown(struct i2c_client *client) +{ + struct da9150 *da9150 = i2c_get_clientdata(client); + + /* Make sure we have a wakup source for the device */ + da9150_set_bits(da9150, DA9150_CONFIG_D, + DA9150_WKUP_PM_EN_MASK, + DA9150_WKUP_PM_EN_MASK); + + /* Set device to DISABLED mode */ + da9150_set_bits(da9150, DA9150_CONTROL_C, + DA9150_DISABLE_MASK, DA9150_DISABLE_MASK); +} + +static const struct i2c_device_id da9150_i2c_id[] = { + { "da9150", }, + { } +}; +MODULE_DEVICE_TABLE(i2c, da9150_i2c_id); + +static const struct of_device_id da9150_of_match[] = { + { .compatible = "dlg,da9150", }, + { } +}; +MODULE_DEVICE_TABLE(of, da9150_of_match); + +static struct i2c_driver da9150_driver = { + .driver = { + .name = "da9150", + .of_match_table = of_match_ptr(da9150_of_match), + }, + .probe = da9150_probe, + .remove = da9150_remove, + .shutdown = da9150_shutdown, + .id_table = da9150_i2c_id, +}; + +module_i2c_driver(da9150_driver); + +MODULE_DESCRIPTION("MFD Core Driver for DA9150"); +MODULE_AUTHOR("Adam Thomson <Adam.Thomson.Opensource@diasemi.com>"); +MODULE_LICENSE("GPL"); diff --git a/include/linux/mfd/da9150/core.h b/include/linux/mfd/da9150/core.h new file mode 100644 index 0000000..76e6689 --- /dev/null +++ b/include/linux/mfd/da9150/core.h @@ -0,0 +1,68 @@ +/* + * DA9150 MFD Driver - Core Data + * + * Copyright (c) 2014 Dialog Semiconductor + * + * Author: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> + * + * 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. + */ + +#ifndef __DA9150_CORE_H +#define __DA9150_CORE_H + +#include <linux/device.h> +#include <linux/interrupt.h> +#include <linux/regmap.h> + +/* I2C address paging */ +#define DA9150_REG_PAGE_SHIFT 8 +#define DA9150_REG_PAGE_MASK 0xFF + +/* IRQs */ +#define DA9150_NUM_IRQ_REGS 4 +#define DA9150_IRQ_VBUS 0 +#define DA9150_IRQ_CHG 1 +#define DA9150_IRQ_TCLASS 2 +#define DA9150_IRQ_TJUNC 3 +#define DA9150_IRQ_VFAULT 4 +#define DA9150_IRQ_CONF 5 +#define DA9150_IRQ_DAT 6 +#define DA9150_IRQ_DTYPE 7 +#define DA9150_IRQ_ID 8 +#define DA9150_IRQ_ADP 9 +#define DA9150_IRQ_SESS_END 10 +#define DA9150_IRQ_SESS_VLD 11 +#define DA9150_IRQ_FG 12 +#define DA9150_IRQ_GP 13 +#define DA9150_IRQ_TBAT 14 +#define DA9150_IRQ_GPIOA 15 +#define DA9150_IRQ_GPIOB 16 +#define DA9150_IRQ_GPIOC 17 +#define DA9150_IRQ_GPIOD 18 +#define DA9150_IRQ_GPADC 19 +#define DA9150_IRQ_WKUP 20 + +struct da9150_pdata { + int irq_base; +}; + +struct da9150 { + struct device *dev; + struct regmap *regmap; + struct regmap_irq_chip_data *regmap_irq_data; + int irq; + int irq_base; +}; + +/* Device I/O */ +u8 da9150_reg_read(struct da9150 *da9150, u16 reg); +void da9150_reg_write(struct da9150 *da9150, u16 reg, u8 val); +void da9150_set_bits(struct da9150 *da9150, u16 reg, u8 mask, u8 val); + +void da9150_bulk_read(struct da9150 *da9150, u16 reg, int count, u8 *buf); +void da9150_bulk_write(struct da9150 *da9150, u16 reg, int count, const u8 *buf); +#endif /* __DA9150_CORE_H */ diff --git a/include/linux/mfd/da9150/registers.h b/include/linux/mfd/da9150/registers.h new file mode 100644 index 0000000..27ca6ee --- /dev/null +++ b/include/linux/mfd/da9150/registers.h @@ -0,0 +1,1155 @@ +/* + * DA9150 MFD Driver - Registers + * + * Copyright (c) 2014 Dialog Semiconductor + * + * Author: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> + * + * 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. + */ + +#ifndef __DA9150_REGISTERS_H +#define __DA9150_REGISTERS_H + +#include <linux/bitops.h> + +/* Registers */ +#define DA9150_PAGE_CON 0x000 +#define DA9150_STATUS_A 0x068 +#define DA9150_STATUS_B 0x069 +#define DA9150_STATUS_C 0x06A +#define DA9150_STATUS_D 0x06B +#define DA9150_STATUS_E 0x06C +#define DA9150_STATUS_F 0x06D +#define DA9150_STATUS_G 0x06E +#define DA9150_STATUS_H 0x06F +#define DA9150_STATUS_I 0x070 +#define DA9150_STATUS_J 0x071 +#define DA9150_STATUS_K 0x072 +#define DA9150_STATUS_L 0x073 +#define DA9150_STATUS_N 0x074 +#define DA9150_FAULT_LOG_A 0x076 +#define DA9150_FAULT_LOG_B 0x077 +#define DA9150_EVENT_E 0x078 +#define DA9150_EVENT_F 0x079 +#define DA9150_EVENT_G 0x07A +#define DA9150_EVENT_H 0x07B +#define DA9150_IRQ_MASK_E 0x07C +#define DA9150_IRQ_MASK_F 0x07D +#define DA9150_IRQ_MASK_G 0x07E +#define DA9150_IRQ_MASK_H 0x07F +#define DA9150_PAGE_CON_1 0x080 +#define DA9150_CONFIG_A 0x0E0 +#define DA9150_CONFIG_B 0x0E1 +#define DA9150_CONFIG_C 0x0E2 +#define DA9150_CONFIG_D 0x0E3 +#define DA9150_CONFIG_E 0x0E4 +#define DA9150_CONTROL_A 0x0E5 +#define DA9150_CONTROL_B 0x0E6 +#define DA9150_CONTROL_C 0x0E7 +#define DA9150_GPIO_A_B 0x0E8 +#define DA9150_GPIO_C_D 0x0E9 +#define DA9150_GPIO_MODE_CONT 0x0EA +#define DA9150_GPIO_CTRL_B 0x0EB +#define DA9150_GPIO_CTRL_A 0x0EC +#define DA9150_GPIO_CTRL_C 0x0ED +#define DA9150_GPIO_CFG_A 0x0EE +#define DA9150_GPIO_CFG_B 0x0EF +#define DA9150_GPIO_CFG_C 0x0F0 +#define DA9150_GPADC_MAN 0x0F2 +#define DA9150_GPADC_RES_A 0x0F4 +#define DA9150_GPADC_RES_B 0x0F5 +#define DA9150_PAGE_CON_2 0x100 +#define DA9150_OTP_CONT_SHARED 0x101 +#define DA9150_INTERFACE_SHARED 0x105 +#define DA9150_CONFIG_A_SHARED 0x106 +#define DA9150_CONFIG_D_SHARED 0x109 +#define DA9150_ADETVB_CFG_C 0x150 +#define DA9150_ADETD_STAT 0x151 +#define DA9150_ADET_CMPSTAT 0x152 +#define DA9150_ADET_CTRL_A 0x153 +#define DA9150_ADETVB_CFG_B 0x154 +#define DA9150_ADETVB_CFG_A 0x155 +#define DA9150_ADETAC_CFG_A 0x156 +#define DA9150_ADDETAC_CFG_B 0x157 +#define DA9150_ADETAC_CFG_C 0x158 +#define DA9150_ADETAC_CFG_D 0x159 +#define DA9150_ADETVB_CFG_D 0x15A +#define DA9150_ADETID_CFG_A 0x15B +#define DA9150_ADET_RID_PT_CHG_H 0x15C +#define DA9150_ADET_RID_PT_CHG_L 0x15D +#define DA9150_PPR_TCTR_B 0x160 +#define DA9150_PPR_BKCTRL_A 0x163 +#define DA9150_PPR_BKCFG_A 0x164 +#define DA9150_PPR_BKCFG_B 0x165 +#define DA9150_PPR_CHGCTRL_A 0x166 +#define DA9150_PPR_CHGCTRL_B 0x167 +#define DA9150_PPR_CHGCTRL_C 0x168 +#define DA9150_PPR_TCTR_A 0x169 +#define DA9150_PPR_CHGCTRL_D 0x16A +#define DA9150_PPR_CHGCTRL_E 0x16B +#define DA9150_PPR_CHGCTRL_F 0x16C +#define DA9150_PPR_CHGCTRL_G 0x16D +#define DA9150_PPR_CHGCTRL_H 0x16E +#define DA9150_PPR_CHGCTRL_I 0x16F +#define DA9150_PPR_CHGCTRL_J 0x170 +#define DA9150_PPR_CHGCTRL_K 0x171 +#define DA9150_PPR_CHGCTRL_L 0x172 +#define DA9150_PPR_CHGCTRL_M 0x173 +#define DA9150_PPR_THYST_A 0x174 +#define DA9150_PPR_THYST_B 0x175 +#define DA9150_PPR_THYST_C 0x176 +#define DA9150_PPR_THYST_D 0x177 +#define DA9150_PPR_THYST_E 0x178 +#define DA9150_PPR_THYST_F 0x179 +#define DA9150_PPR_THYST_G 0x17A +#define DA9150_PAGE_CON_3 0x180 +#define DA9150_PAGE_CON_4 0x200 +#define DA9150_PAGE_CON_5 0x280 +#define DA9150_PAGE_CON_6 0x300 +#define DA9150_COREBTLD_STAT_A 0x302 +#define DA9150_COREBTLD_CTRL_A 0x303 +#define DA9150_CORE_CONFIG_A 0x304 +#define DA9150_CORE_CONFIG_C 0x305 +#define DA9150_CORE_CONFIG_B 0x306 +#define DA9150_CORE_CFG_DATA_A 0x307 +#define DA9150_CORE_CFG_DATA_B 0x308 +#define DA9150_CORE_CMD_A 0x309 +#define DA9150_CORE_DATA_A 0x30A +#define DA9150_CORE_DATA_B 0x30B +#define DA9150_CORE_DATA_C 0x30C +#define DA9150_CORE_DATA_D 0x30D +#define DA9150_CORE2WIRE_STAT_A 0x310 +#define DA9150_CORE2WIRE_CTRL_A 0x311 +#define DA9150_FW_CTRL_A 0x312 +#define DA9150_FW_CTRL_C 0x313 +#define DA9150_FW_CTRL_D 0x314 +#define DA9150_FG_CTRL_A 0x315 +#define DA9150_FG_CTRL_B 0x316 +#define DA9150_FW_CTRL_E 0x317 +#define DA9150_FW_CTRL_B 0x318 +#define DA9150_GPADC_CMAN 0x320 +#define DA9150_GPADC_CRES_A 0x322 +#define DA9150_GPADC_CRES_B 0x323 +#define DA9150_CC_CFG_A 0x328 +#define DA9150_CC_CFG_B 0x329 +#define DA9150_CC_ICHG_RES_A 0x32A +#define DA9150_CC_ICHG_RES_B 0x32B +#define DA9150_CC_IAVG_RES_A 0x32C +#define DA9150_CC_IAVG_RES_B 0x32D +#define DA9150_TAUX_CTRL_A 0x330 +#define DA9150_TAUX_RELOAD_H 0x332 +#define DA9150_TAUX_RELOAD_L 0x333 +#define DA9150_TAUX_VALUE_H 0x334 +#define DA9150_TAUX_VALUE_L 0x335 +#define DA9150_AUX_DATA_0 0x338 +#define DA9150_AUX_DATA_1 0x339 +#define DA9150_AUX_DATA_2 0x33A +#define DA9150_AUX_DATA_3 0x33B +#define DA9150_BIF_CTRL 0x340 +#define DA9150_TBAT_CTRL_A 0x342 +#define DA9150_TBAT_CTRL_B 0x343 +#define DA9150_TBAT_RES_A 0x344 +#define DA9150_TBAT_RES_B 0x345 + +/* DA9150_PAGE_CON = 0x000 */ +#define DA9150_PAGE_SHIFT 0 +#define DA9150_PAGE_MASK (0x3f << 0) +#define DA9150_I2C_PAGE_SHIFT 1 +#define DA9150_I2C_PAGE_MASK (0x1f << 1) +#define DA9150_WRITE_MODE_SHIFT 6 +#define DA9150_WRITE_MODE_MASK BIT(6) +#define DA9150_REVERT_SHIFT 7 +#define DA9150_REVERT_MASK BIT(7) + +/* DA9150_STATUS_A = 0x068 */ +#define DA9150_WKUP_STAT_SHIFT 2 +#define DA9150_WKUP_STAT_MASK (0x0f << 2) +#define DA9150_SLEEP_STAT_SHIFT 6 +#define DA9150_SLEEP_STAT_MASK (0x03 << 6) + +/* DA9150_STATUS_B = 0x069 */ +#define DA9150_VFAULT_STAT_SHIFT 0 +#define DA9150_VFAULT_STAT_MASK BIT(0) +#define DA9150_TFAULT_STAT_SHIFT 1 +#define DA9150_TFAULT_STAT_MASK BIT(1) + +/* DA9150_STATUS_C = 0x06A */ +#define DA9150_VDD33_STAT_SHIFT 0 +#define DA9150_VDD33_STAT_MASK BIT(0) +#define DA9150_VDD33_SLEEP_SHIFT 1 +#define DA9150_VDD33_SLEEP_MASK BIT(1) +#define DA9150_LFOSC_STAT_SHIFT 7 +#define DA9150_LFOSC_STAT_MASK BIT(7) + +/* DA9150_STATUS_D = 0x06B */ +#define DA9150_GPIOA_STAT_SHIFT 0 +#define DA9150_GPIOA_STAT_MASK BIT(0) +#define DA9150_GPIOB_STAT_SHIFT 1 +#define DA9150_GPIOB_STAT_MASK BIT(1) +#define DA9150_GPIOC_STAT_SHIFT 2 +#define DA9150_GPIOC_STAT_MASK BIT(2) +#define DA9150_GPIOD_STAT_SHIFT 3 +#define DA9150_GPIOD_STAT_MASK BIT(3) + +/* DA9150_STATUS_E = 0x06C */ +#define DA9150_DTYPE_SHIFT 0 +#define DA9150_DTYPE_MASK (0x1f << 0) +#define DA9150_DTYPE_DT_NIL (0x00 << 0) +#define DA9150_DTYPE_DT_USB_OTG BIT(0) +#define DA9150_DTYPE_DT_USB_STD (0x02 << 0) +#define DA9150_DTYPE_DT_USB_CHG (0x03 << 0) +#define DA9150_DTYPE_DT_ACA_CHG (0x04 << 0) +#define DA9150_DTYPE_DT_ACA_OTG (0x05 << 0) +#define DA9150_DTYPE_DT_ACA_DOC (0x06 << 0) +#define DA9150_DTYPE_DT_DED_CHG (0x07 << 0) +#define DA9150_DTYPE_DT_CR5_CHG (0x08 << 0) +#define DA9150_DTYPE_DT_CR4_CHG (0x0c << 0) +#define DA9150_DTYPE_DT_PT_CHG (0x11 << 0) +#define DA9150_DTYPE_DT_NN_ACC (0x16 << 0) +#define DA9150_DTYPE_DT_NN_CHG (0x17 << 0) + +/* DA9150_STATUS_F = 0x06D */ +#define DA9150_SESS_VLD_SHIFT 0 +#define DA9150_SESS_VLD_MASK BIT(0) +#define DA9150_ID_ERR_SHIFT 1 +#define DA9150_ID_ERR_MASK BIT(1) +#define DA9150_PT_CHG_SHIFT 2 +#define DA9150_PT_CHG_MASK BIT(2) + +/* DA9150_STATUS_G = 0x06E */ +#define DA9150_RID_SHIFT 0 +#define DA9150_RID_MASK (0xff << 0) + +/* DA9150_STATUS_H = 0x06F */ +#define DA9150_VBUS_STAT_SHIFT 0 +#define DA9150_VBUS_STAT_MASK (0x07 << 0) +#define DA9150_VBUS_STAT_OFF (0x00 << 0) +#define DA9150_VBUS_STAT_WAIT BIT(0) +#define DA9150_VBUS_STAT_CHG (0x02 << 0) +#define DA9150_VBUS_TRED_SHIFT 3 +#define DA9150_VBUS_TRED_MASK BIT(3) +#define DA9150_VBUS_DROP_STAT_SHIFT 4 +#define DA9150_VBUS_DROP_STAT_MASK (0x0f << 4) + +/* DA9150_STATUS_I = 0x070 */ +#define DA9150_VBUS_ISET_STAT_SHIFT 0 +#define DA9150_VBUS_ISET_STAT_MASK (0x1f << 0) +#define DA9150_VBUS_OT_SHIFT 7 +#define DA9150_VBUS_OT_MASK BIT(7) + +/* DA9150_STATUS_J = 0x071 */ +#define DA9150_CHG_STAT_SHIFT 0 +#define DA9150_CHG_STAT_MASK (0x0f << 0) +#define DA9150_CHG_STAT_OFF (0x00 << 0) +#define DA9150_CHG_STAT_SUSP BIT(0) +#define DA9150_CHG_STAT_ACT (0x02 << 0) +#define DA9150_CHG_STAT_PRE (0x03 << 0) +#define DA9150_CHG_STAT_CC (0x04 << 0) +#define DA9150_CHG_STAT_CV (0x05 << 0) +#define DA9150_CHG_STAT_FULL (0x06 << 0) +#define DA9150_CHG_STAT_TEMP (0x07 << 0) +#define DA9150_CHG_STAT_TIME (0x08 << 0) +#define DA9150_CHG_STAT_BAT (0x09 << 0) +#define DA9150_CHG_TEMP_SHIFT 4 +#define DA9150_CHG_TEMP_MASK (0x07 << 4) +#define DA9150_CHG_TEMP_UNDER (0x06 << 4) +#define DA9150_CHG_TEMP_OVER (0x07 << 4) +#define DA9150_CHG_IEND_STAT_SHIFT 7 +#define DA9150_CHG_IEND_STAT_MASK BIT(7) + +/* DA9150_STATUS_K = 0x072 */ +#define DA9150_CHG_IAV_H_SHIFT 0 +#define DA9150_CHG_IAV_H_MASK (0xff << 0) + +/* DA9150_STATUS_L = 0x073 */ +#define DA9150_CHG_IAV_L_SHIFT 5 +#define DA9150_CHG_IAV_L_MASK (0x07 << 5) + +/* DA9150_STATUS_N = 0x074 */ +#define DA9150_CHG_TIME_SHIFT 1 +#define DA9150_CHG_TIME_MASK BIT(1) +#define DA9150_CHG_TRED_SHIFT 2 +#define DA9150_CHG_TRED_MASK BIT(2) +#define DA9150_CHG_TJUNC_CLASS_SHIFT 3 +#define DA9150_CHG_TJUNC_CLASS_MASK (0x07 << 3) +#define DA9150_CHG_TJUNC_CLASS_6 (0x06 << 3) +#define DA9150_EBS_STAT_SHIFT 6 +#define DA9150_EBS_STAT_MASK BIT(6) +#define DA9150_CHG_BAT_REMOVED_SHIFT 7 +#define DA9150_CHG_BAT_REMOVED_MASK BIT(7) + +/* DA9150_FAULT_LOG_A = 0x076 */ +#define DA9150_TEMP_FAULT_SHIFT 0 +#define DA9150_TEMP_FAULT_MASK BIT(0) +#define DA9150_VSYS_FAULT_SHIFT 1 +#define DA9150_VSYS_FAULT_MASK BIT(1) +#define DA9150_START_FAULT_SHIFT 2 +#define DA9150_START_FAULT_MASK BIT(2) +#define DA9150_EXT_FAULT_SHIFT 3 +#define DA9150_EXT_FAULT_MASK BIT(3) +#define DA9150_POR_FAULT_SHIFT 4 +#define DA9150_POR_FAULT_MASK BIT(4) + +/* DA9150_FAULT_LOG_B = 0x077 */ +#define DA9150_VBUS_FAULT_SHIFT 0 +#define DA9150_VBUS_FAULT_MASK BIT(0) +#define DA9150_OTG_FAULT_SHIFT 1 +#define DA9150_OTG_FAULT_MASK BIT(1) + +/* DA9150_EVENT_E = 0x078 */ +#define DA9150_E_VBUS_SHIFT 0 +#define DA9150_E_VBUS_MASK BIT(0) +#define DA9150_E_CHG_SHIFT 1 +#define DA9150_E_CHG_MASK BIT(1) +#define DA9150_E_TCLASS_SHIFT 2 +#define DA9150_E_TCLASS_MASK BIT(2) +#define DA9150_E_TJUNC_SHIFT 3 +#define DA9150_E_TJUNC_MASK BIT(3) +#define DA9150_E_VFAULT_SHIFT 4 +#define DA9150_E_VFAULT_MASK BIT(4) +#define DA9150_EVENTS_H_SHIFT 5 +#define DA9150_EVENTS_H_MASK BIT(5) +#define DA9150_EVENTS_G_SHIFT 6 +#define DA9150_EVENTS_G_MASK BIT(6) +#define DA9150_EVENTS_F_SHIFT 7 +#define DA9150_EVENTS_F_MASK BIT(7) + +/* DA9150_EVENT_F = 0x079 */ +#define DA9150_E_CONF_SHIFT 0 +#define DA9150_E_CONF_MASK BIT(0) +#define DA9150_E_DAT_SHIFT 1 +#define DA9150_E_DAT_MASK BIT(1) +#define DA9150_E_DTYPE_SHIFT 3 +#define DA9150_E_DTYPE_MASK BIT(3) +#define DA9150_E_ID_SHIFT 4 +#define DA9150_E_ID_MASK BIT(4) +#define DA9150_E_ADP_SHIFT 5 +#define DA9150_E_ADP_MASK BIT(5) +#define DA9150_E_SESS_END_SHIFT 6 +#define DA9150_E_SESS_END_MASK BIT(6) +#define DA9150_E_SESS_VLD_SHIFT 7 +#define DA9150_E_SESS_VLD_MASK BIT(7) + +/* DA9150_EVENT_G = 0x07A */ +#define DA9150_E_FG_SHIFT 0 +#define DA9150_E_FG_MASK BIT(0) +#define DA9150_E_GP_SHIFT 1 +#define DA9150_E_GP_MASK BIT(1) +#define DA9150_E_TBAT_SHIFT 2 +#define DA9150_E_TBAT_MASK BIT(2) +#define DA9150_E_GPIOA_SHIFT 3 +#define DA9150_E_GPIOA_MASK BIT(3) +#define DA9150_E_GPIOB_SHIFT 4 +#define DA9150_E_GPIOB_MASK BIT(4) +#define DA9150_E_GPIOC_SHIFT 5 +#define DA9150_E_GPIOC_MASK BIT(5) +#define DA9150_E_GPIOD_SHIFT 6 +#define DA9150_E_GPIOD_MASK BIT(6) +#define DA9150_E_GPADC_SHIFT 7 +#define DA9150_E_GPADC_MASK BIT(7) + +/* DA9150_EVENT_H = 0x07B */ +#define DA9150_E_WKUP_SHIFT 0 +#define DA9150_E_WKUP_MASK BIT(0) + +/* DA9150_IRQ_MASK_E = 0x07C */ +#define DA9150_M_VBUS_SHIFT 0 +#define DA9150_M_VBUS_MASK BIT(0) +#define DA9150_M_CHG_SHIFT 1 +#define DA9150_M_CHG_MASK BIT(1) +#define DA9150_M_TJUNC_SHIFT 3 +#define DA9150_M_TJUNC_MASK BIT(3) +#define DA9150_M_VFAULT_SHIFT 4 +#define DA9150_M_VFAULT_MASK BIT(4) + +/* DA9150_IRQ_MASK_F = 0x07D */ +#define DA9150_M_CONF_SHIFT 0 +#define DA9150_M_CONF_MASK BIT(0) +#define DA9150_M_DAT_SHIFT 1 +#define DA9150_M_DAT_MASK BIT(1) +#define DA9150_M_DTYPE_SHIFT 3 +#define DA9150_M_DTYPE_MASK BIT(3) +#define DA9150_M_ID_SHIFT 4 +#define DA9150_M_ID_MASK BIT(4) +#define DA9150_M_ADP_SHIFT 5 +#define DA9150_M_ADP_MASK BIT(5) +#define DA9150_M_SESS_END_SHIFT 6 +#define DA9150_M_SESS_END_MASK BIT(6) +#define DA9150_M_SESS_VLD_SHIFT 7 +#define DA9150_M_SESS_VLD_MASK BIT(7) + +/* DA9150_IRQ_MASK_G = 0x07E */ +#define DA9150_M_FG_SHIFT 0 +#define DA9150_M_FG_MASK BIT(0) +#define DA9150_M_GP_SHIFT 1 +#define DA9150_M_GP_MASK BIT(1) +#define DA9150_M_TBAT_SHIFT 2 +#define DA9150_M_TBAT_MASK BIT(2) +#define DA9150_M_GPIOA_SHIFT 3 +#define DA9150_M_GPIOA_MASK BIT(3) +#define DA9150_M_GPIOB_SHIFT 4 +#define DA9150_M_GPIOB_MASK BIT(4) +#define DA9150_M_GPIOC_SHIFT 5 +#define DA9150_M_GPIOC_MASK BIT(5) +#define DA9150_M_GPIOD_SHIFT 6 +#define DA9150_M_GPIOD_MASK BIT(6) +#define DA9150_M_GPADC_SHIFT 7 +#define DA9150_M_GPADC_MASK BIT(7) + +/* DA9150_IRQ_MASK_H = 0x07F */ +#define DA9150_M_WKUP_SHIFT 0 +#define DA9150_M_WKUP_MASK BIT(0) + +/* DA9150_PAGE_CON_1 = 0x080 */ +#define DA9150_PAGE_SHIFT 0 +#define DA9150_PAGE_MASK (0x3f << 0) +#define DA9150_WRITE_MODE_SHIFT 6 +#define DA9150_WRITE_MODE_MASK BIT(6) +#define DA9150_REVERT_SHIFT 7 +#define DA9150_REVERT_MASK BIT(7) + +/* DA9150_CONFIG_A = 0x0E0 */ +#define DA9150_RESET_DUR_SHIFT 0 +#define DA9150_RESET_DUR_MASK (0x03 << 0) +#define DA9150_RESET_EXT_SHIFT 2 +#define DA9150_RESET_EXT_MASK (0x03 << 2) +#define DA9150_START_MAX_SHIFT 4 +#define DA9150_START_MAX_MASK (0x03 << 4) +#define DA9150_PS_WAIT_EN_SHIFT 6 +#define DA9150_PS_WAIT_EN_MASK BIT(6) +#define DA9150_PS_DISABLE_DIRECT_SHIFT 7 +#define DA9150_PS_DISABLE_DIRECT_MASK BIT(7) + +/* DA9150_CONFIG_B = 0x0E1 */ +#define DA9150_VFAULT_ADJ_SHIFT 0 +#define DA9150_VFAULT_ADJ_MASK (0x0f << 0) +#define DA9150_VFAULT_HYST_SHIFT 4 +#define DA9150_VFAULT_HYST_MASK (0x07 << 4) +#define DA9150_VFAULT_EN_SHIFT 7 +#define DA9150_VFAULT_EN_MASK BIT(7) + +/* DA9150_CONFIG_C = 0x0E2 */ +#define DA9150_VSYS_MIN_SHIFT 3 +#define DA9150_VSYS_MIN_MASK (0x1f << 3) + +/* DA9150_CONFIG_D = 0x0E3 */ +#define DA9150_LFOSC_EXT_SHIFT 0 +#define DA9150_LFOSC_EXT_MASK BIT(0) +#define DA9150_VDD33_DWN_SHIFT 1 +#define DA9150_VDD33_DWN_MASK BIT(1) +#define DA9150_WKUP_PM_EN_SHIFT 2 +#define DA9150_WKUP_PM_EN_MASK BIT(2) +#define DA9150_WKUP_CE_SEL_SHIFT 3 +#define DA9150_WKUP_CE_SEL_MASK (0x03 << 3) +#define DA9150_WKUP_CLK32K_EN_SHIFT 5 +#define DA9150_WKUP_CLK32K_EN_MASK BIT(5) +#define DA9150_DISABLE_DEL_SHIFT 7 +#define DA9150_DISABLE_DEL_MASK BIT(7) + +/* DA9150_CONFIG_E = 0x0E4 */ +#define DA9150_PM_SPKSUP_DIS_SHIFT 0 +#define DA9150_PM_SPKSUP_DIS_MASK BIT(0) +#define DA9150_PM_MERGE_SHIFT 1 +#define DA9150_PM_MERGE_MASK BIT(1) +#define DA9150_PM_SR_OFF_SHIFT 2 +#define DA9150_PM_SR_OFF_MASK BIT(2) +#define DA9150_PM_TIMEOUT_EN_SHIFT 3 +#define DA9150_PM_TIMEOUT_EN_MASK BIT(3) +#define DA9150_PM_DLY_SEL_SHIFT 4 +#define DA9150_PM_DLY_SEL_MASK (0x07 << 4) +#define DA9150_PM_OUT_DLY_SEL_SHIFT 7 +#define DA9150_PM_OUT_DLY_SEL_MASK BIT(7) + +/* DA9150_CONTROL_A = 0x0E5 */ +#define DA9150_VDD33_SL_SHIFT 0 +#define DA9150_VDD33_SL_MASK BIT(0) +#define DA9150_VDD33_LPM_SHIFT 1 +#define DA9150_VDD33_LPM_MASK (0x03 << 1) +#define DA9150_VDD33_EN_SHIFT 3 +#define DA9150_VDD33_EN_MASK BIT(3) +#define DA9150_GPI_LPM_SHIFT 6 +#define DA9150_GPI_LPM_MASK BIT(6) +#define DA9150_PM_IF_LPM_SHIFT 7 +#define DA9150_PM_IF_LPM_MASK BIT(7) + +/* DA9150_CONTROL_B = 0x0E6 */ +#define DA9150_LPM_SHIFT 0 +#define DA9150_LPM_MASK BIT(0) +#define DA9150_RESET_SHIFT 1 +#define DA9150_RESET_MASK BIT(1) +#define DA9150_RESET_USRCONF_EN_SHIFT 2 +#define DA9150_RESET_USRCONF_EN_MASK BIT(2) + +/* DA9150_CONTROL_C = 0x0E7 */ +#define DA9150_DISABLE_SHIFT 0 +#define DA9150_DISABLE_MASK BIT(0) + +/* DA9150_GPIO_A_B = 0x0E8 */ +#define DA9150_GPIOA_PIN_SHIFT 0 +#define DA9150_GPIOA_PIN_MASK (0x07 << 0) +#define DA9150_GPIOA_PIN_GPI (0x00 << 0) +#define DA9150_GPIOA_PIN_GPO_OD BIT(0) +#define DA9150_GPIOA_TYPE_SHIFT 3 +#define DA9150_GPIOA_TYPE_MASK BIT(3) +#define DA9150_GPIOB_PIN_SHIFT 4 +#define DA9150_GPIOB_PIN_MASK (0x07 << 4) +#define DA9150_GPIOB_PIN_GPI (0x00 << 4) +#define DA9150_GPIOB_PIN_GPO_OD BIT(4) +#define DA9150_GPIOB_TYPE_SHIFT 7 +#define DA9150_GPIOB_TYPE_MASK BIT(7) + +/* DA9150_GPIO_C_D = 0x0E9 */ +#define DA9150_GPIOC_PIN_SHIFT 0 +#define DA9150_GPIOC_PIN_MASK (0x07 << 0) +#define DA9150_GPIOC_PIN_GPI (0x00 << 0) +#define DA9150_GPIOC_PIN_GPO_OD BIT(0) +#define DA9150_GPIOC_TYPE_SHIFT 3 +#define DA9150_GPIOC_TYPE_MASK BIT(3) +#define DA9150_GPIOD_PIN_SHIFT 4 +#define DA9150_GPIOD_PIN_MASK (0x07 << 4) +#define DA9150_GPIOD_PIN_GPI (0x00 << 4) +#define DA9150_GPIOD_PIN_GPO_OD BIT(4) +#define DA9150_GPIOD_TYPE_SHIFT 7 +#define DA9150_GPIOD_TYPE_MASK BIT(7) + +/* DA9150_GPIO_MODE_CONT = 0x0EA */ +#define DA9150_GPIOA_MODE_SHIFT 0 +#define DA9150_GPIOA_MODE_MASK BIT(0) +#define DA9150_GPIOB_MODE_SHIFT 1 +#define DA9150_GPIOB_MODE_MASK BIT(1) +#define DA9150_GPIOC_MODE_SHIFT 2 +#define DA9150_GPIOC_MODE_MASK BIT(2) +#define DA9150_GPIOD_MODE_SHIFT 3 +#define DA9150_GPIOD_MODE_MASK BIT(3) +#define DA9150_GPIOA_CONT_SHIFT 4 +#define DA9150_GPIOA_CONT_MASK BIT(4) +#define DA9150_GPIOB_CONT_SHIFT 5 +#define DA9150_GPIOB_CONT_MASK BIT(5) +#define DA9150_GPIOC_CONT_SHIFT 6 +#define DA9150_GPIOC_CONT_MASK BIT(6) +#define DA9150_GPIOD_CONT_SHIFT 7 +#define DA9150_GPIOD_CONT_MASK BIT(7) + +/* DA9150_GPIO_CTRL_B = 0x0EB */ +#define DA9150_WAKE_PIN_SHIFT 0 +#define DA9150_WAKE_PIN_MASK (0x03 << 0) +#define DA9150_WAKE_MODE_SHIFT 2 +#define DA9150_WAKE_MODE_MASK BIT(2) +#define DA9150_WAKE_CONT_SHIFT 3 +#define DA9150_WAKE_CONT_MASK BIT(3) +#define DA9150_WAKE_DLY_SHIFT 4 +#define DA9150_WAKE_DLY_MASK BIT(4) + +/* DA9150_GPIO_CTRL_A = 0x0EC */ +#define DA9150_GPIOA_ANAEN_SHIFT 0 +#define DA9150_GPIOA_ANAEN_MASK BIT(0) +#define DA9150_GPIOB_ANAEN_SHIFT 1 +#define DA9150_GPIOB_ANAEN_MASK BIT(1) +#define DA9150_GPIOC_ANAEN_SHIFT 2 +#define DA9150_GPIOC_ANAEN_MASK BIT(2) +#define DA9150_GPIOD_ANAEN_SHIFT 3 +#define DA9150_GPIOD_ANAEN_MASK BIT(3) +#define DA9150_GPIO_ANAEN 0x01 +#define DA9150_GPIO_ANAEN_MASK 0x0F +#define DA9150_CHGLED_PIN_SHIFT 5 +#define DA9150_CHGLED_PIN_MASK (0x07 << 5) + +/* DA9150_GPIO_CTRL_C = 0x0ED */ +#define DA9150_CHGBL_DUR_SHIFT 0 +#define DA9150_CHGBL_DUR_MASK (0x03 << 0) +#define DA9150_CHGBL_DBL_SHIFT 2 +#define DA9150_CHGBL_DBL_MASK BIT(2) +#define DA9150_CHGBL_FRQ_SHIFT 3 +#define DA9150_CHGBL_FRQ_MASK (0x03 << 3) +#define DA9150_CHGBL_FLKR_SHIFT 5 +#define DA9150_CHGBL_FLKR_MASK BIT(5) + +/* DA9150_GPIO_CFG_A = 0x0EE */ +#define DA9150_CE_LPM_DEB_SHIFT 0 +#define DA9150_CE_LPM_DEB_MASK (0x07 << 0) + +/* DA9150_GPIO_CFG_B = 0x0EF */ +#define DA9150_GPIOA_PUPD_SHIFT 0 +#define DA9150_GPIOA_PUPD_MASK BIT(0) +#define DA9150_GPIOB_PUPD_SHIFT 1 +#define DA9150_GPIOB_PUPD_MASK BIT(1) +#define DA9150_GPIOC_PUPD_SHIFT 2 +#define DA9150_GPIOC_PUPD_MASK BIT(2) +#define DA9150_GPIOD_PUPD_SHIFT 3 +#define DA9150_GPIOD_PUPD_MASK BIT(3) +#define DA9150_GPIO_PUPD_MASK (0xF << 0) +#define DA9150_GPI_DEB_SHIFT 4 +#define DA9150_GPI_DEB_MASK (0x07 << 4) +#define DA9150_LPM_EN_SHIFT 7 +#define DA9150_LPM_EN_MASK BIT(7) + +/* DA9150_GPIO_CFG_C = 0x0F0 */ +#define DA9150_GPI_V_SHIFT 0 +#define DA9150_GPI_V_MASK BIT(0) +#define DA9150_VDDIO_INT_SHIFT 1 +#define DA9150_VDDIO_INT_MASK BIT(1) +#define DA9150_FAULT_PIN_SHIFT 3 +#define DA9150_FAULT_PIN_MASK (0x07 << 3) +#define DA9150_FAULT_TYPE_SHIFT 6 +#define DA9150_FAULT_TYPE_MASK BIT(6) +#define DA9150_NIRQ_PUPD_SHIFT 7 +#define DA9150_NIRQ_PUPD_MASK BIT(7) + +/* DA9150_GPADC_MAN = 0x0F2 */ +#define DA9150_GPADC_EN_SHIFT 0 +#define DA9150_GPADC_EN_MASK BIT(0) +#define DA9150_GPADC_MUX_SHIFT 1 +#define DA9150_GPADC_MUX_MASK (0x1f << 1) + +/* DA9150_GPADC_RES_A = 0x0F4 */ +#define DA9150_GPADC_RES_H_SHIFT 0 +#define DA9150_GPADC_RES_H_MASK (0xff << 0) + +/* DA9150_GPADC_RES_B = 0x0F5 */ +#define DA9150_GPADC_RUN_SHIFT 0 +#define DA9150_GPADC_RUN_MASK BIT(0) +#define DA9150_GPADC_RES_L_SHIFT 6 +#define DA9150_GPADC_RES_L_MASK (0x03 << 6) +#define DA9150_GPADC_RES_L_BITS 2 + +/* DA9150_PAGE_CON_2 = 0x100 */ +#define DA9150_PAGE_SHIFT 0 +#define DA9150_PAGE_MASK (0x3f << 0) +#define DA9150_WRITE_MODE_SHIFT 6 +#define DA9150_WRITE_MODE_MASK BIT(6) +#define DA9150_REVERT_SHIFT 7 +#define DA9150_REVERT_MASK BIT(7) + +/* DA9150_OTP_CONT_SHARED = 0x101 */ +#define DA9150_PC_DONE_SHIFT 3 +#define DA9150_PC_DONE_MASK BIT(3) + +/* DA9150_INTERFACE_SHARED = 0x105 */ +#define DA9150_IF_BASE_ADDR_SHIFT 4 +#define DA9150_IF_BASE_ADDR_MASK (0x0f << 4) + +/* DA9150_CONFIG_A_SHARED = 0x106 */ +#define DA9150_NIRQ_VDD_SHIFT 1 +#define DA9150_NIRQ_VDD_MASK BIT(1) +#define DA9150_NIRQ_PIN_SHIFT 2 +#define DA9150_NIRQ_PIN_MASK BIT(2) +#define DA9150_NIRQ_TYPE_SHIFT 3 +#define DA9150_NIRQ_TYPE_MASK BIT(3) +#define DA9150_PM_IF_V_SHIFT 4 +#define DA9150_PM_IF_V_MASK BIT(4) +#define DA9150_PM_IF_FMP_SHIFT 5 +#define DA9150_PM_IF_FMP_MASK BIT(5) +#define DA9150_PM_IF_HSM_SHIFT 6 +#define DA9150_PM_IF_HSM_MASK BIT(6) + +/* DA9150_CONFIG_D_SHARED = 0x109 */ +#define DA9150_NIRQ_MODE_SHIFT 1 +#define DA9150_NIRQ_MODE_MASK BIT(1) + +/* DA9150_ADETVB_CFG_C = 0x150 */ +#define DA9150_TADP_RISE_SHIFT 0 +#define DA9150_TADP_RISE_MASK (0xff << 0) + +/* DA9150_ADETD_STAT = 0x151 */ +#define DA9150_DCD_STAT_SHIFT 0 +#define DA9150_DCD_STAT_MASK BIT(0) +#define DA9150_PCD_STAT_SHIFT 1 +#define DA9150_PCD_STAT_MASK (0x03 << 1) +#define DA9150_SCD_STAT_SHIFT 3 +#define DA9150_SCD_STAT_MASK (0x03 << 3) +#define DA9150_DP_STAT_SHIFT 5 +#define DA9150_DP_STAT_MASK BIT(5) +#define DA9150_DM_STAT_SHIFT 6 +#define DA9150_DM_STAT_MASK BIT(6) + +/* DA9150_ADET_CMPSTAT = 0x152 */ +#define DA9150_DP_COMP_SHIFT 1 +#define DA9150_DP_COMP_MASK BIT(1) +#define DA9150_DM_COMP_SHIFT 2 +#define DA9150_DM_COMP_MASK BIT(2) +#define DA9150_ADP_SNS_COMP_SHIFT 3 +#define DA9150_ADP_SNS_COMP_MASK BIT(3) +#define DA9150_ADP_PRB_COMP_SHIFT 4 +#define DA9150_ADP_PRB_COMP_MASK BIT(4) +#define DA9150_ID_COMP_SHIFT 5 +#define DA9150_ID_COMP_MASK BIT(5) + +/* DA9150_ADET_CTRL_A = 0x153 */ +#define DA9150_AID_DAT_SHIFT 0 +#define DA9150_AID_DAT_MASK BIT(0) +#define DA9150_AID_ID_SHIFT 1 +#define DA9150_AID_ID_MASK BIT(1) +#define DA9150_AID_TRIG_SHIFT 2 +#define DA9150_AID_TRIG_MASK BIT(2) + +/* DA9150_ADETVB_CFG_B = 0x154 */ +#define DA9150_VB_MODE_SHIFT 0 +#define DA9150_VB_MODE_MASK (0x03 << 0) +#define DA9150_VB_MODE_VB_SESS BIT(0) + +#define DA9150_TADP_PRB_SHIFT 2 +#define DA9150_TADP_PRB_MASK BIT(2) +#define DA9150_DAT_RPD_EXT_SHIFT 5 +#define DA9150_DAT_RPD_EXT_MASK BIT(5) +#define DA9150_CONF_RPD_SHIFT 6 +#define DA9150_CONF_RPD_MASK BIT(6) +#define DA9150_CONF_SRP_SHIFT 7 +#define DA9150_CONF_SRP_MASK BIT(7) + +/* DA9150_ADETVB_CFG_A = 0x155 */ +#define DA9150_AID_MODE_SHIFT 0 +#define DA9150_AID_MODE_MASK (0x03 << 0) +#define DA9150_AID_EXT_POL_SHIFT 2 +#define DA9150_AID_EXT_POL_MASK BIT(2) + +/* DA9150_ADETAC_CFG_A = 0x156 */ +#define DA9150_ISET_CDP_SHIFT 0 +#define DA9150_ISET_CDP_MASK (0x1f << 0) +#define DA9150_CONF_DBP_SHIFT 5 +#define DA9150_CONF_DBP_MASK BIT(5) + +/* DA9150_ADDETAC_CFG_B = 0x157 */ +#define DA9150_ISET_DCHG_SHIFT 0 +#define DA9150_ISET_DCHG_MASK (0x1f << 0) +#define DA9150_CONF_GPIOA_SHIFT 5 +#define DA9150_CONF_GPIOA_MASK BIT(5) +#define DA9150_CONF_GPIOB_SHIFT 6 +#define DA9150_CONF_GPIOB_MASK BIT(6) +#define DA9150_AID_VB_SHIFT 7 +#define DA9150_AID_VB_MASK BIT(7) + +/* DA9150_ADETAC_CFG_C = 0x158 */ +#define DA9150_ISET_DEF_SHIFT 0 +#define DA9150_ISET_DEF_MASK (0x1f << 0) +#define DA9150_CONF_MODE_SHIFT 5 +#define DA9150_CONF_MODE_MASK (0x03 << 5) +#define DA9150_AID_CR_DIS_SHIFT 7 +#define DA9150_AID_CR_DIS_MASK BIT(7) + +/* DA9150_ADETAC_CFG_D = 0x159 */ +#define DA9150_ISET_UNIT_SHIFT 0 +#define DA9150_ISET_UNIT_MASK (0x1f << 0) +#define DA9150_AID_UNCLAMP_SHIFT 5 +#define DA9150_AID_UNCLAMP_MASK BIT(5) + +/* DA9150_ADETVB_CFG_D = 0x15A */ +#define DA9150_ID_MODE_SHIFT 0 +#define DA9150_ID_MODE_MASK (0x03 << 0) +#define DA9150_DAT_MODE_SHIFT 2 +#define DA9150_DAT_MODE_MASK (0x0f << 2) +#define DA9150_DAT_SWP_SHIFT 6 +#define DA9150_DAT_SWP_MASK BIT(6) +#define DA9150_DAT_CLAMP_EXT_SHIFT 7 +#define DA9150_DAT_CLAMP_EXT_MASK BIT(7) + +/* DA9150_ADETID_CFG_A = 0x15B */ +#define DA9150_TID_POLL_SHIFT 0 +#define DA9150_TID_POLL_MASK (0x07 << 0) +#define DA9150_RID_CONV_SHIFT 3 +#define DA9150_RID_CONV_MASK BIT(3) + +/* DA9150_ADET_RID_PT_CHG_H = 0x15C */ +#define DA9150_RID_PT_CHG_H_SHIFT 0 +#define DA9150_RID_PT_CHG_H_MASK (0xff << 0) + +/* DA9150_ADET_RID_PT_CHG_L = 0x15D */ +#define DA9150_RID_PT_CHG_L_SHIFT 6 +#define DA9150_RID_PT_CHG_L_MASK (0x03 << 6) + +/* DA9150_PPR_TCTR_B = 0x160 */ +#define DA9150_CHG_TCTR_VAL_SHIFT 0 +#define DA9150_CHG_TCTR_VAL_MASK (0xff << 0) + +/* DA9150_PPR_BKCTRL_A = 0x163 */ +#define DA9150_VBUS_MODE_SHIFT 0 +#define DA9150_VBUS_MODE_MASK (0x03 << 0) +#define DA9150_VBUS_MODE_CHG BIT(0) +#define DA9150_VBUS_MODE_OTG (0x02 << 0) +#define DA9150_VBUS_LPM_SHIFT 2 +#define DA9150_VBUS_LPM_MASK (0x03 << 2) +#define DA9150_VBUS_SUSP_SHIFT 4 +#define DA9150_VBUS_SUSP_MASK BIT(4) +#define DA9150_VBUS_PWM_SHIFT 5 +#define DA9150_VBUS_PWM_MASK BIT(5) +#define DA9150_VBUS_ISO_SHIFT 6 +#define DA9150_VBUS_ISO_MASK BIT(6) +#define DA9150_VBUS_LDO_SHIFT 7 +#define DA9150_VBUS_LDO_MASK BIT(7) + +/* DA9150_PPR_BKCFG_A = 0x164 */ +#define DA9150_VBUS_ISET_SHIFT 0 +#define DA9150_VBUS_ISET_MASK (0x1f << 0) +#define DA9150_VBUS_IMAX_SHIFT 5 +#define DA9150_VBUS_IMAX_MASK BIT(5) +#define DA9150_VBUS_IOTG_SHIFT 6 +#define DA9150_VBUS_IOTG_MASK (0x03 << 6) + +/* DA9150_PPR_BKCFG_B = 0x165 */ +#define DA9150_VBUS_DROP_SHIFT 0 +#define DA9150_VBUS_DROP_MASK (0x0f << 0) +#define DA9150_VBUS_FAULT_DIS_SHIFT 6 +#define DA9150_VBUS_FAULT_DIS_MASK BIT(6) +#define DA9150_OTG_FAULT_DIS_SHIFT 7 +#define DA9150_OTG_FAULT_DIS_MASK BIT(7) + +/* DA9150_PPR_CHGCTRL_A = 0x166 */ +#define DA9150_CHG_EN_SHIFT 0 +#define DA9150_CHG_EN_MASK BIT(0) + +/* DA9150_PPR_CHGCTRL_B = 0x167 */ +#define DA9150_CHG_VBAT_SHIFT 0 +#define DA9150_CHG_VBAT_MASK (0x1f << 0) +#define DA9150_CHG_VDROP_SHIFT 6 +#define DA9150_CHG_VDROP_MASK (0x03 << 6) + +/* DA9150_PPR_CHGCTRL_C = 0x168 */ +#define DA9150_CHG_VFAULT_SHIFT 0 +#define DA9150_CHG_VFAULT_MASK (0x0f << 0) +#define DA9150_CHG_IPRE_SHIFT 4 +#define DA9150_CHG_IPRE_MASK (0x03 << 4) + +/* DA9150_PPR_TCTR_A = 0x169 */ +#define DA9150_CHG_TCTR_SHIFT 0 +#define DA9150_CHG_TCTR_MASK (0x07 << 0) +#define DA9150_CHG_TCTR_MODE_SHIFT 4 +#define DA9150_CHG_TCTR_MODE_MASK BIT(4) + +/* DA9150_PPR_CHGCTRL_D = 0x16A */ +#define DA9150_CHG_IBAT_SHIFT 0 +#define DA9150_CHG_IBAT_MASK (0xff << 0) + +/* DA9150_PPR_CHGCTRL_E = 0x16B */ +#define DA9150_CHG_IEND_SHIFT 0 +#define DA9150_CHG_IEND_MASK (0xff << 0) + +/* DA9150_PPR_CHGCTRL_F = 0x16C */ +#define DA9150_CHG_VCOLD_SHIFT 0 +#define DA9150_CHG_VCOLD_MASK (0x1f << 0) +#define DA9150_TBAT_TQA_EN_SHIFT 6 +#define DA9150_TBAT_TQA_EN_MASK BIT(6) +#define DA9150_TBAT_TDP_EN_SHIFT 7 +#define DA9150_TBAT_TDP_EN_MASK BIT(7) + +/* DA9150_PPR_CHGCTRL_G = 0x16D */ +#define DA9150_CHG_VWARM_SHIFT 0 +#define DA9150_CHG_VWARM_MASK (0x1f << 0) + +/* DA9150_PPR_CHGCTRL_H = 0x16E */ +#define DA9150_CHG_VHOT_SHIFT 0 +#define DA9150_CHG_VHOT_MASK (0x1f << 0) + +/* DA9150_PPR_CHGCTRL_I = 0x16F */ +#define DA9150_CHG_ICOLD_SHIFT 0 +#define DA9150_CHG_ICOLD_MASK (0xff << 0) + +/* DA9150_PPR_CHGCTRL_J = 0x170 */ +#define DA9150_CHG_IWARM_SHIFT 0 +#define DA9150_CHG_IWARM_MASK (0xff << 0) + +/* DA9150_PPR_CHGCTRL_K = 0x171 */ +#define DA9150_CHG_IHOT_SHIFT 0 +#define DA9150_CHG_IHOT_MASK (0xff << 0) + +/* DA9150_PPR_CHGCTRL_L = 0x172 */ +#define DA9150_CHG_IBAT_TRED_SHIFT 0 +#define DA9150_CHG_IBAT_TRED_MASK (0xff << 0) + +/* DA9150_PPR_CHGCTRL_M = 0x173 */ +#define DA9150_CHG_VFLOAT_SHIFT 0 +#define DA9150_CHG_VFLOAT_MASK (0x0f << 0) +#define DA9150_CHG_LPM_SHIFT 5 +#define DA9150_CHG_LPM_MASK BIT(5) +#define DA9150_CHG_NBLO_SHIFT 6 +#define DA9150_CHG_NBLO_MASK BIT(6) +#define DA9150_EBS_EN_SHIFT 7 +#define DA9150_EBS_EN_MASK BIT(7) + +/* DA9150_PPR_THYST_A = 0x174 */ +#define DA9150_TBAT_T1_SHIFT 0 +#define DA9150_TBAT_T1_MASK (0xff << 0) + +/* DA9150_PPR_THYST_B = 0x175 */ +#define DA9150_TBAT_T2_SHIFT 0 +#define DA9150_TBAT_T2_MASK (0xff << 0) + +/* DA9150_PPR_THYST_C = 0x176 */ +#define DA9150_TBAT_T3_SHIFT 0 +#define DA9150_TBAT_T3_MASK (0xff << 0) + +/* DA9150_PPR_THYST_D = 0x177 */ +#define DA9150_TBAT_T4_SHIFT 0 +#define DA9150_TBAT_T4_MASK (0xff << 0) + +/* DA9150_PPR_THYST_E = 0x178 */ +#define DA9150_TBAT_T5_SHIFT 0 +#define DA9150_TBAT_T5_MASK (0xff << 0) + +/* DA9150_PPR_THYST_F = 0x179 */ +#define DA9150_TBAT_H1_SHIFT 0 +#define DA9150_TBAT_H1_MASK (0xff << 0) + +/* DA9150_PPR_THYST_G = 0x17A */ +#define DA9150_TBAT_H5_SHIFT 0 +#define DA9150_TBAT_H5_MASK (0xff << 0) + +/* DA9150_PAGE_CON_3 = 0x180 */ +#define DA9150_PAGE_SHIFT 0 +#define DA9150_PAGE_MASK (0x3f << 0) +#define DA9150_WRITE_MODE_SHIFT 6 +#define DA9150_WRITE_MODE_MASK BIT(6) +#define DA9150_REVERT_SHIFT 7 +#define DA9150_REVERT_MASK BIT(7) + +/* DA9150_PAGE_CON_4 = 0x200 */ +#define DA9150_PAGE_SHIFT 0 +#define DA9150_PAGE_MASK (0x3f << 0) +#define DA9150_WRITE_MODE_SHIFT 6 +#define DA9150_WRITE_MODE_MASK BIT(6) +#define DA9150_REVERT_SHIFT 7 +#define DA9150_REVERT_MASK BIT(7) + +/* DA9150_PAGE_CON_5 = 0x280 */ +#define DA9150_PAGE_SHIFT 0 +#define DA9150_PAGE_MASK (0x3f << 0) +#define DA9150_WRITE_MODE_SHIFT 6 +#define DA9150_WRITE_MODE_MASK BIT(6) +#define DA9150_REVERT_SHIFT 7 +#define DA9150_REVERT_MASK BIT(7) + +/* DA9150_PAGE_CON_6 = 0x300 */ +#define DA9150_PAGE_SHIFT 0 +#define DA9150_PAGE_MASK (0x3f << 0) +#define DA9150_WRITE_MODE_SHIFT 6 +#define DA9150_WRITE_MODE_MASK BIT(6) +#define DA9150_REVERT_SHIFT 7 +#define DA9150_REVERT_MASK BIT(7) + +/* DA9150_COREBTLD_STAT_A = 0x302 */ +#define DA9150_BOOTLD_STAT_SHIFT 0 +#define DA9150_BOOTLD_STAT_MASK (0x03 << 0) +#define DA9150_CORE_LOCKUP_SHIFT 2 +#define DA9150_CORE_LOCKUP_MASK BIT(2) + +/* DA9150_COREBTLD_CTRL_A = 0x303 */ +#define DA9150_CORE_RESET_SHIFT 0 +#define DA9150_CORE_RESET_MASK BIT(0) +#define DA9150_CORE_STOP_SHIFT 1 +#define DA9150_CORE_STOP_MASK BIT(1) + +/* DA9150_CORE_CONFIG_A = 0x304 */ +#define DA9150_CORE_MEMMUX_SHIFT 0 +#define DA9150_CORE_MEMMUX_MASK (0x03 << 0) +#define DA9150_WDT_AUTO_START_SHIFT 2 +#define DA9150_WDT_AUTO_START_MASK BIT(2) +#define DA9150_WDT_AUTO_LOCK_SHIFT 3 +#define DA9150_WDT_AUTO_LOCK_MASK BIT(3) +#define DA9150_WDT_HLT_NO_CLK_SHIFT 4 +#define DA9150_WDT_HLT_NO_CLK_MASK BIT(4) + +/* DA9150_CORE_CONFIG_C = 0x305 */ +#define DA9150_CORE_SW_SIZE_SHIFT 0 +#define DA9150_CORE_SW_SIZE_MASK (0xff << 0) + +/* DA9150_CORE_CONFIG_B = 0x306 */ +#define DA9150_BOOTLD_EN_SHIFT 0 +#define DA9150_BOOTLD_EN_MASK BIT(0) +#define DA9150_CORE_EN_SHIFT 2 +#define DA9150_CORE_EN_MASK BIT(2) +#define DA9150_CORE_SW_SRC_SHIFT 3 +#define DA9150_CORE_SW_SRC_MASK (0x07 << 3) +#define DA9150_DEEP_SLEEP_EN_SHIFT 7 +#define DA9150_DEEP_SLEEP_EN_MASK BIT(7) + +/* DA9150_CORE_CFG_DATA_A = 0x307 */ +#define DA9150_CORE_CFG_DT_A_SHIFT 0 +#define DA9150_CORE_CFG_DT_A_MASK (0xff << 0) + +/* DA9150_CORE_CFG_DATA_B = 0x308 */ +#define DA9150_CORE_CFG_DT_B_SHIFT 0 +#define DA9150_CORE_CFG_DT_B_MASK (0xff << 0) + +/* DA9150_CORE_CMD_A = 0x309 */ +#define DA9150_CORE_CMD_SHIFT 0 +#define DA9150_CORE_CMD_MASK (0xff << 0) + +/* DA9150_CORE_DATA_A = 0x30A */ +#define DA9150_CORE_DATA_0_SHIFT 0 +#define DA9150_CORE_DATA_0_MASK (0xff << 0) + +/* DA9150_CORE_DATA_B = 0x30B */ +#define DA9150_CORE_DATA_1_SHIFT 0 +#define DA9150_CORE_DATA_1_MASK (0xff << 0) + +/* DA9150_CORE_DATA_C = 0x30C */ +#define DA9150_CORE_DATA_2_SHIFT 0 +#define DA9150_CORE_DATA_2_MASK (0xff << 0) + +/* DA9150_CORE_DATA_D = 0x30D */ +#define DA9150_CORE_DATA_3_SHIFT 0 +#define DA9150_CORE_DATA_3_MASK (0xff << 0) + +/* DA9150_CORE2WIRE_STAT_A = 0x310 */ +#define DA9150_FW_FWDL_ERR_SHIFT 7 +#define DA9150_FW_FWDL_ERR_MASK BIT(7) + +/* DA9150_CORE2WIRE_CTRL_A = 0x311 */ +#define DA9150_FW_FWDL_EN_SHIFT 0 +#define DA9150_FW_FWDL_EN_MASK BIT(0) +#define DA9150_FG_QIF_EN_SHIFT 1 +#define DA9150_FG_QIF_EN_MASK BIT(1) +#define DA9150_CORE_BASE_ADDR_SHIFT 4 +#define DA9150_CORE_BASE_ADDR_MASK (0x0f << 4) + +/* DA9150_FW_CTRL_A = 0x312 */ +#define DA9150_FW_SEAL_SHIFT 0 +#define DA9150_FW_SEAL_MASK (0xff << 0) + +/* DA9150_FW_CTRL_C = 0x313 */ +#define DA9150_FW_FWDL_CRC_SHIFT 0 +#define DA9150_FW_FWDL_CRC_MASK (0xff << 0) + +/* DA9150_FW_CTRL_D = 0x314 */ +#define DA9150_FW_FWDL_BASE_SHIFT 0 +#define DA9150_FW_FWDL_BASE_MASK (0x0f << 0) + +/* DA9150_FG_CTRL_A = 0x315 */ +#define DA9150_FG_QIF_CODE_SHIFT 0 +#define DA9150_FG_QIF_CODE_MASK (0xff << 0) + +/* DA9150_FG_CTRL_B = 0x316 */ +#define DA9150_FG_QIF_VALUE_SHIFT 0 +#define DA9150_FG_QIF_VALUE_MASK (0xff << 0) + +/* DA9150_FW_CTRL_E = 0x317 */ +#define DA9150_FW_FWDL_SEG_SHIFT 0 +#define DA9150_FW_FWDL_SEG_MASK (0xff << 0) + +/* DA9150_FW_CTRL_B = 0x318 */ +#define DA9150_FW_FWDL_VALUE_SHIFT 0 +#define DA9150_FW_FWDL_VALUE_MASK (0xff << 0) + +/* DA9150_GPADC_CMAN = 0x320 */ +#define DA9150_GPADC_CEN_SHIFT 0 +#define DA9150_GPADC_CEN_MASK BIT(0) +#define DA9150_GPADC_CMUX_SHIFT 1 +#define DA9150_GPADC_CMUX_MASK (0x1f << 1) + +/* DA9150_GPADC_CRES_A = 0x322 */ +#define DA9150_GPADC_CRES_H_SHIFT 0 +#define DA9150_GPADC_CRES_H_MASK (0xff << 0) + +/* DA9150_GPADC_CRES_B = 0x323 */ +#define DA9150_GPADC_CRUN_SHIFT 0 +#define DA9150_GPADC_CRUN_MASK BIT(0) +#define DA9150_GPADC_CRES_L_SHIFT 6 +#define DA9150_GPADC_CRES_L_MASK (0x03 << 6) + +/* DA9150_CC_CFG_A = 0x328 */ +#define DA9150_CC_EN_SHIFT 0 +#define DA9150_CC_EN_MASK BIT(0) +#define DA9150_CC_TIMEBASE_SHIFT 1 +#define DA9150_CC_TIMEBASE_MASK (0x03 << 1) +#define DA9150_CC_CFG_SHIFT 5 +#define DA9150_CC_CFG_MASK (0x03 << 5) +#define DA9150_CC_ENDLESS_MODE_SHIFT 7 +#define DA9150_CC_ENDLESS_MODE_MASK BIT(7) + +/* DA9150_CC_CFG_B = 0x329 */ +#define DA9150_CC_OPT_SHIFT 0 +#define DA9150_CC_OPT_MASK (0x03 << 0) +#define DA9150_CC_PREAMP_SHIFT 2 +#define DA9150_CC_PREAMP_MASK (0x03 << 2) + +/* DA9150_CC_ICHG_RES_A = 0x32A */ +#define DA9150_CC_ICHG_RES_H_SHIFT 0 +#define DA9150_CC_ICHG_RES_H_MASK (0xff << 0) + +/* DA9150_CC_ICHG_RES_B = 0x32B */ +#define DA9150_CC_ICHG_RES_L_SHIFT 3 +#define DA9150_CC_ICHG_RES_L_MASK (0x1f << 3) + +/* DA9150_CC_IAVG_RES_A = 0x32C */ +#define DA9150_CC_IAVG_RES_H_SHIFT 0 +#define DA9150_CC_IAVG_RES_H_MASK (0xff << 0) + +/* DA9150_CC_IAVG_RES_B = 0x32D */ +#define DA9150_CC_IAVG_RES_L_SHIFT 0 +#define DA9150_CC_IAVG_RES_L_MASK (0xff << 0) + +/* DA9150_TAUX_CTRL_A = 0x330 */ +#define DA9150_TAUX_EN_SHIFT 0 +#define DA9150_TAUX_EN_MASK BIT(0) +#define DA9150_TAUX_MOD_SHIFT 1 +#define DA9150_TAUX_MOD_MASK BIT(1) +#define DA9150_TAUX_UPDATE_SHIFT 2 +#define DA9150_TAUX_UPDATE_MASK BIT(2) + +/* DA9150_TAUX_RELOAD_H = 0x332 */ +#define DA9150_TAUX_RLD_H_SHIFT 0 +#define DA9150_TAUX_RLD_H_MASK (0xff << 0) + +/* DA9150_TAUX_RELOAD_L = 0x333 */ +#define DA9150_TAUX_RLD_L_SHIFT 3 +#define DA9150_TAUX_RLD_L_MASK (0x1f << 3) + +/* DA9150_TAUX_VALUE_H = 0x334 */ +#define DA9150_TAUX_VAL_H_SHIFT 0 +#define DA9150_TAUX_VAL_H_MASK (0xff << 0) + +/* DA9150_TAUX_VALUE_L = 0x335 */ +#define DA9150_TAUX_VAL_L_SHIFT 3 +#define DA9150_TAUX_VAL_L_MASK (0x1f << 3) + +/* DA9150_AUX_DATA_0 = 0x338 */ +#define DA9150_AUX_DAT_0_SHIFT 0 +#define DA9150_AUX_DAT_0_MASK (0xff << 0) + +/* DA9150_AUX_DATA_1 = 0x339 */ +#define DA9150_AUX_DAT_1_SHIFT 0 +#define DA9150_AUX_DAT_1_MASK (0xff << 0) + +/* DA9150_AUX_DATA_2 = 0x33A */ +#define DA9150_AUX_DAT_2_SHIFT 0 +#define DA9150_AUX_DAT_2_MASK (0xff << 0) + +/* DA9150_AUX_DATA_3 = 0x33B */ +#define DA9150_AUX_DAT_3_SHIFT 0 +#define DA9150_AUX_DAT_3_MASK (0xff << 0) + +/* DA9150_BIF_CTRL = 0x340 */ +#define DA9150_BIF_ISRC_EN_SHIFT 0 +#define DA9150_BIF_ISRC_EN_MASK BIT(0) + +/* DA9150_TBAT_CTRL_A = 0x342 */ +#define DA9150_TBAT_EN_SHIFT 0 +#define DA9150_TBAT_EN_MASK BIT(0) +#define DA9150_TBAT_SW1_SHIFT 1 +#define DA9150_TBAT_SW1_MASK BIT(1) +#define DA9150_TBAT_SW2_SHIFT 2 +#define DA9150_TBAT_SW2_MASK BIT(2) + +/* DA9150_TBAT_CTRL_B = 0x343 */ +#define DA9150_TBAT_SW_FRC_SHIFT 0 +#define DA9150_TBAT_SW_FRC_MASK BIT(0) +#define DA9150_TBAT_STAT_SW1_SHIFT 1 +#define DA9150_TBAT_STAT_SW1_MASK BIT(1) +#define DA9150_TBAT_STAT_SW2_SHIFT 2 +#define DA9150_TBAT_STAT_SW2_MASK BIT(2) +#define DA9150_TBAT_HIGH_CURR_SHIFT 3 +#define DA9150_TBAT_HIGH_CURR_MASK BIT(3) + +/* DA9150_TBAT_RES_A = 0x344 */ +#define DA9150_TBAT_RES_H_SHIFT 0 +#define DA9150_TBAT_RES_H_MASK (0xff << 0) + +/* DA9150_TBAT_RES_B = 0x345 */ +#define DA9150_TBAT_RES_DIS_SHIFT 0 +#define DA9150_TBAT_RES_DIS_MASK BIT(0) +#define DA9150_TBAT_RES_L_SHIFT 6 +#define DA9150_TBAT_RES_L_MASK (0x03 << 6) + +#endif /* __DA9150_REGISTERS_H */ -- 1.9.3 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH v5 1/7] mfd: Add support for DA9150 combined charger & fuel-gauge device 2014-12-22 16:51 ` [PATCH v5 1/7] mfd: Add support for DA9150 combined charger & fuel-gauge device Adam Thomson @ 2015-01-19 11:33 ` Lee Jones 2015-01-19 13:23 ` Opensource [Adam Thomson] 0 siblings, 1 reply; 20+ messages in thread From: Lee Jones @ 2015-01-19 11:33 UTC (permalink / raw) To: Adam Thomson Cc: Samuel Ortiz, Jonathan Cameron, Hartmut Knaack, linux-iio, Sebastian Reichel, Dmitry Eremin-Solenikov, David Woodhouse, linux-pm, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Grant Likely, devicetree, Andrew Morton, Joe Perches, linux-kernel, support.opensource On Mon, 22 Dec 2014, Adam Thomson wrote: > DA9150 is a combined Charger and Fuel-Gauge IC, with additional > GPIO and GPADC functionality. > > Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> > --- > drivers/mfd/Kconfig | 12 + > drivers/mfd/Makefile | 2 +- > drivers/mfd/da9150-core.c | 413 ++++++++++++ > include/linux/mfd/da9150/core.h | 68 ++ > include/linux/mfd/da9150/registers.h | 1155 ++++++++++++++++++++++++++++++++++ > 5 files changed, 1649 insertions(+), 1 deletion(-) > create mode 100644 drivers/mfd/da9150-core.c > create mode 100644 include/linux/mfd/da9150/core.h > create mode 100644 include/linux/mfd/da9150/registers.h > > diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig > index 2e6b731..56e80d2 100644 > --- a/drivers/mfd/Kconfig > +++ b/drivers/mfd/Kconfig > @@ -195,6 +195,18 @@ config MFD_DA9063 > Additional drivers must be enabled in order to use the functionality > of the device. > > +config MFD_DA9150 > + tristate "Dialog Semiconductor DA9150 Charger Fuel-Gauge chip" > + depends on I2C=y > + select MFD_CORE > + select REGMAP_I2C > + select REGMAP_IRQ > + help > + This adds support for the DA9150 integrated charger and fuel-gauge > + chip. This driver provides common support for accessing the device. > + Additional drivers must be enabled in order to use the specific > + features of the device. > + > config MFD_DLN2 > tristate "Diolan DLN2 support" > select MFD_CORE > diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile > index 53467e2..f06f4c6 100644 > --- a/drivers/mfd/Makefile > +++ b/drivers/mfd/Makefile > @@ -113,7 +113,7 @@ obj-$(CONFIG_MFD_DA9055) += da9055.o > > da9063-objs := da9063-core.o da9063-irq.o da9063-i2c.o > obj-$(CONFIG_MFD_DA9063) += da9063.o > - > +obj-$(CONFIG_MFD_DA9150) += da9150-core.o > obj-$(CONFIG_MFD_MAX14577) += max14577.o > obj-$(CONFIG_MFD_MAX77686) += max77686.o > obj-$(CONFIG_MFD_MAX77693) += max77693.o > diff --git a/drivers/mfd/da9150-core.c b/drivers/mfd/da9150-core.c > new file mode 100644 > index 0000000..4d757b9 > --- /dev/null > +++ b/drivers/mfd/da9150-core.c > @@ -0,0 +1,413 @@ > +/* > + * DA9150 Core MFD Driver > + * > + * Copyright (c) 2014 Dialog Semiconductor > + * > + * Author: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> > + * > + * 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. > + */ [...] > +u8 da9150_reg_read(struct da9150 *da9150, u16 reg) > +{ > + int val, ret; > + > + ret = regmap_read(da9150->regmap, reg, &val); > + if (ret) > + dev_err(da9150->dev, "Failed to read from reg 0x%x: %d\n", > + reg, ret); > + > + return (u8) val; > +} > +EXPORT_SYMBOL_GPL(da9150_reg_read); > + > +void da9150_reg_write(struct da9150 *da9150, u16 reg, u8 val) > +{ > + int ret; > + > + ret = regmap_write(da9150->regmap, reg, val); > + if (ret) > + dev_err(da9150->dev, "Failed to write to reg 0x%x: %d\n", > + reg, ret); > +} > +EXPORT_SYMBOL_GPL(da9150_reg_write); > + > +void da9150_set_bits(struct da9150 *da9150, u16 reg, u8 mask, u8 val) > +{ > + int ret; > + > + ret = regmap_update_bits(da9150->regmap, reg, mask, val); > + if (ret) > + dev_err(da9150->dev, "Failed to set bits in reg 0x%x: %d\n", > + reg, ret); > +} > +EXPORT_SYMBOL_GPL(da9150_set_bits); > + > +void da9150_bulk_read(struct da9150 *da9150, u16 reg, int count, u8 *buf) > +{ > + int ret; > + > + ret = regmap_bulk_read(da9150->regmap, reg, buf, count); > + if (ret) > + dev_err(da9150->dev, "Failed to bulk read from reg 0x%x: %d\n", > + reg, ret); > +} > +EXPORT_SYMBOL_GPL(da9150_bulk_read); > + > +void da9150_bulk_write(struct da9150 *da9150, u16 reg, int count, const u8 *buf) > +{ > + int ret; > + > + ret = regmap_raw_write(da9150->regmap, reg, buf, count); > + if (ret) > + dev_err(da9150->dev, "Failed to bulk write to reg 0x%x %d\n", > + reg, ret); > +} > +EXPORT_SYMBOL_GPL(da9150_bulk_write); I've never been a fan of this type of aggregation. Can you explain to me what the point of them is? -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog ^ permalink raw reply [flat|nested] 20+ messages in thread
* RE: [PATCH v5 1/7] mfd: Add support for DA9150 combined charger & fuel-gauge device 2015-01-19 11:33 ` Lee Jones @ 2015-01-19 13:23 ` Opensource [Adam Thomson] 2015-01-20 10:50 ` Lee Jones 0 siblings, 1 reply; 20+ messages in thread From: Opensource [Adam Thomson] @ 2015-01-19 13:23 UTC (permalink / raw) To: Lee Jones, Opensource [Adam Thomson] Cc: Samuel Ortiz, Jonathan Cameron, Hartmut Knaack, linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Sebastian Reichel, Dmitry Eremin-Solenikov, David Woodhouse, linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Grant Likely, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Andrew Morton, Joe Perches, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Support Opensource On January 19, 2015 11:34, Lee Jones wrote: > On Mon, 22 Dec 2014, Adam Thomson wrote: > > > DA9150 is a combined Charger and Fuel-Gauge IC, with additional > > GPIO and GPADC functionality. > > > > Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> > > --- > > drivers/mfd/Kconfig | 12 + > > drivers/mfd/Makefile | 2 +- > > drivers/mfd/da9150-core.c | 413 ++++++++++++ > > include/linux/mfd/da9150/core.h | 68 ++ > > include/linux/mfd/da9150/registers.h | 1155 > ++++++++++++++++++++++++++++++++++ > > 5 files changed, 1649 insertions(+), 1 deletion(-) > > create mode 100644 drivers/mfd/da9150-core.c > > create mode 100644 include/linux/mfd/da9150/core.h > > create mode 100644 include/linux/mfd/da9150/registers.h > > > > diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig > > index 2e6b731..56e80d2 100644 > > --- a/drivers/mfd/Kconfig > > +++ b/drivers/mfd/Kconfig > > @@ -195,6 +195,18 @@ config MFD_DA9063 > > Additional drivers must be enabled in order to use the functionality > > of the device. > > > > +config MFD_DA9150 > > + tristate "Dialog Semiconductor DA9150 Charger Fuel-Gauge chip" > > + depends on I2C=y > > + select MFD_CORE > > + select REGMAP_I2C > > + select REGMAP_IRQ > > + help > > + This adds support for the DA9150 integrated charger and fuel-gauge > > + chip. This driver provides common support for accessing the device. > > + Additional drivers must be enabled in order to use the specific > > + features of the device. > > + > > config MFD_DLN2 > > tristate "Diolan DLN2 support" > > select MFD_CORE > > diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile > > index 53467e2..f06f4c6 100644 > > --- a/drivers/mfd/Makefile > > +++ b/drivers/mfd/Makefile > > @@ -113,7 +113,7 @@ obj-$(CONFIG_MFD_DA9055) += da9055.o > > > > da9063-objs := da9063-core.o da9063-irq.o da9063-i2c.o > > obj-$(CONFIG_MFD_DA9063) += da9063.o > > - > > +obj-$(CONFIG_MFD_DA9150) += da9150-core.o > > obj-$(CONFIG_MFD_MAX14577) += max14577.o > > obj-$(CONFIG_MFD_MAX77686) += max77686.o > > obj-$(CONFIG_MFD_MAX77693) += max77693.o > > diff --git a/drivers/mfd/da9150-core.c b/drivers/mfd/da9150-core.c > > new file mode 100644 > > index 0000000..4d757b9 > > --- /dev/null > > +++ b/drivers/mfd/da9150-core.c > > @@ -0,0 +1,413 @@ > > +/* > > + * DA9150 Core MFD Driver > > + * > > + * Copyright (c) 2014 Dialog Semiconductor > > + * > > + * Author: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> > > + * > > + * 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. > > + */ > > [...] > > > +u8 da9150_reg_read(struct da9150 *da9150, u16 reg) > > +{ > > + int val, ret; > > + > > + ret = regmap_read(da9150->regmap, reg, &val); > > + if (ret) > > + dev_err(da9150->dev, "Failed to read from reg 0x%x: %d\n", > > + reg, ret); > > + > > + return (u8) val; > > +} > > +EXPORT_SYMBOL_GPL(da9150_reg_read); > > + > > +void da9150_reg_write(struct da9150 *da9150, u16 reg, u8 val) > > +{ > > + int ret; > > + > > + ret = regmap_write(da9150->regmap, reg, val); > > + if (ret) > > + dev_err(da9150->dev, "Failed to write to reg 0x%x: %d\n", > > + reg, ret); > > +} > > +EXPORT_SYMBOL_GPL(da9150_reg_write); > > + > > +void da9150_set_bits(struct da9150 *da9150, u16 reg, u8 mask, u8 val) > > +{ > > + int ret; > > + > > + ret = regmap_update_bits(da9150->regmap, reg, mask, val); > > + if (ret) > > + dev_err(da9150->dev, "Failed to set bits in reg 0x%x: %d\n", > > + reg, ret); > > +} > > +EXPORT_SYMBOL_GPL(da9150_set_bits); > > + > > +void da9150_bulk_read(struct da9150 *da9150, u16 reg, int count, u8 *buf) > > +{ > > + int ret; > > + > > + ret = regmap_bulk_read(da9150->regmap, reg, buf, count); > > + if (ret) > > + dev_err(da9150->dev, "Failed to bulk read from reg 0x%x: %d\n", > > + reg, ret); > > +} > > +EXPORT_SYMBOL_GPL(da9150_bulk_read); > > + > > +void da9150_bulk_write(struct da9150 *da9150, u16 reg, int count, const u8 > *buf) > > +{ > > + int ret; > > + > > + ret = regmap_raw_write(da9150->regmap, reg, buf, count); > > + if (ret) > > + dev_err(da9150->dev, "Failed to bulk write to reg 0x%x %d\n", > > + reg, ret); > > +} > > +EXPORT_SYMBOL_GPL(da9150_bulk_write); > > I've never been a fan of this type of aggregation. Can you explain to > me what the point of them is? I refer you back to our previous discussion some time back: https://lkml.org/lkml/2014/9/9/284 'The reason for these is because future patches to add additional functionality will introduce I2C access functions which do not use regmap and access the device via a separate I2C address for this purpose. I will need to provide access functions for that, and so having a common style of I2C access makes sense for this driver. Means any access just needs to provide the MFD private data, and the relevant functions take care of the rest. I think this is cleaner in this instance.' ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v5 1/7] mfd: Add support for DA9150 combined charger & fuel-gauge device 2015-01-19 13:23 ` Opensource [Adam Thomson] @ 2015-01-20 10:50 ` Lee Jones 0 siblings, 0 replies; 20+ messages in thread From: Lee Jones @ 2015-01-20 10:50 UTC (permalink / raw) To: Opensource [Adam Thomson] Cc: Samuel Ortiz, Jonathan Cameron, Hartmut Knaack, linux-iio@vger.kernel.org, Sebastian Reichel, Dmitry Eremin-Solenikov, David Woodhouse, linux-pm@vger.kernel.org, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Grant Likely, devicetree@vger.kernel.org, Andrew Morton, Joe Perches, linux-kernel@vger.kernel.org, Support Opensource On Mon, 19 Jan 2015, Opensource [Adam Thomson] wrote: > On January 19, 2015 11:34, Lee Jones wrote: > > > On Mon, 22 Dec 2014, Adam Thomson wrote: > > > > > DA9150 is a combined Charger and Fuel-Gauge IC, with additional > > > GPIO and GPADC functionality. > > > > > > Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> > > > --- > > > drivers/mfd/Kconfig | 12 + > > > drivers/mfd/Makefile | 2 +- > > > drivers/mfd/da9150-core.c | 413 ++++++++++++ > > > include/linux/mfd/da9150/core.h | 68 ++ > > > include/linux/mfd/da9150/registers.h | 1155 > > ++++++++++++++++++++++++++++++++++ > > > 5 files changed, 1649 insertions(+), 1 deletion(-) > > > create mode 100644 drivers/mfd/da9150-core.c > > > create mode 100644 include/linux/mfd/da9150/core.h > > > create mode 100644 include/linux/mfd/da9150/registers.h > > > > > > diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig > > > index 2e6b731..56e80d2 100644 > > > --- a/drivers/mfd/Kconfig > > > +++ b/drivers/mfd/Kconfig > > > @@ -195,6 +195,18 @@ config MFD_DA9063 > > > Additional drivers must be enabled in order to use the functionality > > > of the device. > > > > > > +config MFD_DA9150 > > > + tristate "Dialog Semiconductor DA9150 Charger Fuel-Gauge chip" > > > + depends on I2C=y > > > + select MFD_CORE > > > + select REGMAP_I2C > > > + select REGMAP_IRQ > > > + help > > > + This adds support for the DA9150 integrated charger and fuel-gauge > > > + chip. This driver provides common support for accessing the device. > > > + Additional drivers must be enabled in order to use the specific > > > + features of the device. > > > + > > > config MFD_DLN2 > > > tristate "Diolan DLN2 support" > > > select MFD_CORE > > > diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile > > > index 53467e2..f06f4c6 100644 > > > --- a/drivers/mfd/Makefile > > > +++ b/drivers/mfd/Makefile > > > @@ -113,7 +113,7 @@ obj-$(CONFIG_MFD_DA9055) += da9055.o > > > > > > da9063-objs := da9063-core.o da9063-irq.o da9063-i2c.o > > > obj-$(CONFIG_MFD_DA9063) += da9063.o > > > - > > > +obj-$(CONFIG_MFD_DA9150) += da9150-core.o > > > obj-$(CONFIG_MFD_MAX14577) += max14577.o > > > obj-$(CONFIG_MFD_MAX77686) += max77686.o > > > obj-$(CONFIG_MFD_MAX77693) += max77693.o > > > diff --git a/drivers/mfd/da9150-core.c b/drivers/mfd/da9150-core.c > > > new file mode 100644 > > > index 0000000..4d757b9 > > > --- /dev/null > > > +++ b/drivers/mfd/da9150-core.c > > > @@ -0,0 +1,413 @@ > > > +/* > > > + * DA9150 Core MFD Driver > > > + * > > > + * Copyright (c) 2014 Dialog Semiconductor > > > + * > > > + * Author: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> > > > + * > > > + * 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. > > > + */ > > > > [...] > > > > > +u8 da9150_reg_read(struct da9150 *da9150, u16 reg) > > > +{ > > > + int val, ret; > > > + > > > + ret = regmap_read(da9150->regmap, reg, &val); > > > + if (ret) > > > + dev_err(da9150->dev, "Failed to read from reg 0x%x: %d\n", > > > + reg, ret); > > > + > > > + return (u8) val; > > > +} > > > +EXPORT_SYMBOL_GPL(da9150_reg_read); > > > + > > > +void da9150_reg_write(struct da9150 *da9150, u16 reg, u8 val) > > > +{ > > > + int ret; > > > + > > > + ret = regmap_write(da9150->regmap, reg, val); > > > + if (ret) > > > + dev_err(da9150->dev, "Failed to write to reg 0x%x: %d\n", > > > + reg, ret); > > > +} > > > +EXPORT_SYMBOL_GPL(da9150_reg_write); > > > + > > > +void da9150_set_bits(struct da9150 *da9150, u16 reg, u8 mask, u8 val) > > > +{ > > > + int ret; > > > + > > > + ret = regmap_update_bits(da9150->regmap, reg, mask, val); > > > + if (ret) > > > + dev_err(da9150->dev, "Failed to set bits in reg 0x%x: %d\n", > > > + reg, ret); > > > +} > > > +EXPORT_SYMBOL_GPL(da9150_set_bits); > > > + > > > +void da9150_bulk_read(struct da9150 *da9150, u16 reg, int count, u8 *buf) > > > +{ > > > + int ret; > > > + > > > + ret = regmap_bulk_read(da9150->regmap, reg, buf, count); > > > + if (ret) > > > + dev_err(da9150->dev, "Failed to bulk read from reg 0x%x: %d\n", > > > + reg, ret); > > > +} > > > +EXPORT_SYMBOL_GPL(da9150_bulk_read); > > > + > > > +void da9150_bulk_write(struct da9150 *da9150, u16 reg, int count, const u8 > > *buf) > > > +{ > > > + int ret; > > > + > > > + ret = regmap_raw_write(da9150->regmap, reg, buf, count); > > > + if (ret) > > > + dev_err(da9150->dev, "Failed to bulk write to reg 0x%x %d\n", > > > + reg, ret); > > > +} > > > +EXPORT_SYMBOL_GPL(da9150_bulk_write); > > > > I've never been a fan of this type of aggregation. Can you explain to > > me what the point of them is? > > I refer you back to our previous discussion some time back: > > https://lkml.org/lkml/2014/9/9/284 > > 'The reason for these is because future patches to add additional functionality > will introduce I2C access functions which do not use regmap and access the > device via a separate I2C address for this purpose. I will need to provide > access functions for that, and so having a common style of I2C access makes > sense for this driver. Means any access just needs to provide the MFD private > data, and the relevant functions take care of the rest. I think this is cleaner > in this instance.' Well at least I'm consistent. For my own reference: Acked-by: Lee Jones <lee.jones@linaro.org> -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v5 2/7] mfd: da9150: Add DT binding documentation for core 2014-12-22 16:50 [PATCH v5 0/7] Add initial support for DA9150 Charger & Fuel-Gauge IC Adam Thomson 2014-12-22 16:51 ` [PATCH v5 1/7] mfd: Add support for DA9150 combined charger & fuel-gauge device Adam Thomson @ 2014-12-22 16:51 ` Adam Thomson 2014-12-22 16:51 ` [PATCH v5 3/7] iio: Add support for DA9150 GPADC Adam Thomson ` (4 subsequent siblings) 6 siblings, 0 replies; 20+ messages in thread From: Adam Thomson @ 2014-12-22 16:51 UTC (permalink / raw) To: Lee Jones, Samuel Ortiz, Jonathan Cameron, Hartmut Knaack, linux-iio, Sebastian Reichel, Dmitry Eremin-Solenikov, David Woodhouse, linux-pm, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Grant Likely, devicetree, Andrew Morton, Joe Perches Cc: linux-kernel, support.opensource Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> --- Documentation/devicetree/bindings/mfd/da9150.txt | 43 ++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/da9150.txt diff --git a/Documentation/devicetree/bindings/mfd/da9150.txt b/Documentation/devicetree/bindings/mfd/da9150.txt new file mode 100644 index 0000000..d0588ea --- /dev/null +++ b/Documentation/devicetree/bindings/mfd/da9150.txt @@ -0,0 +1,43 @@ +Dialog Semiconductor DA9150 Combined Charger/Fuel-Gauge MFD bindings + +DA9150 consists of a group of sub-devices: + +Device Description +------ ----------- +da9150-gpadc : General Purpose ADC +da9150-charger : Battery Charger + +====== + +Required properties: +- compatible : Should be "dlg,da9150" +- reg: Specifies the I2C slave address +- interrupt-parent: Specifies the phandle of the interrupt controller to which + the IRQs from da9150 are delivered to. +- interrupts: IRQ line info for da9150 chip. +- interrupt-controller: da9150 has internal IRQs (own IRQ domain). + (See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt for + further information relating to interrupt properties) + +Sub-devices: +- da9150-gpadc: See Documentation/devicetree/bindings/iio/adc/da9150-gpadc.txt +- da9150-charger: See Documentation/devicetree/bindings/power/da9150-charger.txt + + +Example: + + charger_fg: da9150@58 { + compatible = "dlg,da9150"; + reg = <0x58>; + interrupt-parent = <&gpio6>; + interrupts = <11 IRQ_TYPE_LEVEL_LOW>; + interrupt-controller; + + gpadc: da9150-gpadc { + ... + }; + + da9150-charger { + ... + }; + }; -- 1.9.3 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v5 3/7] iio: Add support for DA9150 GPADC 2014-12-22 16:50 [PATCH v5 0/7] Add initial support for DA9150 Charger & Fuel-Gauge IC Adam Thomson 2014-12-22 16:51 ` [PATCH v5 1/7] mfd: Add support for DA9150 combined charger & fuel-gauge device Adam Thomson 2014-12-22 16:51 ` [PATCH v5 2/7] mfd: da9150: Add DT binding documentation for core Adam Thomson @ 2014-12-22 16:51 ` Adam Thomson [not found] ` <58b7b001b38662c36595412f96c7d2eb5c3adcad.1419264383.git.Adam.Thomson.Opensource-WBD+wuPFNBhBDgjK7y7TUQ@public.gmane.org> 2014-12-22 16:51 ` [PATCH v5 4/7] iio: da9150: Add DT binding documentation for GPADC Adam Thomson ` (3 subsequent siblings) 6 siblings, 1 reply; 20+ messages in thread From: Adam Thomson @ 2014-12-22 16:51 UTC (permalink / raw) To: Lee Jones, Samuel Ortiz, Jonathan Cameron, Hartmut Knaack, linux-iio, Sebastian Reichel, Dmitry Eremin-Solenikov, David Woodhouse, linux-pm, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Grant Likely, devicetree, Andrew Morton, Joe Perches Cc: linux-kernel, support.opensource This patch adds support for DA9150 Charger & Fuel-Gauge IC GPADC. Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> --- drivers/iio/adc/Kconfig | 9 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/da9150-gpadc.c | 409 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 419 insertions(+) create mode 100644 drivers/iio/adc/da9150-gpadc.c diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig index 0f79e47..6e00b81 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -135,6 +135,15 @@ config AXP288_ADC device. Depending on platform configuration, this general purpose ADC can be used for sampling sensors such as thermal resistors. +config DA9150_GPADC + tristate "Dialog DA9150 GPADC driver support" + depends on MFD_DA9150 + help + Say yes here to build support for Dialog DA9150 GPADC. + + This driver can also be built as a module. If chosen, the module name + will be da9150-gpadc. + config EXYNOS_ADC tristate "Exynos ADC driver support" depends on ARCH_EXYNOS || ARCH_S3C24XX || ARCH_S3C64XX || (OF && COMPILE_TEST) diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile index 701fdb7..d56ee9b 100644 --- a/drivers/iio/adc/Makefile +++ b/drivers/iio/adc/Makefile @@ -15,6 +15,7 @@ obj-$(CONFIG_AD7887) += ad7887.o obj-$(CONFIG_AD799X) += ad799x.o obj-$(CONFIG_AT91_ADC) += at91_adc.o obj-$(CONFIG_AXP288_ADC) += axp288_adc.o +obj-$(CONFIG_DA9150_GPADC) += da9150-gpadc.o obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o obj-$(CONFIG_MAX1027) += max1027.o diff --git a/drivers/iio/adc/da9150-gpadc.c b/drivers/iio/adc/da9150-gpadc.c new file mode 100644 index 0000000..3f7bc81 --- /dev/null +++ b/drivers/iio/adc/da9150-gpadc.c @@ -0,0 +1,409 @@ +/* + * DA9150 GPADC Driver + * + * Copyright (c) 2014 Dialog Semiconductor + * + * Author: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> + * + * 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. + */ + +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/interrupt.h> +#include <linux/mutex.h> +#include <linux/completion.h> +#include <linux/iio/iio.h> +#include <linux/iio/machine.h> +#include <linux/iio/driver.h> +#include <linux/mfd/da9150/core.h> +#include <linux/mfd/da9150/registers.h> + +/* Channels */ +enum da9150_gpadc_hw_channel { + DA9150_GPADC_HW_CHAN_GPIOA_2V = 0, + DA9150_GPADC_HW_CHAN_GPIOA_2V_, + DA9150_GPADC_HW_CHAN_GPIOB_2V, + DA9150_GPADC_HW_CHAN_GPIOB_2V_, + DA9150_GPADC_HW_CHAN_GPIOC_2V, + DA9150_GPADC_HW_CHAN_GPIOC_2V_, + DA9150_GPADC_HW_CHAN_GPIOD_2V, + DA9150_GPADC_HW_CHAN_GPIOD_2V_, + DA9150_GPADC_HW_CHAN_IBUS_SENSE, + DA9150_GPADC_HW_CHAN_IBUS_SENSE_, + DA9150_GPADC_HW_CHAN_VBUS_DIV, + DA9150_GPADC_HW_CHAN_VBUS_DIV_, + DA9150_GPADC_HW_CHAN_ID, + DA9150_GPADC_HW_CHAN_ID_, + DA9150_GPADC_HW_CHAN_VSYS, + DA9150_GPADC_HW_CHAN_VSYS_, + DA9150_GPADC_HW_CHAN_GPIOA_6V, + DA9150_GPADC_HW_CHAN_GPIOA_6V_, + DA9150_GPADC_HW_CHAN_GPIOB_6V, + DA9150_GPADC_HW_CHAN_GPIOB_6V_, + DA9150_GPADC_HW_CHAN_GPIOC_6V, + DA9150_GPADC_HW_CHAN_GPIOC_6V_, + DA9150_GPADC_HW_CHAN_GPIOD_6V, + DA9150_GPADC_HW_CHAN_GPIOD_6V_, + DA9150_GPADC_HW_CHAN_VBAT, + DA9150_GPADC_HW_CHAN_VBAT_, + DA9150_GPADC_HW_CHAN_TBAT, + DA9150_GPADC_HW_CHAN_TBAT_, + DA9150_GPADC_HW_CHAN_TJUNC_CORE, + DA9150_GPADC_HW_CHAN_TJUNC_CORE_, + DA9150_GPADC_HW_CHAN_TJUNC_OVP, + DA9150_GPADC_HW_CHAN_TJUNC_OVP_, +}; + +enum da9150_gpadc_channel { + DA9150_GPADC_CHAN_GPIOA = 0, + DA9150_GPADC_CHAN_GPIOB, + DA9150_GPADC_CHAN_GPIOC, + DA9150_GPADC_CHAN_GPIOD, + DA9150_GPADC_CHAN_IBUS, + DA9150_GPADC_CHAN_VBUS, + DA9150_GPADC_CHAN_ID, + DA9150_GPADC_CHAN_VSYS, + DA9150_GPADC_CHAN_VBAT, + DA9150_GPADC_CHAN_TBAT, + DA9150_GPADC_CHAN_TJUNC_CORE, + DA9150_GPADC_CHAN_TJUNC_OVP, +}; + +/* Private data */ +struct da9150_gpadc { + struct da9150 *da9150; + struct device *dev; + + struct mutex lock; + struct completion complete; +}; + + +static irqreturn_t da9150_gpadc_irq(int irq, void *data) +{ + + struct da9150_gpadc *gpadc = data; + + complete(&gpadc->complete); + + return IRQ_HANDLED; +} + +static int da9150_gpadc_read_adc(struct da9150_gpadc *gpadc, int hw_chan) +{ + u8 result_regs[2]; + int result; + + mutex_lock(&gpadc->lock); + + /* Set channel & enable measurement */ + da9150_reg_write(gpadc->da9150, DA9150_GPADC_MAN, + (DA9150_GPADC_EN_MASK | + hw_chan << DA9150_GPADC_MUX_SHIFT)); + + /* Consume left-over completion from a previous timeout */ + try_wait_for_completion(&gpadc->complete); + + /* Check for actual completion */ + wait_for_completion_timeout(&gpadc->complete, msecs_to_jiffies(5)); + + /* Read result and status from device */ + da9150_bulk_read(gpadc->da9150, DA9150_GPADC_RES_A, 2, result_regs); + + mutex_unlock(&gpadc->lock); + + /* Check to make sure device really has completed reading */ + if (result_regs[1] & DA9150_GPADC_RUN_MASK) { + dev_err(gpadc->dev, "Timeout on channel %d of GPADC\n", + hw_chan); + return -ETIMEDOUT; + } + + /* LSBs - 2 bits */ + result = (result_regs[1] & DA9150_GPADC_RES_L_MASK) >> + DA9150_GPADC_RES_L_SHIFT; + /* MSBs - 8 bits */ + result |= result_regs[0] << DA9150_GPADC_RES_L_BITS; + + return result; +} + +static inline int da9150_gpadc_gpio_6v_voltage_now(int raw_val) +{ + /* Convert to mV */ + return (6 * ((raw_val * 1000) + 500)) / 1024; +} + +static inline int da9150_gpadc_ibus_current_avg(int raw_val) +{ + /* Convert to mA */ + return (4 * ((raw_val * 1000) + 500)) / 2048; +} + +static inline int da9150_gpadc_vbus_21v_voltage_now(int raw_val) +{ + /* Convert to mV */ + return (21 * ((raw_val * 1000) + 500)) / 1024; +} + +static inline int da9150_gpadc_vsys_6v_voltage_now(int raw_val) +{ + /* Convert to mV */ + return (3 * ((raw_val * 1000) + 500)) / 512; +} + +static int da9150_gpadc_read_processed(struct da9150_gpadc *gpadc, int channel, + int hw_chan, int *val) +{ + int raw_val; + + raw_val = da9150_gpadc_read_adc(gpadc, hw_chan); + if (raw_val < 0) + return raw_val; + + switch (channel) { + case DA9150_GPADC_CHAN_GPIOA: + case DA9150_GPADC_CHAN_GPIOB: + case DA9150_GPADC_CHAN_GPIOC: + case DA9150_GPADC_CHAN_GPIOD: + *val = da9150_gpadc_gpio_6v_voltage_now(raw_val); + break; + case DA9150_GPADC_CHAN_IBUS: + *val = da9150_gpadc_ibus_current_avg(raw_val); + break; + case DA9150_GPADC_CHAN_VBUS: + *val = da9150_gpadc_vbus_21v_voltage_now(raw_val); + break; + case DA9150_GPADC_CHAN_VSYS: + *val = da9150_gpadc_vsys_6v_voltage_now(raw_val); + break; + default: + /* No processing for other channels so return raw value */ + *val = raw_val; + break; + } + + return IIO_VAL_INT; +} + +static int da9150_gpadc_read_scale(int channel, int *val, int *val2) +{ + switch (channel) { + case DA9150_GPADC_CHAN_VBAT: + *val = 2932; + *val2 = 1000; + return IIO_VAL_FRACTIONAL; + case DA9150_GPADC_CHAN_TJUNC_CORE: + case DA9150_GPADC_CHAN_TJUNC_OVP: + *val = 1000000; + *val2 = 4420; + return IIO_VAL_FRACTIONAL; + default: + return -EINVAL; + } +} + +static int da9150_gpadc_read_offset(int channel, int *val) +{ + switch (channel) { + case DA9150_GPADC_CHAN_VBAT: + *val = 1500000 / 2932; + return IIO_VAL_INT; + case DA9150_GPADC_CHAN_TJUNC_CORE: + case DA9150_GPADC_CHAN_TJUNC_OVP: + *val = -144; + return IIO_VAL_INT; + default: + return -EINVAL; + } +} + +static int da9150_gpadc_read_raw(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + int *val, int *val2, long mask) +{ + struct da9150_gpadc *gpadc = iio_priv(indio_dev); + + if ((chan->channel < DA9150_GPADC_CHAN_GPIOA) || + (chan->channel > DA9150_GPADC_CHAN_TJUNC_OVP)) + return -EINVAL; + + switch (mask) { + case IIO_CHAN_INFO_RAW: + case IIO_CHAN_INFO_PROCESSED: + return da9150_gpadc_read_processed(gpadc, chan->channel, + chan->address, val); + case IIO_CHAN_INFO_SCALE: + return da9150_gpadc_read_scale(chan->channel, val, val2); + case IIO_CHAN_INFO_OFFSET: + return da9150_gpadc_read_offset(chan->channel, val); + default: + return -EINVAL; + } +} + +static const struct iio_info da9150_gpadc_info = { + .read_raw = &da9150_gpadc_read_raw, + .driver_module = THIS_MODULE, +}; + +#define DA9150_GPADC_CHANNEL(_id, _hw_id, _type, chan_info, \ + _ext_name) { \ + .type = _type, \ + .indexed = 1, \ + .channel = DA9150_GPADC_CHAN_##_id, \ + .address = DA9150_GPADC_HW_CHAN_##_hw_id, \ + .info_mask_separate = chan_info, \ + .extend_name = _ext_name, \ + .datasheet_name = #_id, \ +} + +#define DA9150_GPADC_CHANNEL_RAW(_id, _hw_id, _type, _ext_name) \ + DA9150_GPADC_CHANNEL(_id, _hw_id, _type, \ + BIT(IIO_CHAN_INFO_RAW), _ext_name) + +#define DA9150_GPADC_CHANNEL_SCALED(_id, _hw_id, _type, _ext_name) \ + DA9150_GPADC_CHANNEL(_id, _hw_id, _type, \ + BIT(IIO_CHAN_INFO_RAW) | \ + BIT(IIO_CHAN_INFO_SCALE) | \ + BIT(IIO_CHAN_INFO_OFFSET), \ + _ext_name) + +#define DA9150_GPADC_CHANNEL_PROCESSED(_id, _hw_id, _type, _ext_name) \ + DA9150_GPADC_CHANNEL(_id, _hw_id, _type, \ + BIT(IIO_CHAN_INFO_PROCESSED), _ext_name) + +/* Supported channels */ +static const struct iio_chan_spec da9150_gpadc_channels[] = { + DA9150_GPADC_CHANNEL_PROCESSED(GPIOA, GPIOA_6V, IIO_VOLTAGE, "GPIOA"), + DA9150_GPADC_CHANNEL_PROCESSED(GPIOB, GPIOB_6V, IIO_VOLTAGE, "GPIOB"), + DA9150_GPADC_CHANNEL_PROCESSED(GPIOC, GPIOC_6V, IIO_VOLTAGE, "GPIOC"), + DA9150_GPADC_CHANNEL_PROCESSED(GPIOD, GPIOD_6V, IIO_VOLTAGE, "GPIOD"), + DA9150_GPADC_CHANNEL_PROCESSED(IBUS, IBUS_SENSE, IIO_CURRENT, "IBUS"), + DA9150_GPADC_CHANNEL_PROCESSED(VBUS, VBUS_DIV_, IIO_VOLTAGE, "VBUS"), + DA9150_GPADC_CHANNEL_RAW(ID, ID, IIO_VOLTAGE, "ID"), + DA9150_GPADC_CHANNEL_PROCESSED(VSYS, VSYS, IIO_VOLTAGE, "VSYS"), + DA9150_GPADC_CHANNEL_SCALED(VBAT, VBAT, IIO_VOLTAGE, "VBAT"), + DA9150_GPADC_CHANNEL_RAW(TBAT, TBAT, IIO_VOLTAGE, "TBAT"), + DA9150_GPADC_CHANNEL_SCALED(TJUNC_CORE, TJUNC_CORE, IIO_TEMP, + "TJUNC_CORE"), + DA9150_GPADC_CHANNEL_SCALED(TJUNC_OVP, TJUNC_OVP, IIO_TEMP, + "TJUNC_OVP"), +}; + +/* Default maps used by da9150-charger */ +static struct iio_map da9150_gpadc_default_maps[] = { + { + .consumer_dev_name = "da9150-charger", + .consumer_channel = "CHAN_IBUS", + .adc_channel_label = "IBUS", + }, + { + .consumer_dev_name = "da9150-charger", + .consumer_channel = "CHAN_VBUS", + .adc_channel_label = "VBUS", + }, + { + .consumer_dev_name = "da9150-charger", + .consumer_channel = "CHAN_TJUNC", + .adc_channel_label = "TJUNC_CORE", + }, + { + .consumer_dev_name = "da9150-charger", + .consumer_channel = "CHAN_VBAT", + .adc_channel_label = "VBAT", + }, + {}, +}; + +static int da9150_gpadc_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct da9150 *da9150 = dev_get_drvdata(dev->parent); + struct da9150_gpadc *gpadc; + struct iio_dev *indio_dev; + int irq, ret; + + indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*gpadc)); + if (!indio_dev) { + dev_err(&pdev->dev, "Failed to allocate IIO device\n"); + return -ENOMEM; + } + gpadc = iio_priv(indio_dev); + + platform_set_drvdata(pdev, indio_dev); + gpadc->da9150 = da9150; + gpadc->dev = dev; + mutex_init(&gpadc->lock); + init_completion(&gpadc->complete); + + irq = platform_get_irq_byname(pdev, "GPADC"); + if (irq < 0) { + dev_err(dev, "Failed to get IRQ: %d\n", irq); + return irq; + } + + ret = devm_request_threaded_irq(dev, irq, NULL, da9150_gpadc_irq, + IRQF_ONESHOT, "GPADC", gpadc); + if (ret) { + dev_err(dev, "Failed to request IRQ %d: %d\n", irq, ret); + return ret; + } + + ret = iio_map_array_register(indio_dev, da9150_gpadc_default_maps); + if (ret) { + dev_err(dev, "Failed to register IIO maps: %d\n", ret); + return ret; + } + + indio_dev->name = dev_name(dev); + indio_dev->dev.parent = dev; + indio_dev->dev.of_node = pdev->dev.of_node; + indio_dev->info = &da9150_gpadc_info; + indio_dev->modes = INDIO_DIRECT_MODE; + indio_dev->channels = da9150_gpadc_channels; + indio_dev->num_channels = ARRAY_SIZE(da9150_gpadc_channels); + + ret = iio_device_register(indio_dev); + if (ret) { + dev_err(dev, "Failed to register IIO device: %d\n", ret); + goto iio_map_unreg; + } + + return 0; + +iio_map_unreg: + iio_map_array_unregister(indio_dev); + + return ret; +} + +static int da9150_gpadc_remove(struct platform_device *pdev) +{ + struct iio_dev *indio_dev = platform_get_drvdata(pdev); + + iio_device_unregister(indio_dev); + iio_map_array_unregister(indio_dev); + + return 0; +} + +static struct platform_driver da9150_gpadc_driver = { + .driver = { + .name = "da9150-gpadc", + }, + .probe = da9150_gpadc_probe, + .remove = da9150_gpadc_remove, +}; + +module_platform_driver(da9150_gpadc_driver); + +MODULE_DESCRIPTION("GPADC Driver for DA9150"); +MODULE_AUTHOR("Adam Thomson <Adam.Thomson.Opensource@diasemi.com>"); +MODULE_LICENSE("GPL"); -- 1.9.3 ^ permalink raw reply related [flat|nested] 20+ messages in thread
[parent not found: <58b7b001b38662c36595412f96c7d2eb5c3adcad.1419264383.git.Adam.Thomson.Opensource-WBD+wuPFNBhBDgjK7y7TUQ@public.gmane.org>]
* Re: [PATCH v5 3/7] iio: Add support for DA9150 GPADC [not found] ` <58b7b001b38662c36595412f96c7d2eb5c3adcad.1419264383.git.Adam.Thomson.Opensource-WBD+wuPFNBhBDgjK7y7TUQ@public.gmane.org> @ 2015-01-01 20:51 ` Hartmut Knaack 2015-01-04 17:22 ` Jonathan Cameron 1 sibling, 0 replies; 20+ messages in thread From: Hartmut Knaack @ 2015-01-01 20:51 UTC (permalink / raw) To: Adam Thomson, Lee Jones, Samuel Ortiz, Jonathan Cameron, linux-iio-u79uwXL29TY76Z2rM5mHXA, Sebastian Reichel, Dmitry Eremin-Solenikov, David Woodhouse, linux-pm-u79uwXL29TY76Z2rM5mHXA, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Grant Likely, devicetree-u79uwXL29TY76Z2rM5mHXA, Andrew Morton, Joe Perches Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA, support.opensource-WBD+wuPFNBhBDgjK7y7TUQ Adam Thomson schrieb am 22.12.2014 um 17:51: > This patch adds support for DA9150 Charger & Fuel-Gauge IC GPADC. > > Signed-off-by: Adam Thomson <Adam.Thomson.Opensource-WBD+wuPFNBhBDgjK7y7TUQ@public.gmane.org> Reviewed-by: Hartmut Knaack <knaack.h-Mmb7MZpHnFY@public.gmane.org> > --- > drivers/iio/adc/Kconfig | 9 + > drivers/iio/adc/Makefile | 1 + > drivers/iio/adc/da9150-gpadc.c | 409 +++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 419 insertions(+) > create mode 100644 drivers/iio/adc/da9150-gpadc.c > > diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig > index 0f79e47..6e00b81 100644 > --- a/drivers/iio/adc/Kconfig > +++ b/drivers/iio/adc/Kconfig > @@ -135,6 +135,15 @@ config AXP288_ADC > device. Depending on platform configuration, this general purpose ADC can > be used for sampling sensors such as thermal resistors. > > +config DA9150_GPADC > + tristate "Dialog DA9150 GPADC driver support" > + depends on MFD_DA9150 > + help > + Say yes here to build support for Dialog DA9150 GPADC. > + > + This driver can also be built as a module. If chosen, the module name > + will be da9150-gpadc. > + > config EXYNOS_ADC > tristate "Exynos ADC driver support" > depends on ARCH_EXYNOS || ARCH_S3C24XX || ARCH_S3C64XX || (OF && COMPILE_TEST) > diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile > index 701fdb7..d56ee9b 100644 > --- a/drivers/iio/adc/Makefile > +++ b/drivers/iio/adc/Makefile > @@ -15,6 +15,7 @@ obj-$(CONFIG_AD7887) += ad7887.o > obj-$(CONFIG_AD799X) += ad799x.o > obj-$(CONFIG_AT91_ADC) += at91_adc.o > obj-$(CONFIG_AXP288_ADC) += axp288_adc.o > +obj-$(CONFIG_DA9150_GPADC) += da9150-gpadc.o > obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o > obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o > obj-$(CONFIG_MAX1027) += max1027.o > diff --git a/drivers/iio/adc/da9150-gpadc.c b/drivers/iio/adc/da9150-gpadc.c > new file mode 100644 > index 0000000..3f7bc81 > --- /dev/null > +++ b/drivers/iio/adc/da9150-gpadc.c > @@ -0,0 +1,409 @@ > +/* > + * DA9150 GPADC Driver > + * > + * Copyright (c) 2014 Dialog Semiconductor > + * > + * Author: Adam Thomson <Adam.Thomson.Opensource-WBD+wuPFNBhBDgjK7y7TUQ@public.gmane.org> > + * > + * 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. > + */ > + > +#include <linux/kernel.h> > +#include <linux/slab.h> > +#include <linux/module.h> > +#include <linux/platform_device.h> > +#include <linux/interrupt.h> > +#include <linux/mutex.h> > +#include <linux/completion.h> > +#include <linux/iio/iio.h> > +#include <linux/iio/machine.h> > +#include <linux/iio/driver.h> > +#include <linux/mfd/da9150/core.h> > +#include <linux/mfd/da9150/registers.h> > + > +/* Channels */ > +enum da9150_gpadc_hw_channel { > + DA9150_GPADC_HW_CHAN_GPIOA_2V = 0, > + DA9150_GPADC_HW_CHAN_GPIOA_2V_, > + DA9150_GPADC_HW_CHAN_GPIOB_2V, > + DA9150_GPADC_HW_CHAN_GPIOB_2V_, > + DA9150_GPADC_HW_CHAN_GPIOC_2V, > + DA9150_GPADC_HW_CHAN_GPIOC_2V_, > + DA9150_GPADC_HW_CHAN_GPIOD_2V, > + DA9150_GPADC_HW_CHAN_GPIOD_2V_, > + DA9150_GPADC_HW_CHAN_IBUS_SENSE, > + DA9150_GPADC_HW_CHAN_IBUS_SENSE_, > + DA9150_GPADC_HW_CHAN_VBUS_DIV, > + DA9150_GPADC_HW_CHAN_VBUS_DIV_, > + DA9150_GPADC_HW_CHAN_ID, > + DA9150_GPADC_HW_CHAN_ID_, > + DA9150_GPADC_HW_CHAN_VSYS, > + DA9150_GPADC_HW_CHAN_VSYS_, > + DA9150_GPADC_HW_CHAN_GPIOA_6V, > + DA9150_GPADC_HW_CHAN_GPIOA_6V_, > + DA9150_GPADC_HW_CHAN_GPIOB_6V, > + DA9150_GPADC_HW_CHAN_GPIOB_6V_, > + DA9150_GPADC_HW_CHAN_GPIOC_6V, > + DA9150_GPADC_HW_CHAN_GPIOC_6V_, > + DA9150_GPADC_HW_CHAN_GPIOD_6V, > + DA9150_GPADC_HW_CHAN_GPIOD_6V_, > + DA9150_GPADC_HW_CHAN_VBAT, > + DA9150_GPADC_HW_CHAN_VBAT_, > + DA9150_GPADC_HW_CHAN_TBAT, > + DA9150_GPADC_HW_CHAN_TBAT_, > + DA9150_GPADC_HW_CHAN_TJUNC_CORE, > + DA9150_GPADC_HW_CHAN_TJUNC_CORE_, > + DA9150_GPADC_HW_CHAN_TJUNC_OVP, > + DA9150_GPADC_HW_CHAN_TJUNC_OVP_, > +}; > + > +enum da9150_gpadc_channel { > + DA9150_GPADC_CHAN_GPIOA = 0, > + DA9150_GPADC_CHAN_GPIOB, > + DA9150_GPADC_CHAN_GPIOC, > + DA9150_GPADC_CHAN_GPIOD, > + DA9150_GPADC_CHAN_IBUS, > + DA9150_GPADC_CHAN_VBUS, > + DA9150_GPADC_CHAN_ID, > + DA9150_GPADC_CHAN_VSYS, > + DA9150_GPADC_CHAN_VBAT, > + DA9150_GPADC_CHAN_TBAT, > + DA9150_GPADC_CHAN_TJUNC_CORE, > + DA9150_GPADC_CHAN_TJUNC_OVP, > +}; > + > +/* Private data */ > +struct da9150_gpadc { > + struct da9150 *da9150; > + struct device *dev; > + > + struct mutex lock; > + struct completion complete; > +}; > + > + > +static irqreturn_t da9150_gpadc_irq(int irq, void *data) > +{ > + > + struct da9150_gpadc *gpadc = data; > + > + complete(&gpadc->complete); > + > + return IRQ_HANDLED; > +} > + > +static int da9150_gpadc_read_adc(struct da9150_gpadc *gpadc, int hw_chan) > +{ > + u8 result_regs[2]; > + int result; > + > + mutex_lock(&gpadc->lock); > + > + /* Set channel & enable measurement */ > + da9150_reg_write(gpadc->da9150, DA9150_GPADC_MAN, > + (DA9150_GPADC_EN_MASK | > + hw_chan << DA9150_GPADC_MUX_SHIFT)); > + > + /* Consume left-over completion from a previous timeout */ > + try_wait_for_completion(&gpadc->complete); > + > + /* Check for actual completion */ > + wait_for_completion_timeout(&gpadc->complete, msecs_to_jiffies(5)); > + > + /* Read result and status from device */ > + da9150_bulk_read(gpadc->da9150, DA9150_GPADC_RES_A, 2, result_regs); > + > + mutex_unlock(&gpadc->lock); > + > + /* Check to make sure device really has completed reading */ > + if (result_regs[1] & DA9150_GPADC_RUN_MASK) { > + dev_err(gpadc->dev, "Timeout on channel %d of GPADC\n", > + hw_chan); > + return -ETIMEDOUT; > + } > + > + /* LSBs - 2 bits */ > + result = (result_regs[1] & DA9150_GPADC_RES_L_MASK) >> > + DA9150_GPADC_RES_L_SHIFT; > + /* MSBs - 8 bits */ > + result |= result_regs[0] << DA9150_GPADC_RES_L_BITS; > + > + return result; > +} > + > +static inline int da9150_gpadc_gpio_6v_voltage_now(int raw_val) > +{ > + /* Convert to mV */ > + return (6 * ((raw_val * 1000) + 500)) / 1024; > +} > + > +static inline int da9150_gpadc_ibus_current_avg(int raw_val) > +{ > + /* Convert to mA */ > + return (4 * ((raw_val * 1000) + 500)) / 2048; > +} > + > +static inline int da9150_gpadc_vbus_21v_voltage_now(int raw_val) > +{ > + /* Convert to mV */ > + return (21 * ((raw_val * 1000) + 500)) / 1024; > +} > + > +static inline int da9150_gpadc_vsys_6v_voltage_now(int raw_val) > +{ > + /* Convert to mV */ > + return (3 * ((raw_val * 1000) + 500)) / 512; > +} > + > +static int da9150_gpadc_read_processed(struct da9150_gpadc *gpadc, int channel, > + int hw_chan, int *val) > +{ > + int raw_val; > + > + raw_val = da9150_gpadc_read_adc(gpadc, hw_chan); > + if (raw_val < 0) > + return raw_val; > + > + switch (channel) { > + case DA9150_GPADC_CHAN_GPIOA: > + case DA9150_GPADC_CHAN_GPIOB: > + case DA9150_GPADC_CHAN_GPIOC: > + case DA9150_GPADC_CHAN_GPIOD: > + *val = da9150_gpadc_gpio_6v_voltage_now(raw_val); > + break; > + case DA9150_GPADC_CHAN_IBUS: > + *val = da9150_gpadc_ibus_current_avg(raw_val); > + break; > + case DA9150_GPADC_CHAN_VBUS: > + *val = da9150_gpadc_vbus_21v_voltage_now(raw_val); > + break; > + case DA9150_GPADC_CHAN_VSYS: > + *val = da9150_gpadc_vsys_6v_voltage_now(raw_val); > + break; > + default: > + /* No processing for other channels so return raw value */ > + *val = raw_val; > + break; > + } > + > + return IIO_VAL_INT; > +} > + > +static int da9150_gpadc_read_scale(int channel, int *val, int *val2) > +{ > + switch (channel) { > + case DA9150_GPADC_CHAN_VBAT: > + *val = 2932; > + *val2 = 1000; > + return IIO_VAL_FRACTIONAL; > + case DA9150_GPADC_CHAN_TJUNC_CORE: > + case DA9150_GPADC_CHAN_TJUNC_OVP: > + *val = 1000000; > + *val2 = 4420; > + return IIO_VAL_FRACTIONAL; > + default: > + return -EINVAL; > + } > +} > + > +static int da9150_gpadc_read_offset(int channel, int *val) > +{ > + switch (channel) { > + case DA9150_GPADC_CHAN_VBAT: > + *val = 1500000 / 2932; > + return IIO_VAL_INT; > + case DA9150_GPADC_CHAN_TJUNC_CORE: > + case DA9150_GPADC_CHAN_TJUNC_OVP: > + *val = -144; > + return IIO_VAL_INT; > + default: > + return -EINVAL; > + } > +} > + > +static int da9150_gpadc_read_raw(struct iio_dev *indio_dev, > + struct iio_chan_spec const *chan, > + int *val, int *val2, long mask) > +{ > + struct da9150_gpadc *gpadc = iio_priv(indio_dev); > + > + if ((chan->channel < DA9150_GPADC_CHAN_GPIOA) || > + (chan->channel > DA9150_GPADC_CHAN_TJUNC_OVP)) > + return -EINVAL; > + > + switch (mask) { > + case IIO_CHAN_INFO_RAW: > + case IIO_CHAN_INFO_PROCESSED: > + return da9150_gpadc_read_processed(gpadc, chan->channel, > + chan->address, val); > + case IIO_CHAN_INFO_SCALE: > + return da9150_gpadc_read_scale(chan->channel, val, val2); > + case IIO_CHAN_INFO_OFFSET: > + return da9150_gpadc_read_offset(chan->channel, val); > + default: > + return -EINVAL; > + } > +} > + > +static const struct iio_info da9150_gpadc_info = { > + .read_raw = &da9150_gpadc_read_raw, > + .driver_module = THIS_MODULE, > +}; > + > +#define DA9150_GPADC_CHANNEL(_id, _hw_id, _type, chan_info, \ > + _ext_name) { \ > + .type = _type, \ > + .indexed = 1, \ > + .channel = DA9150_GPADC_CHAN_##_id, \ > + .address = DA9150_GPADC_HW_CHAN_##_hw_id, \ > + .info_mask_separate = chan_info, \ > + .extend_name = _ext_name, \ > + .datasheet_name = #_id, \ > +} > + > +#define DA9150_GPADC_CHANNEL_RAW(_id, _hw_id, _type, _ext_name) \ > + DA9150_GPADC_CHANNEL(_id, _hw_id, _type, \ > + BIT(IIO_CHAN_INFO_RAW), _ext_name) > + > +#define DA9150_GPADC_CHANNEL_SCALED(_id, _hw_id, _type, _ext_name) \ > + DA9150_GPADC_CHANNEL(_id, _hw_id, _type, \ > + BIT(IIO_CHAN_INFO_RAW) | \ > + BIT(IIO_CHAN_INFO_SCALE) | \ > + BIT(IIO_CHAN_INFO_OFFSET), \ > + _ext_name) > + > +#define DA9150_GPADC_CHANNEL_PROCESSED(_id, _hw_id, _type, _ext_name) \ > + DA9150_GPADC_CHANNEL(_id, _hw_id, _type, \ > + BIT(IIO_CHAN_INFO_PROCESSED), _ext_name) > + > +/* Supported channels */ > +static const struct iio_chan_spec da9150_gpadc_channels[] = { > + DA9150_GPADC_CHANNEL_PROCESSED(GPIOA, GPIOA_6V, IIO_VOLTAGE, "GPIOA"), > + DA9150_GPADC_CHANNEL_PROCESSED(GPIOB, GPIOB_6V, IIO_VOLTAGE, "GPIOB"), > + DA9150_GPADC_CHANNEL_PROCESSED(GPIOC, GPIOC_6V, IIO_VOLTAGE, "GPIOC"), > + DA9150_GPADC_CHANNEL_PROCESSED(GPIOD, GPIOD_6V, IIO_VOLTAGE, "GPIOD"), > + DA9150_GPADC_CHANNEL_PROCESSED(IBUS, IBUS_SENSE, IIO_CURRENT, "IBUS"), > + DA9150_GPADC_CHANNEL_PROCESSED(VBUS, VBUS_DIV_, IIO_VOLTAGE, "VBUS"), > + DA9150_GPADC_CHANNEL_RAW(ID, ID, IIO_VOLTAGE, "ID"), > + DA9150_GPADC_CHANNEL_PROCESSED(VSYS, VSYS, IIO_VOLTAGE, "VSYS"), > + DA9150_GPADC_CHANNEL_SCALED(VBAT, VBAT, IIO_VOLTAGE, "VBAT"), > + DA9150_GPADC_CHANNEL_RAW(TBAT, TBAT, IIO_VOLTAGE, "TBAT"), > + DA9150_GPADC_CHANNEL_SCALED(TJUNC_CORE, TJUNC_CORE, IIO_TEMP, > + "TJUNC_CORE"), > + DA9150_GPADC_CHANNEL_SCALED(TJUNC_OVP, TJUNC_OVP, IIO_TEMP, > + "TJUNC_OVP"), > +}; > + > +/* Default maps used by da9150-charger */ > +static struct iio_map da9150_gpadc_default_maps[] = { > + { > + .consumer_dev_name = "da9150-charger", > + .consumer_channel = "CHAN_IBUS", > + .adc_channel_label = "IBUS", > + }, > + { > + .consumer_dev_name = "da9150-charger", > + .consumer_channel = "CHAN_VBUS", > + .adc_channel_label = "VBUS", > + }, > + { > + .consumer_dev_name = "da9150-charger", > + .consumer_channel = "CHAN_TJUNC", > + .adc_channel_label = "TJUNC_CORE", > + }, > + { > + .consumer_dev_name = "da9150-charger", > + .consumer_channel = "CHAN_VBAT", > + .adc_channel_label = "VBAT", > + }, > + {}, > +}; > + > +static int da9150_gpadc_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct da9150 *da9150 = dev_get_drvdata(dev->parent); > + struct da9150_gpadc *gpadc; > + struct iio_dev *indio_dev; > + int irq, ret; > + > + indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*gpadc)); > + if (!indio_dev) { > + dev_err(&pdev->dev, "Failed to allocate IIO device\n"); > + return -ENOMEM; > + } > + gpadc = iio_priv(indio_dev); > + > + platform_set_drvdata(pdev, indio_dev); > + gpadc->da9150 = da9150; > + gpadc->dev = dev; > + mutex_init(&gpadc->lock); > + init_completion(&gpadc->complete); > + > + irq = platform_get_irq_byname(pdev, "GPADC"); > + if (irq < 0) { > + dev_err(dev, "Failed to get IRQ: %d\n", irq); > + return irq; > + } > + > + ret = devm_request_threaded_irq(dev, irq, NULL, da9150_gpadc_irq, > + IRQF_ONESHOT, "GPADC", gpadc); > + if (ret) { > + dev_err(dev, "Failed to request IRQ %d: %d\n", irq, ret); > + return ret; > + } > + > + ret = iio_map_array_register(indio_dev, da9150_gpadc_default_maps); > + if (ret) { > + dev_err(dev, "Failed to register IIO maps: %d\n", ret); > + return ret; > + } > + > + indio_dev->name = dev_name(dev); > + indio_dev->dev.parent = dev; > + indio_dev->dev.of_node = pdev->dev.of_node; > + indio_dev->info = &da9150_gpadc_info; > + indio_dev->modes = INDIO_DIRECT_MODE; > + indio_dev->channels = da9150_gpadc_channels; > + indio_dev->num_channels = ARRAY_SIZE(da9150_gpadc_channels); > + > + ret = iio_device_register(indio_dev); > + if (ret) { > + dev_err(dev, "Failed to register IIO device: %d\n", ret); > + goto iio_map_unreg; > + } > + > + return 0; > + > +iio_map_unreg: > + iio_map_array_unregister(indio_dev); > + > + return ret; > +} > + > +static int da9150_gpadc_remove(struct platform_device *pdev) > +{ > + struct iio_dev *indio_dev = platform_get_drvdata(pdev); > + > + iio_device_unregister(indio_dev); > + iio_map_array_unregister(indio_dev); > + > + return 0; > +} > + > +static struct platform_driver da9150_gpadc_driver = { > + .driver = { > + .name = "da9150-gpadc", > + }, > + .probe = da9150_gpadc_probe, > + .remove = da9150_gpadc_remove, > +}; > + > +module_platform_driver(da9150_gpadc_driver); > + > +MODULE_DESCRIPTION("GPADC Driver for DA9150"); > +MODULE_AUTHOR("Adam Thomson <Adam.Thomson.Opensource-WBD+wuPFNBhBDgjK7y7TUQ@public.gmane.org>"); > +MODULE_LICENSE("GPL"); > -- > 1.9.3 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-iio" in > the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v5 3/7] iio: Add support for DA9150 GPADC [not found] ` <58b7b001b38662c36595412f96c7d2eb5c3adcad.1419264383.git.Adam.Thomson.Opensource-WBD+wuPFNBhBDgjK7y7TUQ@public.gmane.org> 2015-01-01 20:51 ` Hartmut Knaack @ 2015-01-04 17:22 ` Jonathan Cameron 2015-01-07 16:03 ` Opensource [Adam Thomson] 1 sibling, 1 reply; 20+ messages in thread From: Jonathan Cameron @ 2015-01-04 17:22 UTC (permalink / raw) To: Adam Thomson, Lee Jones, Samuel Ortiz, Hartmut Knaack, linux-iio-u79uwXL29TY76Z2rM5mHXA, Sebastian Reichel, Dmitry Eremin-Solenikov, David Woodhouse, linux-pm-u79uwXL29TY76Z2rM5mHXA, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Grant Likely, devicetree-u79uwXL29TY76Z2rM5mHXA, Andrew Morton, Joe Perches Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA, support.opensource-WBD+wuPFNBhBDgjK7y7TUQ On 22/12/14 16:51, Adam Thomson wrote: > This patch adds support for DA9150 Charger & Fuel-Gauge IC GPADC. > > Signed-off-by: Adam Thomson <Adam.Thomson.Opensource-WBD+wuPFNBhBDgjK7y7TUQ@public.gmane.org> One last query from me. Using the extended channel names in IIO is only really appropriate when they don't correspond to simple pins on the side of the chip. For those just drop the extname bit. Some of the channels you have here, definitely need them though. Drop those first 4 or convince me otherwise and add Acked-by: Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> > --- > drivers/iio/adc/Kconfig | 9 + > drivers/iio/adc/Makefile | 1 + > drivers/iio/adc/da9150-gpadc.c | 409 +++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 419 insertions(+) > create mode 100644 drivers/iio/adc/da9150-gpadc.c > > diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig > index 0f79e47..6e00b81 100644 > --- a/drivers/iio/adc/Kconfig > +++ b/drivers/iio/adc/Kconfig > @@ -135,6 +135,15 @@ config AXP288_ADC > device. Depending on platform configuration, this general purpose ADC can > be used for sampling sensors such as thermal resistors. > > +config DA9150_GPADC > + tristate "Dialog DA9150 GPADC driver support" > + depends on MFD_DA9150 > + help > + Say yes here to build support for Dialog DA9150 GPADC. > + > + This driver can also be built as a module. If chosen, the module name > + will be da9150-gpadc. > + > config EXYNOS_ADC > tristate "Exynos ADC driver support" > depends on ARCH_EXYNOS || ARCH_S3C24XX || ARCH_S3C64XX || (OF && COMPILE_TEST) > diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile > index 701fdb7..d56ee9b 100644 > --- a/drivers/iio/adc/Makefile > +++ b/drivers/iio/adc/Makefile > @@ -15,6 +15,7 @@ obj-$(CONFIG_AD7887) += ad7887.o > obj-$(CONFIG_AD799X) += ad799x.o > obj-$(CONFIG_AT91_ADC) += at91_adc.o > obj-$(CONFIG_AXP288_ADC) += axp288_adc.o > +obj-$(CONFIG_DA9150_GPADC) += da9150-gpadc.o > obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o > obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o > obj-$(CONFIG_MAX1027) += max1027.o > diff --git a/drivers/iio/adc/da9150-gpadc.c b/drivers/iio/adc/da9150-gpadc.c > new file mode 100644 > index 0000000..3f7bc81 > --- /dev/null > +++ b/drivers/iio/adc/da9150-gpadc.c > @@ -0,0 +1,409 @@ > +/* > + * DA9150 GPADC Driver > + * > + * Copyright (c) 2014 Dialog Semiconductor > + * > + * Author: Adam Thomson <Adam.Thomson.Opensource-WBD+wuPFNBhBDgjK7y7TUQ@public.gmane.org> > + * > + * 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. > + */ > + > +#include <linux/kernel.h> > +#include <linux/slab.h> > +#include <linux/module.h> > +#include <linux/platform_device.h> > +#include <linux/interrupt.h> > +#include <linux/mutex.h> > +#include <linux/completion.h> > +#include <linux/iio/iio.h> > +#include <linux/iio/machine.h> > +#include <linux/iio/driver.h> > +#include <linux/mfd/da9150/core.h> > +#include <linux/mfd/da9150/registers.h> > + > +/* Channels */ > +enum da9150_gpadc_hw_channel { > + DA9150_GPADC_HW_CHAN_GPIOA_2V = 0, > + DA9150_GPADC_HW_CHAN_GPIOA_2V_, > + DA9150_GPADC_HW_CHAN_GPIOB_2V, > + DA9150_GPADC_HW_CHAN_GPIOB_2V_, > + DA9150_GPADC_HW_CHAN_GPIOC_2V, > + DA9150_GPADC_HW_CHAN_GPIOC_2V_, > + DA9150_GPADC_HW_CHAN_GPIOD_2V, > + DA9150_GPADC_HW_CHAN_GPIOD_2V_, > + DA9150_GPADC_HW_CHAN_IBUS_SENSE, > + DA9150_GPADC_HW_CHAN_IBUS_SENSE_, > + DA9150_GPADC_HW_CHAN_VBUS_DIV, > + DA9150_GPADC_HW_CHAN_VBUS_DIV_, > + DA9150_GPADC_HW_CHAN_ID, > + DA9150_GPADC_HW_CHAN_ID_, > + DA9150_GPADC_HW_CHAN_VSYS, > + DA9150_GPADC_HW_CHAN_VSYS_, > + DA9150_GPADC_HW_CHAN_GPIOA_6V, > + DA9150_GPADC_HW_CHAN_GPIOA_6V_, > + DA9150_GPADC_HW_CHAN_GPIOB_6V, > + DA9150_GPADC_HW_CHAN_GPIOB_6V_, > + DA9150_GPADC_HW_CHAN_GPIOC_6V, > + DA9150_GPADC_HW_CHAN_GPIOC_6V_, > + DA9150_GPADC_HW_CHAN_GPIOD_6V, > + DA9150_GPADC_HW_CHAN_GPIOD_6V_, > + DA9150_GPADC_HW_CHAN_VBAT, > + DA9150_GPADC_HW_CHAN_VBAT_, > + DA9150_GPADC_HW_CHAN_TBAT, > + DA9150_GPADC_HW_CHAN_TBAT_, > + DA9150_GPADC_HW_CHAN_TJUNC_CORE, > + DA9150_GPADC_HW_CHAN_TJUNC_CORE_, > + DA9150_GPADC_HW_CHAN_TJUNC_OVP, > + DA9150_GPADC_HW_CHAN_TJUNC_OVP_, > +}; > + > +enum da9150_gpadc_channel { > + DA9150_GPADC_CHAN_GPIOA = 0, > + DA9150_GPADC_CHAN_GPIOB, > + DA9150_GPADC_CHAN_GPIOC, > + DA9150_GPADC_CHAN_GPIOD, > + DA9150_GPADC_CHAN_IBUS, > + DA9150_GPADC_CHAN_VBUS, > + DA9150_GPADC_CHAN_ID, > + DA9150_GPADC_CHAN_VSYS, > + DA9150_GPADC_CHAN_VBAT, > + DA9150_GPADC_CHAN_TBAT, > + DA9150_GPADC_CHAN_TJUNC_CORE, > + DA9150_GPADC_CHAN_TJUNC_OVP, > +}; > + > +/* Private data */ > +struct da9150_gpadc { > + struct da9150 *da9150; > + struct device *dev; > + > + struct mutex lock; > + struct completion complete; > +}; > + > + > +static irqreturn_t da9150_gpadc_irq(int irq, void *data) > +{ > + > + struct da9150_gpadc *gpadc = data; > + > + complete(&gpadc->complete); > + > + return IRQ_HANDLED; > +} > + > +static int da9150_gpadc_read_adc(struct da9150_gpadc *gpadc, int hw_chan) > +{ > + u8 result_regs[2]; > + int result; > + > + mutex_lock(&gpadc->lock); > + > + /* Set channel & enable measurement */ > + da9150_reg_write(gpadc->da9150, DA9150_GPADC_MAN, > + (DA9150_GPADC_EN_MASK | > + hw_chan << DA9150_GPADC_MUX_SHIFT)); > + > + /* Consume left-over completion from a previous timeout */ > + try_wait_for_completion(&gpadc->complete); > + > + /* Check for actual completion */ > + wait_for_completion_timeout(&gpadc->complete, msecs_to_jiffies(5)); > + > + /* Read result and status from device */ > + da9150_bulk_read(gpadc->da9150, DA9150_GPADC_RES_A, 2, result_regs); > + > + mutex_unlock(&gpadc->lock); > + > + /* Check to make sure device really has completed reading */ > + if (result_regs[1] & DA9150_GPADC_RUN_MASK) { > + dev_err(gpadc->dev, "Timeout on channel %d of GPADC\n", > + hw_chan); > + return -ETIMEDOUT; > + } > + > + /* LSBs - 2 bits */ > + result = (result_regs[1] & DA9150_GPADC_RES_L_MASK) >> > + DA9150_GPADC_RES_L_SHIFT; > + /* MSBs - 8 bits */ > + result |= result_regs[0] << DA9150_GPADC_RES_L_BITS; > + > + return result; > +} > + > +static inline int da9150_gpadc_gpio_6v_voltage_now(int raw_val) > +{ > + /* Convert to mV */ > + return (6 * ((raw_val * 1000) + 500)) / 1024; > +} > + > +static inline int da9150_gpadc_ibus_current_avg(int raw_val) > +{ > + /* Convert to mA */ > + return (4 * ((raw_val * 1000) + 500)) / 2048; > +} > + > +static inline int da9150_gpadc_vbus_21v_voltage_now(int raw_val) > +{ > + /* Convert to mV */ > + return (21 * ((raw_val * 1000) + 500)) / 1024; > +} > + > +static inline int da9150_gpadc_vsys_6v_voltage_now(int raw_val) > +{ > + /* Convert to mV */ > + return (3 * ((raw_val * 1000) + 500)) / 512; > +} > + > +static int da9150_gpadc_read_processed(struct da9150_gpadc *gpadc, int channel, > + int hw_chan, int *val) > +{ > + int raw_val; > + > + raw_val = da9150_gpadc_read_adc(gpadc, hw_chan); > + if (raw_val < 0) > + return raw_val; > + > + switch (channel) { > + case DA9150_GPADC_CHAN_GPIOA: > + case DA9150_GPADC_CHAN_GPIOB: > + case DA9150_GPADC_CHAN_GPIOC: > + case DA9150_GPADC_CHAN_GPIOD: > + *val = da9150_gpadc_gpio_6v_voltage_now(raw_val); > + break; > + case DA9150_GPADC_CHAN_IBUS: > + *val = da9150_gpadc_ibus_current_avg(raw_val); > + break; > + case DA9150_GPADC_CHAN_VBUS: > + *val = da9150_gpadc_vbus_21v_voltage_now(raw_val); > + break; > + case DA9150_GPADC_CHAN_VSYS: > + *val = da9150_gpadc_vsys_6v_voltage_now(raw_val); > + break; > + default: > + /* No processing for other channels so return raw value */ > + *val = raw_val; > + break; > + } > + > + return IIO_VAL_INT; > +} > + > +static int da9150_gpadc_read_scale(int channel, int *val, int *val2) > +{ > + switch (channel) { > + case DA9150_GPADC_CHAN_VBAT: > + *val = 2932; > + *val2 = 1000; > + return IIO_VAL_FRACTIONAL; > + case DA9150_GPADC_CHAN_TJUNC_CORE: > + case DA9150_GPADC_CHAN_TJUNC_OVP: > + *val = 1000000; > + *val2 = 4420; > + return IIO_VAL_FRACTIONAL; > + default: > + return -EINVAL; > + } > +} > + > +static int da9150_gpadc_read_offset(int channel, int *val) > +{ > + switch (channel) { > + case DA9150_GPADC_CHAN_VBAT: > + *val = 1500000 / 2932; > + return IIO_VAL_INT; > + case DA9150_GPADC_CHAN_TJUNC_CORE: > + case DA9150_GPADC_CHAN_TJUNC_OVP: > + *val = -144; > + return IIO_VAL_INT; > + default: > + return -EINVAL; > + } > +} > + > +static int da9150_gpadc_read_raw(struct iio_dev *indio_dev, > + struct iio_chan_spec const *chan, > + int *val, int *val2, long mask) > +{ > + struct da9150_gpadc *gpadc = iio_priv(indio_dev); > + > + if ((chan->channel < DA9150_GPADC_CHAN_GPIOA) || > + (chan->channel > DA9150_GPADC_CHAN_TJUNC_OVP)) > + return -EINVAL; > + > + switch (mask) { > + case IIO_CHAN_INFO_RAW: > + case IIO_CHAN_INFO_PROCESSED: > + return da9150_gpadc_read_processed(gpadc, chan->channel, > + chan->address, val); > + case IIO_CHAN_INFO_SCALE: > + return da9150_gpadc_read_scale(chan->channel, val, val2); > + case IIO_CHAN_INFO_OFFSET: > + return da9150_gpadc_read_offset(chan->channel, val); > + default: > + return -EINVAL; > + } > +} > + > +static const struct iio_info da9150_gpadc_info = { > + .read_raw = &da9150_gpadc_read_raw, > + .driver_module = THIS_MODULE, > +}; > + > +#define DA9150_GPADC_CHANNEL(_id, _hw_id, _type, chan_info, \ > + _ext_name) { \ > + .type = _type, \ > + .indexed = 1, \ > + .channel = DA9150_GPADC_CHAN_##_id, \ > + .address = DA9150_GPADC_HW_CHAN_##_hw_id, \ > + .info_mask_separate = chan_info, \ > + .extend_name = _ext_name, \ > + .datasheet_name = #_id, \ > +} > + > +#define DA9150_GPADC_CHANNEL_RAW(_id, _hw_id, _type, _ext_name) \ > + DA9150_GPADC_CHANNEL(_id, _hw_id, _type, \ > + BIT(IIO_CHAN_INFO_RAW), _ext_name) > + > +#define DA9150_GPADC_CHANNEL_SCALED(_id, _hw_id, _type, _ext_name) \ > + DA9150_GPADC_CHANNEL(_id, _hw_id, _type, \ > + BIT(IIO_CHAN_INFO_RAW) | \ > + BIT(IIO_CHAN_INFO_SCALE) | \ > + BIT(IIO_CHAN_INFO_OFFSET), \ > + _ext_name) > + > +#define DA9150_GPADC_CHANNEL_PROCESSED(_id, _hw_id, _type, _ext_name) \ > + DA9150_GPADC_CHANNEL(_id, _hw_id, _type, \ > + BIT(IIO_CHAN_INFO_PROCESSED), _ext_name) > + > +/* Supported channels */ > +static const struct iio_chan_spec da9150_gpadc_channels[] = { > + DA9150_GPADC_CHANNEL_PROCESSED(GPIOA, GPIOA_6V, IIO_VOLTAGE, "GPIOA"), > + DA9150_GPADC_CHANNEL_PROCESSED(GPIOB, GPIOB_6V, IIO_VOLTAGE, "GPIOB"), > + DA9150_GPADC_CHANNEL_PROCESSED(GPIOC, GPIOC_6V, IIO_VOLTAGE, "GPIOC"), > + DA9150_GPADC_CHANNEL_PROCESSED(GPIOD, GPIOD_6V, IIO_VOLTAGE, "GPIOD"), I'm not sure some of these really deserve extended names. Those are usually reserved for naming strange internal adc channels etc. These first 4 are presumably just for input pins? Those should just be channels 0..3 On another note, unless you want really weird sysfs attribute names, the extended names want to be lowercase. > + DA9150_GPADC_CHANNEL_PROCESSED(IBUS, IBUS_SENSE, IIO_CURRENT, "IBUS"), > + DA9150_GPADC_CHANNEL_PROCESSED(VBUS, VBUS_DIV_, IIO_VOLTAGE, "VBUS"), > + DA9150_GPADC_CHANNEL_RAW(ID, ID, IIO_VOLTAGE, "ID"), You hae an identifier voltage? That's certainly unusual but if so - fair enough and it defintely needs the extname! > + DA9150_GPADC_CHANNEL_PROCESSED(VSYS, VSYS, IIO_VOLTAGE, "VSYS"), > + DA9150_GPADC_CHANNEL_SCALED(VBAT, VBAT, IIO_VOLTAGE, "VBAT"), > + DA9150_GPADC_CHANNEL_RAW(TBAT, TBAT, IIO_VOLTAGE, "TBAT"), > + DA9150_GPADC_CHANNEL_SCALED(TJUNC_CORE, TJUNC_CORE, IIO_TEMP, > + "TJUNC_CORE"), tjunc_core is a good use of extname ;) > + DA9150_GPADC_CHANNEL_SCALED(TJUNC_OVP, TJUNC_OVP, IIO_TEMP, > + "TJUNC_OVP"), > +}; > + > +/* Default maps used by da9150-charger */ > +static struct iio_map da9150_gpadc_default_maps[] = { > + { > + .consumer_dev_name = "da9150-charger", > + .consumer_channel = "CHAN_IBUS", > + .adc_channel_label = "IBUS", > + }, > + { > + .consumer_dev_name = "da9150-charger", > + .consumer_channel = "CHAN_VBUS", > + .adc_channel_label = "VBUS", > + }, > + { > + .consumer_dev_name = "da9150-charger", > + .consumer_channel = "CHAN_TJUNC", > + .adc_channel_label = "TJUNC_CORE", > + }, > + { > + .consumer_dev_name = "da9150-charger", > + .consumer_channel = "CHAN_VBAT", > + .adc_channel_label = "VBAT", > + }, > + {}, > +}; > + > +static int da9150_gpadc_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct da9150 *da9150 = dev_get_drvdata(dev->parent); > + struct da9150_gpadc *gpadc; > + struct iio_dev *indio_dev; > + int irq, ret; > + > + indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*gpadc)); > + if (!indio_dev) { > + dev_err(&pdev->dev, "Failed to allocate IIO device\n"); > + return -ENOMEM; > + } > + gpadc = iio_priv(indio_dev); > + > + platform_set_drvdata(pdev, indio_dev); > + gpadc->da9150 = da9150; > + gpadc->dev = dev; > + mutex_init(&gpadc->lock); > + init_completion(&gpadc->complete); > + > + irq = platform_get_irq_byname(pdev, "GPADC"); > + if (irq < 0) { > + dev_err(dev, "Failed to get IRQ: %d\n", irq); > + return irq; > + } > + > + ret = devm_request_threaded_irq(dev, irq, NULL, da9150_gpadc_irq, > + IRQF_ONESHOT, "GPADC", gpadc); > + if (ret) { > + dev_err(dev, "Failed to request IRQ %d: %d\n", irq, ret); > + return ret; > + } > + > + ret = iio_map_array_register(indio_dev, da9150_gpadc_default_maps); > + if (ret) { > + dev_err(dev, "Failed to register IIO maps: %d\n", ret); > + return ret; > + } > + > + indio_dev->name = dev_name(dev); > + indio_dev->dev.parent = dev; > + indio_dev->dev.of_node = pdev->dev.of_node; > + indio_dev->info = &da9150_gpadc_info; > + indio_dev->modes = INDIO_DIRECT_MODE; > + indio_dev->channels = da9150_gpadc_channels; > + indio_dev->num_channels = ARRAY_SIZE(da9150_gpadc_channels); > + > + ret = iio_device_register(indio_dev); > + if (ret) { > + dev_err(dev, "Failed to register IIO device: %d\n", ret); > + goto iio_map_unreg; > + } > + > + return 0; > + > +iio_map_unreg: > + iio_map_array_unregister(indio_dev); > + > + return ret; > +} > + > +static int da9150_gpadc_remove(struct platform_device *pdev) > +{ > + struct iio_dev *indio_dev = platform_get_drvdata(pdev); > + > + iio_device_unregister(indio_dev); > + iio_map_array_unregister(indio_dev); > + > + return 0; > +} > + > +static struct platform_driver da9150_gpadc_driver = { > + .driver = { > + .name = "da9150-gpadc", > + }, > + .probe = da9150_gpadc_probe, > + .remove = da9150_gpadc_remove, > +}; > + > +module_platform_driver(da9150_gpadc_driver); > + > +MODULE_DESCRIPTION("GPADC Driver for DA9150"); > +MODULE_AUTHOR("Adam Thomson <Adam.Thomson.Opensource-WBD+wuPFNBhBDgjK7y7TUQ@public.gmane.org>"); > +MODULE_LICENSE("GPL"); > -- > 1.9.3 > ^ permalink raw reply [flat|nested] 20+ messages in thread
* RE: [PATCH v5 3/7] iio: Add support for DA9150 GPADC 2015-01-04 17:22 ` Jonathan Cameron @ 2015-01-07 16:03 ` Opensource [Adam Thomson] [not found] ` <2E89032DDAA8B9408CB92943514A0337AB526A19-68WUHU125fLLPO1uwJ3ImwLouzNaz+3S@public.gmane.org> 0 siblings, 1 reply; 20+ messages in thread From: Opensource [Adam Thomson] @ 2015-01-07 16:03 UTC (permalink / raw) To: Jonathan Cameron, Opensource [Adam Thomson], Lee Jones, Samuel Ortiz, Hartmut Knaack, linux-iio@vger.kernel.org, Sebastian Reichel, Dmitry Eremin-Solenikov, David Woodhouse, linux-pm@vger.kernel.org, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Grant Likely, devicetree@vger.kernel.org, Andrew Morton, Joe Perches Cc: linux-kernel@vger.kernel.org, Support Opensource On January 4, 2015 17:22, Jonathan Cameron wrote: > On 22/12/14 16:51, Adam Thomson wrote: > > This patch adds support for DA9150 Charger & Fuel-Gauge IC GPADC. > > > > Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> > One last query from me. > > Using the extended channel names in IIO is only really appropriate when > they don't correspond to simple pins on the side of the chip. For those > just drop the extname bit. Some of the channels you have here, definitely > need them though. > > Drop those first 4 or convince me otherwise and add > Acked-by: Jonathan Cameron <jic23@kernel.org> Have added responses below. If the comments are accepted then I'll respin and add you're 'Acked-by'. Is that ok? > > --- > > drivers/iio/adc/Kconfig | 9 + > > drivers/iio/adc/Makefile | 1 + > > drivers/iio/adc/da9150-gpadc.c | 409 > +++++++++++++++++++++++++++++++++++++++++ > > 3 files changed, 419 insertions(+) > > create mode 100644 drivers/iio/adc/da9150-gpadc.c > > > > diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig > > index 0f79e47..6e00b81 100644 > > --- a/drivers/iio/adc/Kconfig > > +++ b/drivers/iio/adc/Kconfig > > @@ -135,6 +135,15 @@ config AXP288_ADC > > device. Depending on platform configuration, this general purpose ADC can > > be used for sampling sensors such as thermal resistors. > > > > +config DA9150_GPADC > > + tristate "Dialog DA9150 GPADC driver support" > > + depends on MFD_DA9150 > > + help > > + Say yes here to build support for Dialog DA9150 GPADC. > > + > > + This driver can also be built as a module. If chosen, the module name > > + will be da9150-gpadc. > > + > > config EXYNOS_ADC > > tristate "Exynos ADC driver support" > > depends on ARCH_EXYNOS || ARCH_S3C24XX || ARCH_S3C64XX || (OF && > COMPILE_TEST) > > diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile > > index 701fdb7..d56ee9b 100644 > > --- a/drivers/iio/adc/Makefile > > +++ b/drivers/iio/adc/Makefile > > @@ -15,6 +15,7 @@ obj-$(CONFIG_AD7887) += ad7887.o > > obj-$(CONFIG_AD799X) += ad799x.o > > obj-$(CONFIG_AT91_ADC) += at91_adc.o > > obj-$(CONFIG_AXP288_ADC) += axp288_adc.o > > +obj-$(CONFIG_DA9150_GPADC) += da9150-gpadc.o > > obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o > > obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o > > obj-$(CONFIG_MAX1027) += max1027.o > > diff --git a/drivers/iio/adc/da9150-gpadc.c b/drivers/iio/adc/da9150-gpadc.c > > new file mode 100644 > > index 0000000..3f7bc81 > > --- /dev/null > > +++ b/drivers/iio/adc/da9150-gpadc.c > > @@ -0,0 +1,409 @@ > > +/* > > + * DA9150 GPADC Driver > > + * > > + * Copyright (c) 2014 Dialog Semiconductor > > + * > > + * Author: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> > > + * > > + * 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. > > + */ > > + > > +#include <linux/kernel.h> > > +#include <linux/slab.h> > > +#include <linux/module.h> > > +#include <linux/platform_device.h> > > +#include <linux/interrupt.h> > > +#include <linux/mutex.h> > > +#include <linux/completion.h> > > +#include <linux/iio/iio.h> > > +#include <linux/iio/machine.h> > > +#include <linux/iio/driver.h> > > +#include <linux/mfd/da9150/core.h> > > +#include <linux/mfd/da9150/registers.h> > > + > > +/* Channels */ > > +enum da9150_gpadc_hw_channel { > > + DA9150_GPADC_HW_CHAN_GPIOA_2V = 0, > > + DA9150_GPADC_HW_CHAN_GPIOA_2V_, > > + DA9150_GPADC_HW_CHAN_GPIOB_2V, > > + DA9150_GPADC_HW_CHAN_GPIOB_2V_, > > + DA9150_GPADC_HW_CHAN_GPIOC_2V, > > + DA9150_GPADC_HW_CHAN_GPIOC_2V_, > > + DA9150_GPADC_HW_CHAN_GPIOD_2V, > > + DA9150_GPADC_HW_CHAN_GPIOD_2V_, > > + DA9150_GPADC_HW_CHAN_IBUS_SENSE, > > + DA9150_GPADC_HW_CHAN_IBUS_SENSE_, > > + DA9150_GPADC_HW_CHAN_VBUS_DIV, > > + DA9150_GPADC_HW_CHAN_VBUS_DIV_, > > + DA9150_GPADC_HW_CHAN_ID, > > + DA9150_GPADC_HW_CHAN_ID_, > > + DA9150_GPADC_HW_CHAN_VSYS, > > + DA9150_GPADC_HW_CHAN_VSYS_, > > + DA9150_GPADC_HW_CHAN_GPIOA_6V, > > + DA9150_GPADC_HW_CHAN_GPIOA_6V_, > > + DA9150_GPADC_HW_CHAN_GPIOB_6V, > > + DA9150_GPADC_HW_CHAN_GPIOB_6V_, > > + DA9150_GPADC_HW_CHAN_GPIOC_6V, > > + DA9150_GPADC_HW_CHAN_GPIOC_6V_, > > + DA9150_GPADC_HW_CHAN_GPIOD_6V, > > + DA9150_GPADC_HW_CHAN_GPIOD_6V_, > > + DA9150_GPADC_HW_CHAN_VBAT, > > + DA9150_GPADC_HW_CHAN_VBAT_, > > + DA9150_GPADC_HW_CHAN_TBAT, > > + DA9150_GPADC_HW_CHAN_TBAT_, > > + DA9150_GPADC_HW_CHAN_TJUNC_CORE, > > + DA9150_GPADC_HW_CHAN_TJUNC_CORE_, > > + DA9150_GPADC_HW_CHAN_TJUNC_OVP, > > + DA9150_GPADC_HW_CHAN_TJUNC_OVP_, > > +}; > > + > > +enum da9150_gpadc_channel { > > + DA9150_GPADC_CHAN_GPIOA = 0, > > + DA9150_GPADC_CHAN_GPIOB, > > + DA9150_GPADC_CHAN_GPIOC, > > + DA9150_GPADC_CHAN_GPIOD, > > + DA9150_GPADC_CHAN_IBUS, > > + DA9150_GPADC_CHAN_VBUS, > > + DA9150_GPADC_CHAN_ID, > > + DA9150_GPADC_CHAN_VSYS, > > + DA9150_GPADC_CHAN_VBAT, > > + DA9150_GPADC_CHAN_TBAT, > > + DA9150_GPADC_CHAN_TJUNC_CORE, > > + DA9150_GPADC_CHAN_TJUNC_OVP, > > +}; > > + > > +/* Private data */ > > +struct da9150_gpadc { > > + struct da9150 *da9150; > > + struct device *dev; > > + > > + struct mutex lock; > > + struct completion complete; > > +}; > > + > > + > > +static irqreturn_t da9150_gpadc_irq(int irq, void *data) > > +{ > > + > > + struct da9150_gpadc *gpadc = data; > > + > > + complete(&gpadc->complete); > > + > > + return IRQ_HANDLED; > > +} > > + > > +static int da9150_gpadc_read_adc(struct da9150_gpadc *gpadc, int hw_chan) > > +{ > > + u8 result_regs[2]; > > + int result; > > + > > + mutex_lock(&gpadc->lock); > > + > > + /* Set channel & enable measurement */ > > + da9150_reg_write(gpadc->da9150, DA9150_GPADC_MAN, > > + (DA9150_GPADC_EN_MASK | > > + hw_chan << DA9150_GPADC_MUX_SHIFT)); > > + > > + /* Consume left-over completion from a previous timeout */ > > + try_wait_for_completion(&gpadc->complete); > > + > > + /* Check for actual completion */ > > + wait_for_completion_timeout(&gpadc->complete, msecs_to_jiffies(5)); > > + > > + /* Read result and status from device */ > > + da9150_bulk_read(gpadc->da9150, DA9150_GPADC_RES_A, 2, result_regs); > > + > > + mutex_unlock(&gpadc->lock); > > + > > + /* Check to make sure device really has completed reading */ > > + if (result_regs[1] & DA9150_GPADC_RUN_MASK) { > > + dev_err(gpadc->dev, "Timeout on channel %d of GPADC\n", > > + hw_chan); > > + return -ETIMEDOUT; > > + } > > + > > + /* LSBs - 2 bits */ > > + result = (result_regs[1] & DA9150_GPADC_RES_L_MASK) >> > > + DA9150_GPADC_RES_L_SHIFT; > > + /* MSBs - 8 bits */ > > + result |= result_regs[0] << DA9150_GPADC_RES_L_BITS; > > + > > + return result; > > +} > > + > > +static inline int da9150_gpadc_gpio_6v_voltage_now(int raw_val) > > +{ > > + /* Convert to mV */ > > + return (6 * ((raw_val * 1000) + 500)) / 1024; > > +} > > + > > +static inline int da9150_gpadc_ibus_current_avg(int raw_val) > > +{ > > + /* Convert to mA */ > > + return (4 * ((raw_val * 1000) + 500)) / 2048; > > +} > > + > > +static inline int da9150_gpadc_vbus_21v_voltage_now(int raw_val) > > +{ > > + /* Convert to mV */ > > + return (21 * ((raw_val * 1000) + 500)) / 1024; > > +} > > + > > +static inline int da9150_gpadc_vsys_6v_voltage_now(int raw_val) > > +{ > > + /* Convert to mV */ > > + return (3 * ((raw_val * 1000) + 500)) / 512; > > +} > > + > > +static int da9150_gpadc_read_processed(struct da9150_gpadc *gpadc, int > channel, > > + int hw_chan, int *val) > > +{ > > + int raw_val; > > + > > + raw_val = da9150_gpadc_read_adc(gpadc, hw_chan); > > + if (raw_val < 0) > > + return raw_val; > > + > > + switch (channel) { > > + case DA9150_GPADC_CHAN_GPIOA: > > + case DA9150_GPADC_CHAN_GPIOB: > > + case DA9150_GPADC_CHAN_GPIOC: > > + case DA9150_GPADC_CHAN_GPIOD: > > + *val = da9150_gpadc_gpio_6v_voltage_now(raw_val); > > + break; > > + case DA9150_GPADC_CHAN_IBUS: > > + *val = da9150_gpadc_ibus_current_avg(raw_val); > > + break; > > + case DA9150_GPADC_CHAN_VBUS: > > + *val = da9150_gpadc_vbus_21v_voltage_now(raw_val); > > + break; > > + case DA9150_GPADC_CHAN_VSYS: > > + *val = da9150_gpadc_vsys_6v_voltage_now(raw_val); > > + break; > > + default: > > + /* No processing for other channels so return raw value */ > > + *val = raw_val; > > + break; > > + } > > + > > + return IIO_VAL_INT; > > +} > > + > > +static int da9150_gpadc_read_scale(int channel, int *val, int *val2) > > +{ > > + switch (channel) { > > + case DA9150_GPADC_CHAN_VBAT: > > + *val = 2932; > > + *val2 = 1000; > > + return IIO_VAL_FRACTIONAL; > > + case DA9150_GPADC_CHAN_TJUNC_CORE: > > + case DA9150_GPADC_CHAN_TJUNC_OVP: > > + *val = 1000000; > > + *val2 = 4420; > > + return IIO_VAL_FRACTIONAL; > > + default: > > + return -EINVAL; > > + } > > +} > > + > > +static int da9150_gpadc_read_offset(int channel, int *val) > > +{ > > + switch (channel) { > > + case DA9150_GPADC_CHAN_VBAT: > > + *val = 1500000 / 2932; > > + return IIO_VAL_INT; > > + case DA9150_GPADC_CHAN_TJUNC_CORE: > > + case DA9150_GPADC_CHAN_TJUNC_OVP: > > + *val = -144; > > + return IIO_VAL_INT; > > + default: > > + return -EINVAL; > > + } > > +} > > + > > +static int da9150_gpadc_read_raw(struct iio_dev *indio_dev, > > + struct iio_chan_spec const *chan, > > + int *val, int *val2, long mask) > > +{ > > + struct da9150_gpadc *gpadc = iio_priv(indio_dev); > > + > > + if ((chan->channel < DA9150_GPADC_CHAN_GPIOA) || > > + (chan->channel > DA9150_GPADC_CHAN_TJUNC_OVP)) > > + return -EINVAL; > > + > > + switch (mask) { > > + case IIO_CHAN_INFO_RAW: > > + case IIO_CHAN_INFO_PROCESSED: > > + return da9150_gpadc_read_processed(gpadc, chan->channel, > > + chan->address, val); > > + case IIO_CHAN_INFO_SCALE: > > + return da9150_gpadc_read_scale(chan->channel, val, val2); > > + case IIO_CHAN_INFO_OFFSET: > > + return da9150_gpadc_read_offset(chan->channel, val); > > + default: > > + return -EINVAL; > > + } > > +} > > + > > +static const struct iio_info da9150_gpadc_info = { > > + .read_raw = &da9150_gpadc_read_raw, > > + .driver_module = THIS_MODULE, > > +}; > > + > > +#define DA9150_GPADC_CHANNEL(_id, _hw_id, _type, chan_info, \ > > + _ext_name) { \ > > + .type = _type, \ > > + .indexed = 1, \ > > + .channel = DA9150_GPADC_CHAN_##_id, \ > > + .address = DA9150_GPADC_HW_CHAN_##_hw_id, \ > > + .info_mask_separate = chan_info, \ > > + .extend_name = _ext_name, \ > > + .datasheet_name = #_id, \ > > +} > > + > > +#define DA9150_GPADC_CHANNEL_RAW(_id, _hw_id, _type, _ext_name) \ > > + DA9150_GPADC_CHANNEL(_id, _hw_id, _type, \ > > + BIT(IIO_CHAN_INFO_RAW), _ext_name) > > + > > +#define DA9150_GPADC_CHANNEL_SCALED(_id, _hw_id, _type, _ext_name) \ > > + DA9150_GPADC_CHANNEL(_id, _hw_id, _type, \ > > + BIT(IIO_CHAN_INFO_RAW) | \ > > + BIT(IIO_CHAN_INFO_SCALE) | \ > > + BIT(IIO_CHAN_INFO_OFFSET), \ > > + _ext_name) > > + > > +#define DA9150_GPADC_CHANNEL_PROCESSED(_id, _hw_id, _type, _ext_name) > \ > > + DA9150_GPADC_CHANNEL(_id, _hw_id, _type, \ > > + BIT(IIO_CHAN_INFO_PROCESSED), _ext_name) > > + > > +/* Supported channels */ > > +static const struct iio_chan_spec da9150_gpadc_channels[] = { > > + DA9150_GPADC_CHANNEL_PROCESSED(GPIOA, GPIOA_6V, IIO_VOLTAGE, > "GPIOA"), > > + DA9150_GPADC_CHANNEL_PROCESSED(GPIOB, GPIOB_6V, IIO_VOLTAGE, > "GPIOB"), > > + DA9150_GPADC_CHANNEL_PROCESSED(GPIOC, GPIOC_6V, IIO_VOLTAGE, > "GPIOC"), > > + DA9150_GPADC_CHANNEL_PROCESSED(GPIOD, GPIOD_6V, IIO_VOLTAGE, > "GPIOD"), > I'm not sure some of these really deserve extended names. Those are usually > reserved for naming strange internal adc channels etc. These first 4 are > presumably just for input pins? Those should just be channels 0..3 > On another note, unless you want really weird sysfs attribute names, the > extended names want to be lowercase. > I'd prefer to keep the names because the input pins are muxed with GPIOs of the chip, so thought it sensible to show that this is the case. Am happy to change to lower-case to follow convention. > > + DA9150_GPADC_CHANNEL_PROCESSED(IBUS, IBUS_SENSE, IIO_CURRENT, > "IBUS"), > > + DA9150_GPADC_CHANNEL_PROCESSED(VBUS, VBUS_DIV_, IIO_VOLTAGE, > "VBUS"), > > + DA9150_GPADC_CHANNEL_RAW(ID, ID, IIO_VOLTAGE, "ID"), > You hae an identifier voltage? That's certainly unusual but if so - fair enough > and it defintely needs the extname! Thanks for pointing that out. Having checked again, this is not needed and can be dispensed with. > > + DA9150_GPADC_CHANNEL_PROCESSED(VSYS, VSYS, IIO_VOLTAGE, "VSYS"), > > + DA9150_GPADC_CHANNEL_SCALED(VBAT, VBAT, IIO_VOLTAGE, "VBAT"), > > + DA9150_GPADC_CHANNEL_RAW(TBAT, TBAT, IIO_VOLTAGE, "TBAT"), > > + DA9150_GPADC_CHANNEL_SCALED(TJUNC_CORE, TJUNC_CORE, > IIO_TEMP, > > + "TJUNC_CORE"), > tjunc_core is a good use of extname ;) > > + DA9150_GPADC_CHANNEL_SCALED(TJUNC_OVP, TJUNC_OVP, IIO_TEMP, > > + "TJUNC_OVP"), > > +}; > > + > > +/* Default maps used by da9150-charger */ > > +static struct iio_map da9150_gpadc_default_maps[] = { > > + { > > + .consumer_dev_name = "da9150-charger", > > + .consumer_channel = "CHAN_IBUS", > > + .adc_channel_label = "IBUS", > > + }, > > + { > > + .consumer_dev_name = "da9150-charger", > > + .consumer_channel = "CHAN_VBUS", > > + .adc_channel_label = "VBUS", > > + }, > > + { > > + .consumer_dev_name = "da9150-charger", > > + .consumer_channel = "CHAN_TJUNC", > > + .adc_channel_label = "TJUNC_CORE", > > + }, > > + { > > + .consumer_dev_name = "da9150-charger", > > + .consumer_channel = "CHAN_VBAT", > > + .adc_channel_label = "VBAT", > > + }, > > + {}, > > +}; > > + > > +static int da9150_gpadc_probe(struct platform_device *pdev) > > +{ > > + struct device *dev = &pdev->dev; > > + struct da9150 *da9150 = dev_get_drvdata(dev->parent); > > + struct da9150_gpadc *gpadc; > > + struct iio_dev *indio_dev; > > + int irq, ret; > > + > > + indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*gpadc)); > > + if (!indio_dev) { > > + dev_err(&pdev->dev, "Failed to allocate IIO device\n"); > > + return -ENOMEM; > > + } > > + gpadc = iio_priv(indio_dev); > > + > > + platform_set_drvdata(pdev, indio_dev); > > + gpadc->da9150 = da9150; > > + gpadc->dev = dev; > > + mutex_init(&gpadc->lock); > > + init_completion(&gpadc->complete); > > + > > + irq = platform_get_irq_byname(pdev, "GPADC"); > > + if (irq < 0) { > > + dev_err(dev, "Failed to get IRQ: %d\n", irq); > > + return irq; > > + } > > + > > + ret = devm_request_threaded_irq(dev, irq, NULL, da9150_gpadc_irq, > > + IRQF_ONESHOT, "GPADC", gpadc); > > + if (ret) { > > + dev_err(dev, "Failed to request IRQ %d: %d\n", irq, ret); > > + return ret; > > + } > > + > > + ret = iio_map_array_register(indio_dev, da9150_gpadc_default_maps); > > + if (ret) { > > + dev_err(dev, "Failed to register IIO maps: %d\n", ret); > > + return ret; > > + } > > + > > + indio_dev->name = dev_name(dev); > > + indio_dev->dev.parent = dev; > > + indio_dev->dev.of_node = pdev->dev.of_node; > > + indio_dev->info = &da9150_gpadc_info; > > + indio_dev->modes = INDIO_DIRECT_MODE; > > + indio_dev->channels = da9150_gpadc_channels; > > + indio_dev->num_channels = ARRAY_SIZE(da9150_gpadc_channels); > > + > > + ret = iio_device_register(indio_dev); > > + if (ret) { > > + dev_err(dev, "Failed to register IIO device: %d\n", ret); > > + goto iio_map_unreg; > > + } > > + > > + return 0; > > + > > +iio_map_unreg: > > + iio_map_array_unregister(indio_dev); > > + > > + return ret; > > +} > > + > > +static int da9150_gpadc_remove(struct platform_device *pdev) > > +{ > > + struct iio_dev *indio_dev = platform_get_drvdata(pdev); > > + > > + iio_device_unregister(indio_dev); > > + iio_map_array_unregister(indio_dev); > > + > > + return 0; > > +} > > + > > +static struct platform_driver da9150_gpadc_driver = { > > + .driver = { > > + .name = "da9150-gpadc", > > + }, > > + .probe = da9150_gpadc_probe, > > + .remove = da9150_gpadc_remove, > > +}; > > + > > +module_platform_driver(da9150_gpadc_driver); > > + > > +MODULE_DESCRIPTION("GPADC Driver for DA9150"); > > +MODULE_AUTHOR("Adam Thomson > <Adam.Thomson.Opensource@diasemi.com>"); > > +MODULE_LICENSE("GPL"); > > -- > > 1.9.3 > > ^ permalink raw reply [flat|nested] 20+ messages in thread
[parent not found: <2E89032DDAA8B9408CB92943514A0337AB526A19-68WUHU125fLLPO1uwJ3ImwLouzNaz+3S@public.gmane.org>]
* Re: [PATCH v5 3/7] iio: Add support for DA9150 GPADC [not found] ` <2E89032DDAA8B9408CB92943514A0337AB526A19-68WUHU125fLLPO1uwJ3ImwLouzNaz+3S@public.gmane.org> @ 2015-01-10 22:19 ` Jonathan Cameron 2015-01-14 11:30 ` Opensource [Adam Thomson] 0 siblings, 1 reply; 20+ messages in thread From: Jonathan Cameron @ 2015-01-10 22:19 UTC (permalink / raw) To: Opensource [Adam Thomson], Lee Jones, Samuel Ortiz, Hartmut Knaack, linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Sebastian Reichel, Dmitry Eremin-Solenikov, David Woodhouse, linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Grant Likely, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Andrew Morton, Joe Perches Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Support Opensource On 07/01/15 16:03, Opensource [Adam Thomson] wrote: > On January 4, 2015 17:22, Jonathan Cameron wrote: > >> On 22/12/14 16:51, Adam Thomson wrote: >>> This patch adds support for DA9150 Charger & Fuel-Gauge IC GPADC. >>> >>> Signed-off-by: Adam Thomson <Adam.Thomson.Opensource-WBD+wuPFNBhBDgjK7y7TUQ@public.gmane.org> >> One last query from me. >> >> Using the extended channel names in IIO is only really appropriate when >> they don't correspond to simple pins on the side of the chip. For those >> just drop the extname bit. Some of the channels you have here, definitely >> need them though. >> >> Drop those first 4 or convince me otherwise and add >> Acked-by: Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> > > Have added responses below. If the comments are accepted then I'll respin > and add you're 'Acked-by'. Is that ok? > Not accepted as yet :) >>> +#define DA9150_GPADC_CHANNEL_PROCESSED(_id, _hw_id, _type, _ext_name) >> \ >>> + DA9150_GPADC_CHANNEL(_id, _hw_id, _type, \ >>> + BIT(IIO_CHAN_INFO_PROCESSED), _ext_name) >>> + >>> +/* Supported channels */ >>> +static const struct iio_chan_spec da9150_gpadc_channels[] = { >>> + DA9150_GPADC_CHANNEL_PROCESSED(GPIOA, GPIOA_6V, IIO_VOLTAGE, >> "GPIOA"), >>> + DA9150_GPADC_CHANNEL_PROCESSED(GPIOB, GPIOB_6V, IIO_VOLTAGE, >> "GPIOB"), >>> + DA9150_GPADC_CHANNEL_PROCESSED(GPIOC, GPIOC_6V, IIO_VOLTAGE, >> "GPIOC"), >>> + DA9150_GPADC_CHANNEL_PROCESSED(GPIOD, GPIOD_6V, IIO_VOLTAGE, >> "GPIOD"), >> I'm not sure some of these really deserve extended names. Those are usually >> reserved for naming strange internal adc channels etc. These first 4 are >> presumably just for input pins? Those should just be channels 0..3 >> On another note, unless you want really weird sysfs attribute names, the >> extended names want to be lowercase. >> > > I'd prefer to keep the names because the input pins are muxed with GPIOs of the > chip, so thought it sensible to show that this is the case. Am happy to change > to lower-case to follow convention. Hmm. It's a bit of an oddity as the point of the naming is about the uses, not which pins they are on. If we exposed the 'datasheet_name' parameter directly rather than just using it internally I'd suggest relying on that - but clearly you want it to be apparent in the interface. Whether that is useful is the question I'd raise here (and is the reason datasheet_name is not exposed. The obvious question is does userspace care? Answer is probably not. It cares what is being measured but this is about what pins it is on and doesn't provide any information on what is connected to them. > >>> + DA9150_GPADC_CHANNEL_PROCESSED(IBUS, IBUS_SENSE, IIO_CURRENT, >> "IBUS"), >>> + DA9150_GPADC_CHANNEL_PROCESSED(VBUS, VBUS_DIV_, IIO_VOLTAGE, >> "VBUS"), >>> + DA9150_GPADC_CHANNEL_RAW(ID, ID, IIO_VOLTAGE, "ID"), >> You hae an identifier voltage? That's certainly unusual but if so - fair enough >> and it defintely needs the extname! > > Thanks for pointing that out. Having checked again, this is not needed and can > be dispensed with. > >>> + DA9150_GPADC_CHANNEL_PROCESSED(VSYS, VSYS, IIO_VOLTAGE, "VSYS"), >>> + DA9150_GPADC_CHANNEL_SCALED(VBAT, VBAT, IIO_VOLTAGE, "VBAT"), >>> + DA9150_GPADC_CHANNEL_RAW(TBAT, TBAT, IIO_VOLTAGE, "TBAT"), >>> + DA9150_GPADC_CHANNEL_SCALED(TJUNC_CORE, TJUNC_CORE, >> IIO_TEMP, >>> + "TJUNC_CORE"), >> tjunc_core is a good use of extname ;) >>> + DA9150_GPADC_CHANNEL_SCALED(TJUNC_OVP, TJUNC_OVP, IIO_TEMP, >>> + "TJUNC_OVP"), >>> +}; >>> + >>> +/* Default maps used by da9150-charger */ >>> +static struct iio_map da9150_gpadc_default_maps[] = { >>> + { >>> + .consumer_dev_name = "da9150-charger", >>> + .consumer_channel = "CHAN_IBUS", >>> + .adc_channel_label = "IBUS", >>> + }, >>> + { >>> + .consumer_dev_name = "da9150-charger", >>> + .consumer_channel = "CHAN_VBUS", >>> + .adc_channel_label = "VBUS", >>> + }, >>> + { >>> + .consumer_dev_name = "da9150-charger", >>> + .consumer_channel = "CHAN_TJUNC", >>> + .adc_channel_label = "TJUNC_CORE", >>> + }, >>> + { >>> + .consumer_dev_name = "da9150-charger", >>> + .consumer_channel = "CHAN_VBAT", >>> + .adc_channel_label = "VBAT", >>> + }, >>> + {}, >>> +}; >>> + >>> +static int da9150_gpadc_probe(struct platform_device *pdev) >>> +{ >>> + struct device *dev = &pdev->dev; >>> + struct da9150 *da9150 = dev_get_drvdata(dev->parent); >>> + struct da9150_gpadc *gpadc; >>> + struct iio_dev *indio_dev; >>> + int irq, ret; >>> + >>> + indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*gpadc)); >>> + if (!indio_dev) { >>> + dev_err(&pdev->dev, "Failed to allocate IIO device\n"); >>> + return -ENOMEM; >>> + } >>> + gpadc = iio_priv(indio_dev); >>> + >>> + platform_set_drvdata(pdev, indio_dev); >>> + gpadc->da9150 = da9150; >>> + gpadc->dev = dev; >>> + mutex_init(&gpadc->lock); >>> + init_completion(&gpadc->complete); >>> + >>> + irq = platform_get_irq_byname(pdev, "GPADC"); >>> + if (irq < 0) { >>> + dev_err(dev, "Failed to get IRQ: %d\n", irq); >>> + return irq; >>> + } >>> + >>> + ret = devm_request_threaded_irq(dev, irq, NULL, da9150_gpadc_irq, >>> + IRQF_ONESHOT, "GPADC", gpadc); >>> + if (ret) { >>> + dev_err(dev, "Failed to request IRQ %d: %d\n", irq, ret); >>> + return ret; >>> + } >>> + >>> + ret = iio_map_array_register(indio_dev, da9150_gpadc_default_maps); >>> + if (ret) { >>> + dev_err(dev, "Failed to register IIO maps: %d\n", ret); >>> + return ret; >>> + } >>> + >>> + indio_dev->name = dev_name(dev); >>> + indio_dev->dev.parent = dev; >>> + indio_dev->dev.of_node = pdev->dev.of_node; >>> + indio_dev->info = &da9150_gpadc_info; >>> + indio_dev->modes = INDIO_DIRECT_MODE; >>> + indio_dev->channels = da9150_gpadc_channels; >>> + indio_dev->num_channels = ARRAY_SIZE(da9150_gpadc_channels); >>> + >>> + ret = iio_device_register(indio_dev); >>> + if (ret) { >>> + dev_err(dev, "Failed to register IIO device: %d\n", ret); >>> + goto iio_map_unreg; >>> + } >>> + >>> + return 0; >>> + >>> +iio_map_unreg: >>> + iio_map_array_unregister(indio_dev); >>> + >>> + return ret; >>> +} >>> + >>> +static int da9150_gpadc_remove(struct platform_device *pdev) >>> +{ >>> + struct iio_dev *indio_dev = platform_get_drvdata(pdev); >>> + >>> + iio_device_unregister(indio_dev); >>> + iio_map_array_unregister(indio_dev); >>> + >>> + return 0; >>> +} >>> + >>> +static struct platform_driver da9150_gpadc_driver = { >>> + .driver = { >>> + .name = "da9150-gpadc", >>> + }, >>> + .probe = da9150_gpadc_probe, >>> + .remove = da9150_gpadc_remove, >>> +}; >>> + >>> +module_platform_driver(da9150_gpadc_driver); >>> + >>> +MODULE_DESCRIPTION("GPADC Driver for DA9150"); >>> +MODULE_AUTHOR("Adam Thomson >> <Adam.Thomson.Opensource-WBD+wuPFNBhBDgjK7y7TUQ@public.gmane.org>"); >>> +MODULE_LICENSE("GPL"); >>> -- >>> 1.9.3 >>> ^ permalink raw reply [flat|nested] 20+ messages in thread
* RE: [PATCH v5 3/7] iio: Add support for DA9150 GPADC 2015-01-10 22:19 ` Jonathan Cameron @ 2015-01-14 11:30 ` Opensource [Adam Thomson] 2015-01-20 20:49 ` Jonathan Cameron 0 siblings, 1 reply; 20+ messages in thread From: Opensource [Adam Thomson] @ 2015-01-14 11:30 UTC (permalink / raw) To: Jonathan Cameron, Opensource [Adam Thomson], Lee Jones, Samuel Ortiz, Hartmut Knaack, linux-iio@vger.kernel.org, Sebastian Reichel, Dmitry Eremin-Solenikov, David Woodhouse, linux-pm@vger.kernel.org, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Grant Likely, devicetree@vger.kernel.org, Andrew Morton, Joe Perches Cc: linux-kernel@vger.kernel.org, Support Opensource On January 10, 2015 22:19, Jonathan Cameron wrote: > On 07/01/15 16:03, Opensource [Adam Thomson] wrote: > > On January 4, 2015 17:22, Jonathan Cameron wrote: > > > >> On 22/12/14 16:51, Adam Thomson wrote: > >>> This patch adds support for DA9150 Charger & Fuel-Gauge IC GPADC. > >>> > >>> Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> > >> One last query from me. > >> > >> Using the extended channel names in IIO is only really appropriate when > >> they don't correspond to simple pins on the side of the chip. For those > >> just drop the extname bit. Some of the channels you have here, definitely > >> need them though. > >> > >> Drop those first 4 or convince me otherwise and add > >> Acked-by: Jonathan Cameron <jic23@kernel.org> > > > > Have added responses below. If the comments are accepted then I'll respin > > and add you're 'Acked-by'. Is that ok? > > > Not accepted as yet :) Yeah, that's why I added the 'if'. :) > >>> +#define DA9150_GPADC_CHANNEL_PROCESSED(_id, _hw_id, _type, > _ext_name) > >> \ > >>> + DA9150_GPADC_CHANNEL(_id, _hw_id, _type, \ > >>> + BIT(IIO_CHAN_INFO_PROCESSED), _ext_name) > >>> + > >>> +/* Supported channels */ > >>> +static const struct iio_chan_spec da9150_gpadc_channels[] = { > >>> + DA9150_GPADC_CHANNEL_PROCESSED(GPIOA, GPIOA_6V, IIO_VOLTAGE, > >> "GPIOA"), > >>> + DA9150_GPADC_CHANNEL_PROCESSED(GPIOB, GPIOB_6V, IIO_VOLTAGE, > >> "GPIOB"), > >>> + DA9150_GPADC_CHANNEL_PROCESSED(GPIOC, GPIOC_6V, IIO_VOLTAGE, > >> "GPIOC"), > >>> + DA9150_GPADC_CHANNEL_PROCESSED(GPIOD, GPIOD_6V, IIO_VOLTAGE, > >> "GPIOD"), > >> I'm not sure some of these really deserve extended names. Those are usually > >> reserved for naming strange internal adc channels etc. These first 4 are > >> presumably just for input pins? Those should just be channels 0..3 > >> On another note, unless you want really weird sysfs attribute names, the > >> extended names want to be lowercase. > >> > > > > I'd prefer to keep the names because the input pins are muxed with GPIOs of the > > chip, so thought it sensible to show that this is the case. Am happy to change > > to lower-case to follow convention. > Hmm. It's a bit of an oddity as the point of the naming > is about the uses, not which pins they are on. If we exposed the > 'datasheet_name' parameter directly rather than just using it internally > I'd suggest relying on that - but clearly you want it to be apparent > in the interface. Whether that is useful is the question I'd raise > here (and is the reason datasheet_name is not exposed. > > The obvious question is does userspace care? Answer is probably not. > > It cares what is being measured but this is about what pins it is > on and doesn't provide any information on what is connected to them. > Surely it helps when using sysfs to access whatever is connected to one of those pins if we label the pin with something meaningful? If say you have a device connected to GPIC of the charger IC, it's easier to work out which ADC channel you need to access through sysfs if the naming is as I have now, rather than some arbitrary number which doesn't necessarily tally to the channel in the datasheet. You'd then need to look at the code and work out which channel number GPIOC actually was. Or am I just missing something here? :) > > > > >>> + DA9150_GPADC_CHANNEL_PROCESSED(IBUS, IBUS_SENSE, IIO_CURRENT, > >> "IBUS"), > >>> + DA9150_GPADC_CHANNEL_PROCESSED(VBUS, VBUS_DIV_, IIO_VOLTAGE, > >> "VBUS"), > >>> + DA9150_GPADC_CHANNEL_RAW(ID, ID, IIO_VOLTAGE, "ID"), > >> You hae an identifier voltage? That's certainly unusual but if so - fair enough > >> and it defintely needs the extname! > > > > Thanks for pointing that out. Having checked again, this is not needed and can > > be dispensed with. > > > >>> + DA9150_GPADC_CHANNEL_PROCESSED(VSYS, VSYS, IIO_VOLTAGE, "VSYS"), > >>> + DA9150_GPADC_CHANNEL_SCALED(VBAT, VBAT, IIO_VOLTAGE, "VBAT"), > >>> + DA9150_GPADC_CHANNEL_RAW(TBAT, TBAT, IIO_VOLTAGE, "TBAT"), > >>> + DA9150_GPADC_CHANNEL_SCALED(TJUNC_CORE, TJUNC_CORE, > >> IIO_TEMP, > >>> + "TJUNC_CORE"), > >> tjunc_core is a good use of extname ;) > >>> + DA9150_GPADC_CHANNEL_SCALED(TJUNC_OVP, TJUNC_OVP, IIO_TEMP, > >>> + "TJUNC_OVP"), > >>> +}; > >>> + > >>> +/* Default maps used by da9150-charger */ > >>> +static struct iio_map da9150_gpadc_default_maps[] = { > >>> + { > >>> + .consumer_dev_name = "da9150-charger", > >>> + .consumer_channel = "CHAN_IBUS", > >>> + .adc_channel_label = "IBUS", > >>> + }, > >>> + { > >>> + .consumer_dev_name = "da9150-charger", > >>> + .consumer_channel = "CHAN_VBUS", > >>> + .adc_channel_label = "VBUS", > >>> + }, > >>> + { > >>> + .consumer_dev_name = "da9150-charger", > >>> + .consumer_channel = "CHAN_TJUNC", > >>> + .adc_channel_label = "TJUNC_CORE", > >>> + }, > >>> + { > >>> + .consumer_dev_name = "da9150-charger", > >>> + .consumer_channel = "CHAN_VBAT", > >>> + .adc_channel_label = "VBAT", > >>> + }, > >>> + {}, > >>> +}; > >>> + > >>> +static int da9150_gpadc_probe(struct platform_device *pdev) > >>> +{ > >>> + struct device *dev = &pdev->dev; > >>> + struct da9150 *da9150 = dev_get_drvdata(dev->parent); > >>> + struct da9150_gpadc *gpadc; > >>> + struct iio_dev *indio_dev; > >>> + int irq, ret; > >>> + > >>> + indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*gpadc)); > >>> + if (!indio_dev) { > >>> + dev_err(&pdev->dev, "Failed to allocate IIO device\n"); > >>> + return -ENOMEM; > >>> + } > >>> + gpadc = iio_priv(indio_dev); > >>> + > >>> + platform_set_drvdata(pdev, indio_dev); > >>> + gpadc->da9150 = da9150; > >>> + gpadc->dev = dev; > >>> + mutex_init(&gpadc->lock); > >>> + init_completion(&gpadc->complete); > >>> + > >>> + irq = platform_get_irq_byname(pdev, "GPADC"); > >>> + if (irq < 0) { > >>> + dev_err(dev, "Failed to get IRQ: %d\n", irq); > >>> + return irq; > >>> + } > >>> + > >>> + ret = devm_request_threaded_irq(dev, irq, NULL, da9150_gpadc_irq, > >>> + IRQF_ONESHOT, "GPADC", gpadc); > >>> + if (ret) { > >>> + dev_err(dev, "Failed to request IRQ %d: %d\n", irq, ret); > >>> + return ret; > >>> + } > >>> + > >>> + ret = iio_map_array_register(indio_dev, da9150_gpadc_default_maps); > >>> + if (ret) { > >>> + dev_err(dev, "Failed to register IIO maps: %d\n", ret); > >>> + return ret; > >>> + } > >>> + > >>> + indio_dev->name = dev_name(dev); > >>> + indio_dev->dev.parent = dev; > >>> + indio_dev->dev.of_node = pdev->dev.of_node; > >>> + indio_dev->info = &da9150_gpadc_info; > >>> + indio_dev->modes = INDIO_DIRECT_MODE; > >>> + indio_dev->channels = da9150_gpadc_channels; > >>> + indio_dev->num_channels = ARRAY_SIZE(da9150_gpadc_channels); > >>> + > >>> + ret = iio_device_register(indio_dev); > >>> + if (ret) { > >>> + dev_err(dev, "Failed to register IIO device: %d\n", ret); > >>> + goto iio_map_unreg; > >>> + } > >>> + > >>> + return 0; > >>> + > >>> +iio_map_unreg: > >>> + iio_map_array_unregister(indio_dev); > >>> + > >>> + return ret; > >>> +} > >>> + > >>> +static int da9150_gpadc_remove(struct platform_device *pdev) > >>> +{ > >>> + struct iio_dev *indio_dev = platform_get_drvdata(pdev); > >>> + > >>> + iio_device_unregister(indio_dev); > >>> + iio_map_array_unregister(indio_dev); > >>> + > >>> + return 0; > >>> +} > >>> + > >>> +static struct platform_driver da9150_gpadc_driver = { > >>> + .driver = { > >>> + .name = "da9150-gpadc", > >>> + }, > >>> + .probe = da9150_gpadc_probe, > >>> + .remove = da9150_gpadc_remove, > >>> +}; > >>> + > >>> +module_platform_driver(da9150_gpadc_driver); > >>> + > >>> +MODULE_DESCRIPTION("GPADC Driver for DA9150"); > >>> +MODULE_AUTHOR("Adam Thomson > >> <Adam.Thomson.Opensource@diasemi.com>"); > >>> +MODULE_LICENSE("GPL"); > >>> -- > >>> 1.9.3 > >>> ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v5 3/7] iio: Add support for DA9150 GPADC 2015-01-14 11:30 ` Opensource [Adam Thomson] @ 2015-01-20 20:49 ` Jonathan Cameron [not found] ` <54BEBF58.30308-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> 0 siblings, 1 reply; 20+ messages in thread From: Jonathan Cameron @ 2015-01-20 20:49 UTC (permalink / raw) To: Opensource [Adam Thomson], Lee Jones, Samuel Ortiz, Hartmut Knaack, linux-iio@vger.kernel.org, Sebastian Reichel, Dmitry Eremin-Solenikov, David Woodhouse, linux-pm@vger.kernel.org, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Grant Likely, devicetree@vger.kernel.org, Andrew Morton, Joe Perches Cc: linux-kernel@vger.kernel.org, Support Opensource On 14/01/15 11:30, Opensource [Adam Thomson] wrote: > On January 10, 2015 22:19, Jonathan Cameron wrote: > >> On 07/01/15 16:03, Opensource [Adam Thomson] wrote: >>> On January 4, 2015 17:22, Jonathan Cameron wrote: >>> >>>> On 22/12/14 16:51, Adam Thomson wrote: >>>>> This patch adds support for DA9150 Charger & Fuel-Gauge IC GPADC. >>>>> >>>>> Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> >>>> One last query from me. >>>> >>>> Using the extended channel names in IIO is only really appropriate when >>>> they don't correspond to simple pins on the side of the chip. For those >>>> just drop the extname bit. Some of the channels you have here, definitely >>>> need them though. >>>> >>>> Drop those first 4 or convince me otherwise and add >>>> Acked-by: Jonathan Cameron <jic23@kernel.org> >>> >>> Have added responses below. If the comments are accepted then I'll respin >>> and add you're 'Acked-by'. Is that ok? >>> >> Not accepted as yet :) > > Yeah, that's why I added the 'if'. :) > >>>>> +#define DA9150_GPADC_CHANNEL_PROCESSED(_id, _hw_id, _type, >> _ext_name) >>>> \ >>>>> + DA9150_GPADC_CHANNEL(_id, _hw_id, _type, \ >>>>> + BIT(IIO_CHAN_INFO_PROCESSED), _ext_name) >>>>> + >>>>> +/* Supported channels */ >>>>> +static const struct iio_chan_spec da9150_gpadc_channels[] = { >>>>> + DA9150_GPADC_CHANNEL_PROCESSED(GPIOA, GPIOA_6V, IIO_VOLTAGE, >>>> "GPIOA"), >>>>> + DA9150_GPADC_CHANNEL_PROCESSED(GPIOB, GPIOB_6V, IIO_VOLTAGE, >>>> "GPIOB"), >>>>> + DA9150_GPADC_CHANNEL_PROCESSED(GPIOC, GPIOC_6V, IIO_VOLTAGE, >>>> "GPIOC"), >>>>> + DA9150_GPADC_CHANNEL_PROCESSED(GPIOD, GPIOD_6V, IIO_VOLTAGE, >>>> "GPIOD"), >>>> I'm not sure some of these really deserve extended names. Those are usually >>>> reserved for naming strange internal adc channels etc. These first 4 are >>>> presumably just for input pins? Those should just be channels 0..3 >>>> On another note, unless you want really weird sysfs attribute names, the >>>> extended names want to be lowercase. >>>> >>> >>> I'd prefer to keep the names because the input pins are muxed with GPIOs of the >>> chip, so thought it sensible to show that this is the case. Am happy to change >>> to lower-case to follow convention. >> Hmm. It's a bit of an oddity as the point of the naming >> is about the uses, not which pins they are on. If we exposed the >> 'datasheet_name' parameter directly rather than just using it internally >> I'd suggest relying on that - but clearly you want it to be apparent >> in the interface. Whether that is useful is the question I'd raise >> here (and is the reason datasheet_name is not exposed. >> >> The obvious question is does userspace care? Answer is probably not. >> >> It cares what is being measured but this is about what pins it is >> on and doesn't provide any information on what is connected to them. >> > > Surely it helps when using sysfs to access whatever is connected to one of > those pins if we label the pin with something meaningful? If say you have a > device connected to GPIC of the charger IC, it's easier to work out which ADC > channel you need to access through sysfs if the naming is as I have now, rather > than some arbitrary number which doesn't necessarily tally to the channel in the > datasheet. You'd then need to look at the code and work out which channel number > GPIOC actually was. Or am I just missing something here? :) Not really for the vast majority of users. They tend not to have a detailed board layout in front of them. It's more interesting if you know 'what' they are measuring (hence we do use these names when that is true - such as internal voltage measurements). The numbers almost never tally with the datasheet, but then datasheet numbering has a habit of being inconsistent as well! > >> >>> >>>>> + DA9150_GPADC_CHANNEL_PROCESSED(IBUS, IBUS_SENSE, IIO_CURRENT, >>>> "IBUS"), >>>>> + DA9150_GPADC_CHANNEL_PROCESSED(VBUS, VBUS_DIV_, IIO_VOLTAGE, >>>> "VBUS"), >>>>> + DA9150_GPADC_CHANNEL_RAW(ID, ID, IIO_VOLTAGE, "ID"), >>>> You hae an identifier voltage? That's certainly unusual but if so - fair enough >>>> and it defintely needs the extname! >>> >>> Thanks for pointing that out. Having checked again, this is not needed and can >>> be dispensed with. >>> >>>>> + DA9150_GPADC_CHANNEL_PROCESSED(VSYS, VSYS, IIO_VOLTAGE, "VSYS"), >>>>> + DA9150_GPADC_CHANNEL_SCALED(VBAT, VBAT, IIO_VOLTAGE, "VBAT"), >>>>> + DA9150_GPADC_CHANNEL_RAW(TBAT, TBAT, IIO_VOLTAGE, "TBAT"), >>>>> + DA9150_GPADC_CHANNEL_SCALED(TJUNC_CORE, TJUNC_CORE, >>>> IIO_TEMP, >>>>> + "TJUNC_CORE"), >>>> tjunc_core is a good use of extname ;) >>>>> + DA9150_GPADC_CHANNEL_SCALED(TJUNC_OVP, TJUNC_OVP, IIO_TEMP, >>>>> + "TJUNC_OVP"), >>>>> +}; >>>>> + >>>>> +/* Default maps used by da9150-charger */ >>>>> +static struct iio_map da9150_gpadc_default_maps[] = { >>>>> + { >>>>> + .consumer_dev_name = "da9150-charger", >>>>> + .consumer_channel = "CHAN_IBUS", >>>>> + .adc_channel_label = "IBUS", >>>>> + }, >>>>> + { >>>>> + .consumer_dev_name = "da9150-charger", >>>>> + .consumer_channel = "CHAN_VBUS", >>>>> + .adc_channel_label = "VBUS", >>>>> + }, >>>>> + { >>>>> + .consumer_dev_name = "da9150-charger", >>>>> + .consumer_channel = "CHAN_TJUNC", >>>>> + .adc_channel_label = "TJUNC_CORE", >>>>> + }, >>>>> + { >>>>> + .consumer_dev_name = "da9150-charger", >>>>> + .consumer_channel = "CHAN_VBAT", >>>>> + .adc_channel_label = "VBAT", >>>>> + }, >>>>> + {}, >>>>> +}; >>>>> + >>>>> +static int da9150_gpadc_probe(struct platform_device *pdev) >>>>> +{ >>>>> + struct device *dev = &pdev->dev; >>>>> + struct da9150 *da9150 = dev_get_drvdata(dev->parent); >>>>> + struct da9150_gpadc *gpadc; >>>>> + struct iio_dev *indio_dev; >>>>> + int irq, ret; >>>>> + >>>>> + indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*gpadc)); >>>>> + if (!indio_dev) { >>>>> + dev_err(&pdev->dev, "Failed to allocate IIO device\n"); >>>>> + return -ENOMEM; >>>>> + } >>>>> + gpadc = iio_priv(indio_dev); >>>>> + >>>>> + platform_set_drvdata(pdev, indio_dev); >>>>> + gpadc->da9150 = da9150; >>>>> + gpadc->dev = dev; >>>>> + mutex_init(&gpadc->lock); >>>>> + init_completion(&gpadc->complete); >>>>> + >>>>> + irq = platform_get_irq_byname(pdev, "GPADC"); >>>>> + if (irq < 0) { >>>>> + dev_err(dev, "Failed to get IRQ: %d\n", irq); >>>>> + return irq; >>>>> + } >>>>> + >>>>> + ret = devm_request_threaded_irq(dev, irq, NULL, da9150_gpadc_irq, >>>>> + IRQF_ONESHOT, "GPADC", gpadc); >>>>> + if (ret) { >>>>> + dev_err(dev, "Failed to request IRQ %d: %d\n", irq, ret); >>>>> + return ret; >>>>> + } >>>>> + >>>>> + ret = iio_map_array_register(indio_dev, da9150_gpadc_default_maps); >>>>> + if (ret) { >>>>> + dev_err(dev, "Failed to register IIO maps: %d\n", ret); >>>>> + return ret; >>>>> + } >>>>> + >>>>> + indio_dev->name = dev_name(dev); >>>>> + indio_dev->dev.parent = dev; >>>>> + indio_dev->dev.of_node = pdev->dev.of_node; >>>>> + indio_dev->info = &da9150_gpadc_info; >>>>> + indio_dev->modes = INDIO_DIRECT_MODE; >>>>> + indio_dev->channels = da9150_gpadc_channels; >>>>> + indio_dev->num_channels = ARRAY_SIZE(da9150_gpadc_channels); >>>>> + >>>>> + ret = iio_device_register(indio_dev); >>>>> + if (ret) { >>>>> + dev_err(dev, "Failed to register IIO device: %d\n", ret); >>>>> + goto iio_map_unreg; >>>>> + } >>>>> + >>>>> + return 0; >>>>> + >>>>> +iio_map_unreg: >>>>> + iio_map_array_unregister(indio_dev); >>>>> + >>>>> + return ret; >>>>> +} >>>>> + >>>>> +static int da9150_gpadc_remove(struct platform_device *pdev) >>>>> +{ >>>>> + struct iio_dev *indio_dev = platform_get_drvdata(pdev); >>>>> + >>>>> + iio_device_unregister(indio_dev); >>>>> + iio_map_array_unregister(indio_dev); >>>>> + >>>>> + return 0; >>>>> +} >>>>> + >>>>> +static struct platform_driver da9150_gpadc_driver = { >>>>> + .driver = { >>>>> + .name = "da9150-gpadc", >>>>> + }, >>>>> + .probe = da9150_gpadc_probe, >>>>> + .remove = da9150_gpadc_remove, >>>>> +}; >>>>> + >>>>> +module_platform_driver(da9150_gpadc_driver); >>>>> + >>>>> +MODULE_DESCRIPTION("GPADC Driver for DA9150"); >>>>> +MODULE_AUTHOR("Adam Thomson >>>> <Adam.Thomson.Opensource@diasemi.com>"); >>>>> +MODULE_LICENSE("GPL"); >>>>> -- >>>>> 1.9.3 >>>>> ^ permalink raw reply [flat|nested] 20+ messages in thread
[parent not found: <54BEBF58.30308-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>]
* RE: [PATCH v5 3/7] iio: Add support for DA9150 GPADC [not found] ` <54BEBF58.30308-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> @ 2015-01-21 11:02 ` Opensource [Adam Thomson] 0 siblings, 0 replies; 20+ messages in thread From: Opensource [Adam Thomson] @ 2015-01-21 11:02 UTC (permalink / raw) To: Jonathan Cameron, Opensource [Adam Thomson], Lee Jones, Samuel Ortiz, Hartmut Knaack, linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Sebastian Reichel, Dmitry Eremin-Solenikov, David Woodhouse, linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Grant Likely, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Andrew Morton, Joe Perches Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Support Opensource On January 20, 2015 20:49, Jonathan Cameron wrote: > >>>>> +#define DA9150_GPADC_CHANNEL_PROCESSED(_id, _hw_id, _type, > >> _ext_name) > >>>> \ > >>>>> + DA9150_GPADC_CHANNEL(_id, _hw_id, _type, \ > >>>>> + BIT(IIO_CHAN_INFO_PROCESSED), _ext_name) > >>>>> + > >>>>> +/* Supported channels */ > >>>>> +static const struct iio_chan_spec da9150_gpadc_channels[] = { > >>>>> + DA9150_GPADC_CHANNEL_PROCESSED(GPIOA, GPIOA_6V, IIO_VOLTAGE, > >>>> "GPIOA"), > >>>>> + DA9150_GPADC_CHANNEL_PROCESSED(GPIOB, GPIOB_6V, IIO_VOLTAGE, > >>>> "GPIOB"), > >>>>> + DA9150_GPADC_CHANNEL_PROCESSED(GPIOC, GPIOC_6V, IIO_VOLTAGE, > >>>> "GPIOC"), > >>>>> + DA9150_GPADC_CHANNEL_PROCESSED(GPIOD, GPIOD_6V, IIO_VOLTAGE, > >>>> "GPIOD"), > >>>> I'm not sure some of these really deserve extended names. Those are usually > >>>> reserved for naming strange internal adc channels etc. These first 4 are > >>>> presumably just for input pins? Those should just be channels 0..3 > >>>> On another note, unless you want really weird sysfs attribute names, the > >>>> extended names want to be lowercase. > >>>> > >>> > >>> I'd prefer to keep the names because the input pins are muxed with GPIOs of the > >>> chip, so thought it sensible to show that this is the case. Am happy to change > >>> to lower-case to follow convention. > >> Hmm. It's a bit of an oddity as the point of the naming > >> is about the uses, not which pins they are on. If we exposed the > >> 'datasheet_name' parameter directly rather than just using it internally > >> I'd suggest relying on that - but clearly you want it to be apparent > >> in the interface. Whether that is useful is the question I'd raise > >> here (and is the reason datasheet_name is not exposed. > >> > >> The obvious question is does userspace care? Answer is probably not. > >> > >> It cares what is being measured but this is about what pins it is > >> on and doesn't provide any information on what is connected to them. > >> > > > > Surely it helps when using sysfs to access whatever is connected to one of > > those pins if we label the pin with something meaningful? If say you have a > > device connected to GPIC of the charger IC, it's easier to work out which ADC > > channel you need to access through sysfs if the naming is as I have now, rather > > than some arbitrary number which doesn't necessarily tally to the channel in the > > datasheet. You'd then need to look at the code and work out which channel > number > > GPIOC actually was. Or am I just missing something here? :) > Not really for the vast majority of users. They tend not to have a detailed > board layout in front of them. It's more interesting if you know 'what' they > are measuring (hence we do use these names when that is true - such as > internal voltage measurements). > > The numbers almost never tally with the datasheet, but then datasheet numbering > has a habit of being inconsistent as well! Can't say I agree that this won't be useful/informative to many users, but don't want to make this a sticking point so will update. ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v5 4/7] iio: da9150: Add DT binding documentation for GPADC 2014-12-22 16:50 [PATCH v5 0/7] Add initial support for DA9150 Charger & Fuel-Gauge IC Adam Thomson ` (2 preceding siblings ...) 2014-12-22 16:51 ` [PATCH v5 3/7] iio: Add support for DA9150 GPADC Adam Thomson @ 2014-12-22 16:51 ` Adam Thomson 2014-12-22 16:51 ` [PATCH v5 5/7] power: Add support for DA9150 Charger Adam Thomson ` (2 subsequent siblings) 6 siblings, 0 replies; 20+ messages in thread From: Adam Thomson @ 2014-12-22 16:51 UTC (permalink / raw) To: Lee Jones, Samuel Ortiz, Jonathan Cameron, Hartmut Knaack, linux-iio, Sebastian Reichel, Dmitry Eremin-Solenikov, David Woodhouse, linux-pm, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Grant Likely, devicetree, Andrew Morton, Joe Perches Cc: linux-kernel, support.opensource Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> Acked-by: Jonathan Cameron <jic23@kernel.org> --- .../devicetree/bindings/iio/adc/da9150-gpadc.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/adc/da9150-gpadc.txt diff --git a/Documentation/devicetree/bindings/iio/adc/da9150-gpadc.txt b/Documentation/devicetree/bindings/iio/adc/da9150-gpadc.txt new file mode 100644 index 0000000..c07228d --- /dev/null +++ b/Documentation/devicetree/bindings/iio/adc/da9150-gpadc.txt @@ -0,0 +1,16 @@ +Dialog Semiconductor DA9150 IIO GPADC bindings + +Required properties: +- compatible: "dlg,da9150-gpadc" for DA9150 IIO GPADC +- #io-channel-cells: Should be set to <1> + (See Documentation/devicetree/bindings/iio/iio-bindings.txt for further info) + +For further information on GPADC channels, see device datasheet. + + +Example: + + gpadc: da9150-gpadc { + compatible = "dlg,da9150-gpadc"; + #io-channel-cells = <1>; + }; -- 1.9.3 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v5 5/7] power: Add support for DA9150 Charger 2014-12-22 16:50 [PATCH v5 0/7] Add initial support for DA9150 Charger & Fuel-Gauge IC Adam Thomson ` (3 preceding siblings ...) 2014-12-22 16:51 ` [PATCH v5 4/7] iio: da9150: Add DT binding documentation for GPADC Adam Thomson @ 2014-12-22 16:51 ` Adam Thomson [not found] ` <680cf8b778f6e7788f5c1ee4b3fe933e365eaca1.1419264383.git.Adam.Thomson.Opensource-WBD+wuPFNBhBDgjK7y7TUQ@public.gmane.org> 2014-12-22 16:51 ` [PATCH v5 6/7] power: da9150: Add DT binding documentation for charger Adam Thomson 2014-12-22 16:51 ` [PATCH v5 7/7] MAINTAINERS: Include DA9150 files in Dialog Semiconductor support list Adam Thomson 6 siblings, 1 reply; 20+ messages in thread From: Adam Thomson @ 2014-12-22 16:51 UTC (permalink / raw) To: Lee Jones, Samuel Ortiz, Jonathan Cameron, Hartmut Knaack, linux-iio, Sebastian Reichel, Dmitry Eremin-Solenikov, David Woodhouse, linux-pm, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Grant Likely, devicetree, Andrew Morton, Joe Perches Cc: linux-kernel, support.opensource This patch adds support for DA9150 Charger & Fuel-Gauge IC Charger. Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> --- drivers/power/Kconfig | 12 + drivers/power/Makefile | 1 + drivers/power/da9150-charger.c | 666 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 679 insertions(+) create mode 100644 drivers/power/da9150-charger.c diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 0108c2a..eb79a7a 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -192,6 +192,18 @@ config BATTERY_DA9052 Say Y here to enable support for batteries charger integrated into DA9052 PMIC. +config CHARGER_DA9150 + tristate "Dialog Semiconductor DA9150 Charger support" + depends on MFD_DA9150 + depends on DA9150_GPADC + depends on IIO + help + Say Y here to enable support for charger unit of the DA9150 + Integrated Charger & Fuel-Gauge IC. + + This driver can also be built as a module. If so, the module will be + called da9150-charger. + config BATTERY_MAX17040 tristate "Maxim MAX17040 Fuel Gauge" depends on I2C diff --git a/drivers/power/Makefile b/drivers/power/Makefile index dfa8942..0c1896d 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -31,6 +31,7 @@ obj-$(CONFIG_BATTERY_SBS) += sbs-battery.o obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o obj-$(CONFIG_BATTERY_DA9052) += da9052-battery.o +obj-$(CONFIG_CHARGER_DA9150) += da9150-charger.o obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o obj-$(CONFIG_BATTERY_MAX17042) += max17042_battery.o obj-$(CONFIG_BATTERY_Z2) += z2_battery.o diff --git a/drivers/power/da9150-charger.c b/drivers/power/da9150-charger.c new file mode 100644 index 0000000..9b1826d --- /dev/null +++ b/drivers/power/da9150-charger.c @@ -0,0 +1,666 @@ +/* + * DA9150 Charger Driver + * + * Copyright (c) 2014 Dialog Semiconductor + * + * Author: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> + * + * 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. + */ + +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/of.h> +#include <linux/of_platform.h> +#include <linux/interrupt.h> +#include <linux/power_supply.h> +#include <linux/notifier.h> +#include <linux/usb/phy.h> +#include <linux/iio/consumer.h> +#include <linux/mfd/da9150/core.h> +#include <linux/mfd/da9150/registers.h> + +/* Private data */ +struct da9150_charger { + struct da9150 *da9150; + struct device *dev; + + struct power_supply usb; + struct power_supply battery; + struct power_supply *supply_online; + + struct usb_phy *usb_phy; + struct notifier_block otg_nb; + struct work_struct otg_work; + unsigned long usb_event; + + struct iio_channel *ibus_chan; + struct iio_channel *vbus_chan; + struct iio_channel *tjunc_chan; + struct iio_channel *vbat_chan; +}; + +static inline int da9150_charger_supply_online(struct da9150_charger *charger, + struct power_supply *psy, + union power_supply_propval *val) +{ + val->intval = (psy == charger->supply_online) ? 1 : 0; + + return 0; +} + +/* Charger Properties */ +static int da9150_charger_vbus_voltage_now(struct da9150_charger *charger, + union power_supply_propval *val) +{ + int v_val, ret; + + /* Read processed value - mV units */ + ret = iio_read_channel_processed(charger->vbus_chan, &v_val); + if (ret < 0) + return ret; + + /* Convert voltage to expected uV units */ + val->intval = v_val * 1000; + + return 0; +} + +static int da9150_charger_ibus_current_avg(struct da9150_charger *charger, + union power_supply_propval *val) +{ + int i_val, ret; + + /* Read processed value - mA units */ + ret = iio_read_channel_processed(charger->ibus_chan, &i_val); + if (ret < 0) + return ret; + + /* Convert current to expected uA units */ + val->intval = i_val * 1000; + + return 0; +} + +static int da9150_charger_tjunc_temp(struct da9150_charger *charger, + union power_supply_propval *val) +{ + int t_val, ret; + + /* Read processed value - 0.001 degrees C units */ + ret = iio_read_channel_processed(charger->tjunc_chan, &t_val); + if (ret < 0) + return ret; + + /* Convert temp to expect 0.1 degrees C units */ + val->intval = t_val / 100; + + return 0; +} + +static enum power_supply_property da9150_charger_props[] = { + POWER_SUPPLY_PROP_ONLINE, + POWER_SUPPLY_PROP_VOLTAGE_NOW, + POWER_SUPPLY_PROP_CURRENT_AVG, + POWER_SUPPLY_PROP_TEMP, +}; + +static int da9150_charger_get_prop(struct power_supply *psy, + enum power_supply_property psp, + union power_supply_propval *val) +{ + struct da9150_charger *charger = dev_get_drvdata(psy->dev->parent); + int ret; + + switch (psp) { + case POWER_SUPPLY_PROP_ONLINE: + ret = da9150_charger_supply_online(charger, psy, val); + break; + case POWER_SUPPLY_PROP_VOLTAGE_NOW: + ret = da9150_charger_vbus_voltage_now(charger, val); + break; + case POWER_SUPPLY_PROP_CURRENT_AVG: + ret = da9150_charger_ibus_current_avg(charger, val); + break; + case POWER_SUPPLY_PROP_TEMP: + ret = da9150_charger_tjunc_temp(charger, val); + break; + default: + ret = -EINVAL; + break; + } + + return ret; +} + +/* Battery Properties */ +static int da9150_charger_battery_status(struct da9150_charger *charger, + union power_supply_propval *val) +{ + u8 reg; + + /* Check to see if battery is discharging */ + reg = da9150_reg_read(charger->da9150, DA9150_STATUS_H); + + if (((reg & DA9150_VBUS_STAT_MASK) == DA9150_VBUS_STAT_OFF) || + ((reg & DA9150_VBUS_STAT_MASK) == DA9150_VBUS_STAT_WAIT)) { + val->intval = POWER_SUPPLY_STATUS_DISCHARGING; + + return 0; + } + + reg = da9150_reg_read(charger->da9150, DA9150_STATUS_J); + + /* Now check for other states */ + switch (reg & DA9150_CHG_STAT_MASK) { + case DA9150_CHG_STAT_ACT: + case DA9150_CHG_STAT_PRE: + case DA9150_CHG_STAT_CC: + case DA9150_CHG_STAT_CV: + val->intval = POWER_SUPPLY_STATUS_CHARGING; + break; + case DA9150_CHG_STAT_OFF: + case DA9150_CHG_STAT_SUSP: + case DA9150_CHG_STAT_TEMP: + case DA9150_CHG_STAT_TIME: + case DA9150_CHG_STAT_BAT: + val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING; + break; + case DA9150_CHG_STAT_FULL: + val->intval = POWER_SUPPLY_STATUS_FULL; + break; + default: + val->intval = POWER_SUPPLY_STATUS_UNKNOWN; + break; + } + + return 0; +} + +static int da9150_charger_battery_health(struct da9150_charger *charger, + union power_supply_propval *val) +{ + u8 reg; + + reg = da9150_reg_read(charger->da9150, DA9150_STATUS_J); + + /* Check if temperature limit reached */ + switch (reg & DA9150_CHG_TEMP_MASK) { + case DA9150_CHG_TEMP_UNDER: + val->intval = POWER_SUPPLY_HEALTH_COLD; + return 0; + case DA9150_CHG_TEMP_OVER: + val->intval = POWER_SUPPLY_HEALTH_OVERHEAT; + return 0; + default: + break; + } + + /* Check for other health states */ + switch (reg & DA9150_CHG_STAT_MASK) { + case DA9150_CHG_STAT_ACT: + case DA9150_CHG_STAT_PRE: + val->intval = POWER_SUPPLY_HEALTH_DEAD; + break; + case DA9150_CHG_STAT_TIME: + val->intval = POWER_SUPPLY_HEALTH_UNSPEC_FAILURE; + break; + default: + val->intval = POWER_SUPPLY_HEALTH_GOOD; + break; + } + + return 0; +} + +static int da9150_charger_battery_present(struct da9150_charger *charger, + union power_supply_propval *val) +{ + u8 reg; + + /* Check if battery present or removed */ + reg = da9150_reg_read(charger->da9150, DA9150_STATUS_J); + if ((reg & DA9150_CHG_STAT_MASK) == DA9150_CHG_STAT_BAT) + val->intval = 0; + else + val->intval = 1; + + return 0; +} + +static int da9150_charger_battery_charge_type(struct da9150_charger *charger, + union power_supply_propval *val) +{ + u8 reg; + + reg = da9150_reg_read(charger->da9150, DA9150_STATUS_J); + + switch (reg & DA9150_CHG_STAT_MASK) { + case DA9150_CHG_STAT_CC: + val->intval = POWER_SUPPLY_CHARGE_TYPE_FAST; + break; + case DA9150_CHG_STAT_ACT: + case DA9150_CHG_STAT_PRE: + case DA9150_CHG_STAT_CV: + val->intval = POWER_SUPPLY_CHARGE_TYPE_TRICKLE; + break; + default: + val->intval = POWER_SUPPLY_CHARGE_TYPE_NONE; + break; + } + + return 0; +} + +static int da9150_charger_battery_voltage_min(struct da9150_charger *charger, + union power_supply_propval *val) +{ + u8 reg; + + reg = da9150_reg_read(charger->da9150, DA9150_PPR_CHGCTRL_C); + + /* Value starts at 2500 mV, 50 mV increments, presented in uV */ + val->intval = ((reg & DA9150_CHG_VFAULT_MASK) * 50000) + 2500000; + + return 0; +} + +static int da9150_charger_battery_voltage_now(struct da9150_charger *charger, + union power_supply_propval *val) +{ + int v_val, ret; + + /* Read processed value - mV units */ + ret = iio_read_channel_processed(charger->vbat_chan, &v_val); + if (ret < 0) + return ret; + + val->intval = v_val * 1000; + + return 0; +} + +static int da9150_charger_battery_current_max(struct da9150_charger *charger, + union power_supply_propval *val) +{ + int reg; + + reg = da9150_reg_read(charger->da9150, DA9150_PPR_CHGCTRL_D); + + /* 25mA increments */ + val->intval = reg * 25000; + + return 0; +} + +static int da9150_charger_battery_voltage_max(struct da9150_charger *charger, + union power_supply_propval *val) +{ + u8 reg; + + reg = da9150_reg_read(charger->da9150, DA9150_PPR_CHGCTRL_B); + + /* Value starts at 3650 mV, 25 mV increments, presented in uV */ + val->intval = ((reg & DA9150_CHG_VBAT_MASK) * 25000) + 3650000; + return 0; +} + +static enum power_supply_property da9150_charger_bat_props[] = { + POWER_SUPPLY_PROP_STATUS, + POWER_SUPPLY_PROP_ONLINE, + POWER_SUPPLY_PROP_HEALTH, + POWER_SUPPLY_PROP_PRESENT, + POWER_SUPPLY_PROP_CHARGE_TYPE, + POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN, + POWER_SUPPLY_PROP_VOLTAGE_NOW, + POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX, + POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX, +}; + +static int da9150_charger_battery_get_prop(struct power_supply *psy, + enum power_supply_property psp, + union power_supply_propval *val) +{ + struct da9150_charger *charger = dev_get_drvdata(psy->dev->parent); + int ret; + + switch (psp) { + case POWER_SUPPLY_PROP_STATUS: + ret = da9150_charger_battery_status(charger, val); + break; + case POWER_SUPPLY_PROP_ONLINE: + ret = da9150_charger_supply_online(charger, psy, val); + break; + case POWER_SUPPLY_PROP_HEALTH: + ret = da9150_charger_battery_health(charger, val); + break; + case POWER_SUPPLY_PROP_PRESENT: + ret = da9150_charger_battery_present(charger, val); + break; + case POWER_SUPPLY_PROP_CHARGE_TYPE: + ret = da9150_charger_battery_charge_type(charger, val); + break; + case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN: + ret = da9150_charger_battery_voltage_min(charger, val); + break; + case POWER_SUPPLY_PROP_VOLTAGE_NOW: + ret = da9150_charger_battery_voltage_now(charger, val); + break; + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX: + ret = da9150_charger_battery_current_max(charger, val); + break; + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX: + ret = da9150_charger_battery_voltage_max(charger, val); + break; + default: + ret = -EINVAL; + break; + } + + return ret; +} + +static irqreturn_t da9150_charger_chg_irq(int irq, void *data) +{ + struct da9150_charger *charger = data; + + power_supply_changed(&charger->battery); + + return IRQ_HANDLED; +} + +static irqreturn_t da9150_charger_tjunc_irq(int irq, void *data) +{ + struct da9150_charger *charger = data; + + /* Nothing we can really do except report this. */ + dev_crit(charger->dev, "TJunc over temperature!!!\n"); + power_supply_changed(&charger->usb); + + return IRQ_HANDLED; +} + +static irqreturn_t da9150_charger_vfault_irq(int irq, void *data) +{ + struct da9150_charger *charger = data; + + /* Nothing we can really do except report this. */ + dev_crit(charger->dev, "VSYS under voltage!!!\n"); + power_supply_changed(&charger->usb); + power_supply_changed(&charger->battery); + + return IRQ_HANDLED; +} + +static irqreturn_t da9150_charger_vbus_irq(int irq, void *data) +{ + struct da9150_charger *charger = data; + u8 reg; + + reg = da9150_reg_read(charger->da9150, DA9150_STATUS_H); + + /* Charger plugged in or battery only */ + switch (reg & DA9150_VBUS_STAT_MASK) { + case DA9150_VBUS_STAT_OFF: + case DA9150_VBUS_STAT_WAIT: + charger->supply_online = &charger->battery; + break; + case DA9150_VBUS_STAT_CHG: + charger->supply_online = &charger->usb; + break; + default: + dev_warn(charger->dev, "Unknown VBUS state - reg = 0x%x\n", + reg); + charger->supply_online = NULL; + break; + } + + power_supply_changed(&charger->usb); + power_supply_changed(&charger->battery); + + return IRQ_HANDLED; +} + +static void da9150_charger_otg_work(struct work_struct *data) +{ + struct da9150_charger *charger = + container_of(data, struct da9150_charger, otg_work); + + switch (charger->usb_event) { + case USB_EVENT_ID: + /* Enable OTG Boost */ + da9150_set_bits(charger->da9150, DA9150_PPR_BKCTRL_A, + DA9150_VBUS_MODE_MASK, DA9150_VBUS_MODE_OTG); + break; + case USB_EVENT_NONE: + /* Revert to charge mode */ + power_supply_changed(&charger->usb); + power_supply_changed(&charger->battery); + da9150_set_bits(charger->da9150, DA9150_PPR_BKCTRL_A, + DA9150_VBUS_MODE_MASK, DA9150_VBUS_MODE_CHG); + break; + } +} + +static int da9150_charger_otg_ncb(struct notifier_block *nb, unsigned long val, + void *priv) +{ + struct da9150_charger *charger = + container_of(nb, struct da9150_charger, otg_nb); + + dev_dbg(charger->dev, "DA9150 OTG notify %lu\n", val); + + charger->usb_event = val; + schedule_work(&charger->otg_work); + + return NOTIFY_OK; +} + +static int da9150_charger_register_irq(struct platform_device *pdev, + irq_handler_t handler, + const char *irq_name) +{ + struct device *dev = &pdev->dev; + struct da9150_charger *charger = platform_get_drvdata(pdev); + int irq, ret; + + irq = platform_get_irq_byname(pdev, irq_name); + if (irq < 0) { + dev_err(dev, "Failed to get IRQ CHG_STATUS: %d\n", irq); + return irq; + } + + ret = devm_request_threaded_irq(dev, irq, NULL, handler, IRQF_ONESHOT, + irq_name, charger); + if (ret) + dev_err(dev, "Failed to request IRQ %d: %d\n", irq, ret); + + return ret; +} + +static int da9150_charger_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct da9150 *da9150 = dev_get_drvdata(dev->parent); + struct da9150_charger *charger; + struct power_supply *usb, *battery; + u8 reg; + int ret; + + charger = devm_kzalloc(dev, sizeof(struct da9150_charger), GFP_KERNEL); + if (charger == NULL) + return -ENOMEM; + + platform_set_drvdata(pdev, charger); + charger->da9150 = da9150; + charger->dev = dev; + + /* Acquire ADC channels */ + charger->ibus_chan = iio_channel_get(dev, "CHAN_IBUS"); + if (IS_ERR(charger->ibus_chan)) { + ret = PTR_ERR(charger->ibus_chan); + goto ibus_chan_fail; + } + + charger->vbus_chan = iio_channel_get(dev, "CHAN_VBUS"); + if (IS_ERR(charger->vbus_chan)) { + ret = PTR_ERR(charger->vbus_chan); + goto vbus_chan_fail; + } + + charger->tjunc_chan = iio_channel_get(dev, "CHAN_TJUNC"); + if (IS_ERR(charger->tjunc_chan)) { + ret = PTR_ERR(charger->tjunc_chan); + goto tjunc_chan_fail; + } + + charger->vbat_chan = iio_channel_get(dev, "CHAN_VBAT"); + if (IS_ERR(charger->vbat_chan)) { + ret = PTR_ERR(charger->vbat_chan); + goto vbat_chan_fail; + } + + /* Register power supplies */ + usb = &charger->usb; + battery = &charger->battery; + + usb->name = "da9150-usb", + usb->type = POWER_SUPPLY_TYPE_USB; + usb->properties = da9150_charger_props; + usb->num_properties = ARRAY_SIZE(da9150_charger_props); + usb->get_property = da9150_charger_get_prop; + ret = power_supply_register(dev, usb); + if (ret) + goto usb_fail; + + battery->name = "da9150-battery"; + battery->type = POWER_SUPPLY_TYPE_BATTERY; + battery->properties = da9150_charger_bat_props; + battery->num_properties = ARRAY_SIZE(da9150_charger_bat_props); + battery->get_property = da9150_charger_battery_get_prop; + ret = power_supply_register(dev, battery); + if (ret) + goto battery_fail; + + /* Get initial online supply */ + reg = da9150_reg_read(da9150, DA9150_STATUS_H); + + switch (reg & DA9150_VBUS_STAT_MASK) { + case DA9150_VBUS_STAT_OFF: + case DA9150_VBUS_STAT_WAIT: + charger->supply_online = &charger->battery; + break; + case DA9150_VBUS_STAT_CHG: + charger->supply_online = &charger->usb; + break; + default: + dev_warn(dev, "Unknown VBUS state - reg = 0x%x\n", reg); + charger->supply_online = NULL; + break; + } + + /* Setup OTG reporting & configuration */ + charger->usb_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2); + if (!IS_ERR_OR_NULL(charger->usb_phy)) { + INIT_WORK(&charger->otg_work, da9150_charger_otg_work); + charger->otg_nb.notifier_call = da9150_charger_otg_ncb; + usb_register_notifier(charger->usb_phy, &charger->otg_nb); + } + + /* Register IRQs */ + ret = da9150_charger_register_irq(pdev, da9150_charger_chg_irq, + "CHG_STATUS"); + if (ret < 0) + goto irq_fail; + + ret = da9150_charger_register_irq(pdev, da9150_charger_tjunc_irq, + "CHG_TJUNC"); + if (ret < 0) + goto irq_fail; + + ret = da9150_charger_register_irq(pdev, da9150_charger_vfault_irq, + "CHG_VFAULT"); + if (ret < 0) + goto irq_fail; + + ret = da9150_charger_register_irq(pdev, da9150_charger_vbus_irq, + "CHG_VBUS"); + if (ret < 0) + goto irq_fail; + + return 0; + +irq_fail: + if (!IS_ERR_OR_NULL(charger->usb_phy)) + usb_unregister_notifier(charger->usb_phy, &charger->otg_nb); +battery_fail: + power_supply_unregister(usb); + +usb_fail: + iio_channel_release(charger->vbat_chan); + +vbat_chan_fail: + iio_channel_release(charger->tjunc_chan); + +tjunc_chan_fail: + iio_channel_release(charger->vbus_chan); + +vbus_chan_fail: + iio_channel_release(charger->ibus_chan); + +ibus_chan_fail: + return ret; +} + +static int da9150_charger_remove(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct da9150_charger *charger = platform_get_drvdata(pdev); + int irq; + + /* Make sure IRQs are released before unregistering power supplies */ + irq = platform_get_irq_byname(pdev, "CHG_VBUS"); + devm_free_irq(dev, irq, charger); + + irq = platform_get_irq_byname(pdev, "CHG_VFAULT"); + devm_free_irq(dev, irq, charger); + + irq = platform_get_irq_byname(pdev, "CHG_TJUNC"); + devm_free_irq(dev, irq, charger); + + irq = platform_get_irq_byname(pdev, "CHG_STATUS"); + devm_free_irq(dev, irq, charger); + + if (!IS_ERR_OR_NULL(charger->usb_phy)) + usb_unregister_notifier(charger->usb_phy, &charger->otg_nb); + + power_supply_unregister(&charger->battery); + power_supply_unregister(&charger->usb); + + /* Release ADC channels */ + iio_channel_release(charger->ibus_chan); + iio_channel_release(charger->vbus_chan); + iio_channel_release(charger->tjunc_chan); + iio_channel_release(charger->vbat_chan); + + return 0; +} + +static struct platform_driver da9150_charger_driver = { + .driver = { + .name = "da9150-charger", + }, + .probe = da9150_charger_probe, + .remove = da9150_charger_remove, +}; + +module_platform_driver(da9150_charger_driver); + +MODULE_DESCRIPTION("Charger Driver for DA9150"); +MODULE_AUTHOR("Adam Thomson <Adam.Thomson.Opensource@diasemi.com>"); +MODULE_LICENSE("GPL"); -- 1.9.3 ^ permalink raw reply related [flat|nested] 20+ messages in thread
[parent not found: <680cf8b778f6e7788f5c1ee4b3fe933e365eaca1.1419264383.git.Adam.Thomson.Opensource-WBD+wuPFNBhBDgjK7y7TUQ@public.gmane.org>]
* Re: [PATCH v5 5/7] power: Add support for DA9150 Charger [not found] ` <680cf8b778f6e7788f5c1ee4b3fe933e365eaca1.1419264383.git.Adam.Thomson.Opensource-WBD+wuPFNBhBDgjK7y7TUQ@public.gmane.org> @ 2015-01-04 17:26 ` Jonathan Cameron [not found] ` <54A977B7.6040300-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> 0 siblings, 1 reply; 20+ messages in thread From: Jonathan Cameron @ 2015-01-04 17:26 UTC (permalink / raw) To: Adam Thomson, Lee Jones, Samuel Ortiz, Hartmut Knaack, linux-iio-u79uwXL29TY76Z2rM5mHXA, Sebastian Reichel, Dmitry Eremin-Solenikov, David Woodhouse, linux-pm-u79uwXL29TY76Z2rM5mHXA, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Grant Likely, devicetree-u79uwXL29TY76Z2rM5mHXA, Andrew Morton, Joe Perches Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA, support.opensource-WBD+wuPFNBhBDgjK7y7TUQ On 22/12/14 16:51, Adam Thomson wrote: > This patch adds support for DA9150 Charger & Fuel-Gauge IC Charger. > > Signed-off-by: Adam Thomson <Adam.Thomson.Opensource-WBD+wuPFNBhBDgjK7y7TUQ@public.gmane.org> The IIO bits look fine, but your use of devm_free * doesn't... As a side note, looks like we could benefit from some array versions of the IIO channel getting and release functions. Would save a fair bit of boiler plate. Jonathan > --- > drivers/power/Kconfig | 12 + > drivers/power/Makefile | 1 + > drivers/power/da9150-charger.c | 666 +++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 679 insertions(+) > create mode 100644 drivers/power/da9150-charger.c > > diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig > index 0108c2a..eb79a7a 100644 > --- a/drivers/power/Kconfig > +++ b/drivers/power/Kconfig > @@ -192,6 +192,18 @@ config BATTERY_DA9052 > Say Y here to enable support for batteries charger integrated into > DA9052 PMIC. > > +config CHARGER_DA9150 > + tristate "Dialog Semiconductor DA9150 Charger support" > + depends on MFD_DA9150 > + depends on DA9150_GPADC > + depends on IIO > + help > + Say Y here to enable support for charger unit of the DA9150 > + Integrated Charger & Fuel-Gauge IC. > + > + This driver can also be built as a module. If so, the module will be > + called da9150-charger. > + > config BATTERY_MAX17040 > tristate "Maxim MAX17040 Fuel Gauge" > depends on I2C > diff --git a/drivers/power/Makefile b/drivers/power/Makefile > index dfa8942..0c1896d 100644 > --- a/drivers/power/Makefile > +++ b/drivers/power/Makefile > @@ -31,6 +31,7 @@ obj-$(CONFIG_BATTERY_SBS) += sbs-battery.o > obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o > obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o > obj-$(CONFIG_BATTERY_DA9052) += da9052-battery.o > +obj-$(CONFIG_CHARGER_DA9150) += da9150-charger.o > obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o > obj-$(CONFIG_BATTERY_MAX17042) += max17042_battery.o > obj-$(CONFIG_BATTERY_Z2) += z2_battery.o > diff --git a/drivers/power/da9150-charger.c b/drivers/power/da9150-charger.c > new file mode 100644 > index 0000000..9b1826d > --- /dev/null > +++ b/drivers/power/da9150-charger.c > @@ -0,0 +1,666 @@ > +/* > + * DA9150 Charger Driver > + * > + * Copyright (c) 2014 Dialog Semiconductor > + * > + * Author: Adam Thomson <Adam.Thomson.Opensource-WBD+wuPFNBhBDgjK7y7TUQ@public.gmane.org> > + * > + * 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. > + */ > + > +#include <linux/kernel.h> > +#include <linux/slab.h> > +#include <linux/module.h> > +#include <linux/platform_device.h> > +#include <linux/of.h> > +#include <linux/of_platform.h> > +#include <linux/interrupt.h> > +#include <linux/power_supply.h> > +#include <linux/notifier.h> > +#include <linux/usb/phy.h> > +#include <linux/iio/consumer.h> > +#include <linux/mfd/da9150/core.h> > +#include <linux/mfd/da9150/registers.h> > + > +/* Private data */ > +struct da9150_charger { > + struct da9150 *da9150; > + struct device *dev; > + > + struct power_supply usb; > + struct power_supply battery; > + struct power_supply *supply_online; > + > + struct usb_phy *usb_phy; > + struct notifier_block otg_nb; > + struct work_struct otg_work; > + unsigned long usb_event; > + > + struct iio_channel *ibus_chan; > + struct iio_channel *vbus_chan; > + struct iio_channel *tjunc_chan; > + struct iio_channel *vbat_chan; > +}; > + > +static inline int da9150_charger_supply_online(struct da9150_charger *charger, > + struct power_supply *psy, > + union power_supply_propval *val) > +{ > + val->intval = (psy == charger->supply_online) ? 1 : 0; > + > + return 0; > +} > + > +/* Charger Properties */ > +static int da9150_charger_vbus_voltage_now(struct da9150_charger *charger, > + union power_supply_propval *val) > +{ > + int v_val, ret; > + > + /* Read processed value - mV units */ > + ret = iio_read_channel_processed(charger->vbus_chan, &v_val); > + if (ret < 0) > + return ret; > + > + /* Convert voltage to expected uV units */ > + val->intval = v_val * 1000; > + > + return 0; > +} > + > +static int da9150_charger_ibus_current_avg(struct da9150_charger *charger, > + union power_supply_propval *val) > +{ > + int i_val, ret; > + > + /* Read processed value - mA units */ > + ret = iio_read_channel_processed(charger->ibus_chan, &i_val); > + if (ret < 0) > + return ret; > + > + /* Convert current to expected uA units */ > + val->intval = i_val * 1000; > + > + return 0; > +} > + > +static int da9150_charger_tjunc_temp(struct da9150_charger *charger, > + union power_supply_propval *val) > +{ > + int t_val, ret; > + > + /* Read processed value - 0.001 degrees C units */ > + ret = iio_read_channel_processed(charger->tjunc_chan, &t_val); > + if (ret < 0) > + return ret; > + > + /* Convert temp to expect 0.1 degrees C units */ > + val->intval = t_val / 100; > + > + return 0; > +} > + > +static enum power_supply_property da9150_charger_props[] = { > + POWER_SUPPLY_PROP_ONLINE, > + POWER_SUPPLY_PROP_VOLTAGE_NOW, > + POWER_SUPPLY_PROP_CURRENT_AVG, > + POWER_SUPPLY_PROP_TEMP, > +}; > + > +static int da9150_charger_get_prop(struct power_supply *psy, > + enum power_supply_property psp, > + union power_supply_propval *val) > +{ > + struct da9150_charger *charger = dev_get_drvdata(psy->dev->parent); > + int ret; > + > + switch (psp) { > + case POWER_SUPPLY_PROP_ONLINE: > + ret = da9150_charger_supply_online(charger, psy, val); > + break; > + case POWER_SUPPLY_PROP_VOLTAGE_NOW: > + ret = da9150_charger_vbus_voltage_now(charger, val); > + break; > + case POWER_SUPPLY_PROP_CURRENT_AVG: > + ret = da9150_charger_ibus_current_avg(charger, val); > + break; > + case POWER_SUPPLY_PROP_TEMP: > + ret = da9150_charger_tjunc_temp(charger, val); > + break; > + default: > + ret = -EINVAL; > + break; > + } > + > + return ret; > +} > + > +/* Battery Properties */ > +static int da9150_charger_battery_status(struct da9150_charger *charger, > + union power_supply_propval *val) > +{ > + u8 reg; > + > + /* Check to see if battery is discharging */ > + reg = da9150_reg_read(charger->da9150, DA9150_STATUS_H); > + > + if (((reg & DA9150_VBUS_STAT_MASK) == DA9150_VBUS_STAT_OFF) || > + ((reg & DA9150_VBUS_STAT_MASK) == DA9150_VBUS_STAT_WAIT)) { > + val->intval = POWER_SUPPLY_STATUS_DISCHARGING; > + > + return 0; > + } > + > + reg = da9150_reg_read(charger->da9150, DA9150_STATUS_J); > + > + /* Now check for other states */ > + switch (reg & DA9150_CHG_STAT_MASK) { > + case DA9150_CHG_STAT_ACT: > + case DA9150_CHG_STAT_PRE: > + case DA9150_CHG_STAT_CC: > + case DA9150_CHG_STAT_CV: > + val->intval = POWER_SUPPLY_STATUS_CHARGING; > + break; > + case DA9150_CHG_STAT_OFF: > + case DA9150_CHG_STAT_SUSP: > + case DA9150_CHG_STAT_TEMP: > + case DA9150_CHG_STAT_TIME: > + case DA9150_CHG_STAT_BAT: > + val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING; > + break; > + case DA9150_CHG_STAT_FULL: > + val->intval = POWER_SUPPLY_STATUS_FULL; > + break; > + default: > + val->intval = POWER_SUPPLY_STATUS_UNKNOWN; > + break; > + } > + > + return 0; > +} > + > +static int da9150_charger_battery_health(struct da9150_charger *charger, > + union power_supply_propval *val) > +{ > + u8 reg; > + > + reg = da9150_reg_read(charger->da9150, DA9150_STATUS_J); > + > + /* Check if temperature limit reached */ > + switch (reg & DA9150_CHG_TEMP_MASK) { > + case DA9150_CHG_TEMP_UNDER: > + val->intval = POWER_SUPPLY_HEALTH_COLD; > + return 0; > + case DA9150_CHG_TEMP_OVER: > + val->intval = POWER_SUPPLY_HEALTH_OVERHEAT; > + return 0; > + default: > + break; > + } > + > + /* Check for other health states */ > + switch (reg & DA9150_CHG_STAT_MASK) { > + case DA9150_CHG_STAT_ACT: > + case DA9150_CHG_STAT_PRE: > + val->intval = POWER_SUPPLY_HEALTH_DEAD; > + break; > + case DA9150_CHG_STAT_TIME: > + val->intval = POWER_SUPPLY_HEALTH_UNSPEC_FAILURE; > + break; > + default: > + val->intval = POWER_SUPPLY_HEALTH_GOOD; > + break; > + } > + > + return 0; > +} > + > +static int da9150_charger_battery_present(struct da9150_charger *charger, > + union power_supply_propval *val) > +{ > + u8 reg; > + > + /* Check if battery present or removed */ > + reg = da9150_reg_read(charger->da9150, DA9150_STATUS_J); > + if ((reg & DA9150_CHG_STAT_MASK) == DA9150_CHG_STAT_BAT) > + val->intval = 0; > + else > + val->intval = 1; > + > + return 0; > +} > + > +static int da9150_charger_battery_charge_type(struct da9150_charger *charger, > + union power_supply_propval *val) > +{ > + u8 reg; > + > + reg = da9150_reg_read(charger->da9150, DA9150_STATUS_J); > + > + switch (reg & DA9150_CHG_STAT_MASK) { > + case DA9150_CHG_STAT_CC: > + val->intval = POWER_SUPPLY_CHARGE_TYPE_FAST; > + break; > + case DA9150_CHG_STAT_ACT: > + case DA9150_CHG_STAT_PRE: > + case DA9150_CHG_STAT_CV: > + val->intval = POWER_SUPPLY_CHARGE_TYPE_TRICKLE; > + break; > + default: > + val->intval = POWER_SUPPLY_CHARGE_TYPE_NONE; > + break; > + } > + > + return 0; > +} > + > +static int da9150_charger_battery_voltage_min(struct da9150_charger *charger, > + union power_supply_propval *val) > +{ > + u8 reg; > + > + reg = da9150_reg_read(charger->da9150, DA9150_PPR_CHGCTRL_C); > + > + /* Value starts at 2500 mV, 50 mV increments, presented in uV */ > + val->intval = ((reg & DA9150_CHG_VFAULT_MASK) * 50000) + 2500000; > + > + return 0; > +} > + > +static int da9150_charger_battery_voltage_now(struct da9150_charger *charger, > + union power_supply_propval *val) > +{ > + int v_val, ret; > + > + /* Read processed value - mV units */ > + ret = iio_read_channel_processed(charger->vbat_chan, &v_val); > + if (ret < 0) > + return ret; > + > + val->intval = v_val * 1000; > + > + return 0; > +} > + > +static int da9150_charger_battery_current_max(struct da9150_charger *charger, > + union power_supply_propval *val) > +{ > + int reg; > + > + reg = da9150_reg_read(charger->da9150, DA9150_PPR_CHGCTRL_D); > + > + /* 25mA increments */ > + val->intval = reg * 25000; > + > + return 0; > +} > + > +static int da9150_charger_battery_voltage_max(struct da9150_charger *charger, > + union power_supply_propval *val) > +{ > + u8 reg; > + > + reg = da9150_reg_read(charger->da9150, DA9150_PPR_CHGCTRL_B); > + > + /* Value starts at 3650 mV, 25 mV increments, presented in uV */ > + val->intval = ((reg & DA9150_CHG_VBAT_MASK) * 25000) + 3650000; > + return 0; > +} > + > +static enum power_supply_property da9150_charger_bat_props[] = { > + POWER_SUPPLY_PROP_STATUS, > + POWER_SUPPLY_PROP_ONLINE, > + POWER_SUPPLY_PROP_HEALTH, > + POWER_SUPPLY_PROP_PRESENT, > + POWER_SUPPLY_PROP_CHARGE_TYPE, > + POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN, > + POWER_SUPPLY_PROP_VOLTAGE_NOW, > + POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX, > + POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX, > +}; > + > +static int da9150_charger_battery_get_prop(struct power_supply *psy, > + enum power_supply_property psp, > + union power_supply_propval *val) > +{ > + struct da9150_charger *charger = dev_get_drvdata(psy->dev->parent); > + int ret; > + > + switch (psp) { > + case POWER_SUPPLY_PROP_STATUS: > + ret = da9150_charger_battery_status(charger, val); > + break; > + case POWER_SUPPLY_PROP_ONLINE: > + ret = da9150_charger_supply_online(charger, psy, val); > + break; > + case POWER_SUPPLY_PROP_HEALTH: > + ret = da9150_charger_battery_health(charger, val); > + break; > + case POWER_SUPPLY_PROP_PRESENT: > + ret = da9150_charger_battery_present(charger, val); > + break; > + case POWER_SUPPLY_PROP_CHARGE_TYPE: > + ret = da9150_charger_battery_charge_type(charger, val); > + break; > + case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN: > + ret = da9150_charger_battery_voltage_min(charger, val); > + break; > + case POWER_SUPPLY_PROP_VOLTAGE_NOW: > + ret = da9150_charger_battery_voltage_now(charger, val); > + break; > + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX: > + ret = da9150_charger_battery_current_max(charger, val); > + break; > + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX: > + ret = da9150_charger_battery_voltage_max(charger, val); > + break; > + default: > + ret = -EINVAL; > + break; > + } > + > + return ret; > +} > + > +static irqreturn_t da9150_charger_chg_irq(int irq, void *data) > +{ > + struct da9150_charger *charger = data; > + > + power_supply_changed(&charger->battery); > + > + return IRQ_HANDLED; > +} > + > +static irqreturn_t da9150_charger_tjunc_irq(int irq, void *data) > +{ > + struct da9150_charger *charger = data; > + > + /* Nothing we can really do except report this. */ > + dev_crit(charger->dev, "TJunc over temperature!!!\n"); > + power_supply_changed(&charger->usb); > + > + return IRQ_HANDLED; > +} > + > +static irqreturn_t da9150_charger_vfault_irq(int irq, void *data) > +{ > + struct da9150_charger *charger = data; > + > + /* Nothing we can really do except report this. */ > + dev_crit(charger->dev, "VSYS under voltage!!!\n"); > + power_supply_changed(&charger->usb); > + power_supply_changed(&charger->battery); > + > + return IRQ_HANDLED; > +} > + > +static irqreturn_t da9150_charger_vbus_irq(int irq, void *data) > +{ > + struct da9150_charger *charger = data; > + u8 reg; > + > + reg = da9150_reg_read(charger->da9150, DA9150_STATUS_H); > + > + /* Charger plugged in or battery only */ > + switch (reg & DA9150_VBUS_STAT_MASK) { > + case DA9150_VBUS_STAT_OFF: > + case DA9150_VBUS_STAT_WAIT: > + charger->supply_online = &charger->battery; > + break; > + case DA9150_VBUS_STAT_CHG: > + charger->supply_online = &charger->usb; > + break; > + default: > + dev_warn(charger->dev, "Unknown VBUS state - reg = 0x%x\n", > + reg); > + charger->supply_online = NULL; > + break; > + } > + > + power_supply_changed(&charger->usb); > + power_supply_changed(&charger->battery); > + > + return IRQ_HANDLED; > +} > + > +static void da9150_charger_otg_work(struct work_struct *data) > +{ > + struct da9150_charger *charger = > + container_of(data, struct da9150_charger, otg_work); > + > + switch (charger->usb_event) { > + case USB_EVENT_ID: > + /* Enable OTG Boost */ > + da9150_set_bits(charger->da9150, DA9150_PPR_BKCTRL_A, > + DA9150_VBUS_MODE_MASK, DA9150_VBUS_MODE_OTG); > + break; > + case USB_EVENT_NONE: > + /* Revert to charge mode */ > + power_supply_changed(&charger->usb); > + power_supply_changed(&charger->battery); > + da9150_set_bits(charger->da9150, DA9150_PPR_BKCTRL_A, > + DA9150_VBUS_MODE_MASK, DA9150_VBUS_MODE_CHG); > + break; > + } > +} > + > +static int da9150_charger_otg_ncb(struct notifier_block *nb, unsigned long val, > + void *priv) > +{ > + struct da9150_charger *charger = > + container_of(nb, struct da9150_charger, otg_nb); > + > + dev_dbg(charger->dev, "DA9150 OTG notify %lu\n", val); > + > + charger->usb_event = val; > + schedule_work(&charger->otg_work); > + > + return NOTIFY_OK; > +} > + > +static int da9150_charger_register_irq(struct platform_device *pdev, > + irq_handler_t handler, > + const char *irq_name) > +{ > + struct device *dev = &pdev->dev; > + struct da9150_charger *charger = platform_get_drvdata(pdev); > + int irq, ret; > + > + irq = platform_get_irq_byname(pdev, irq_name); > + if (irq < 0) { > + dev_err(dev, "Failed to get IRQ CHG_STATUS: %d\n", irq); > + return irq; > + } > + > + ret = devm_request_threaded_irq(dev, irq, NULL, handler, IRQF_ONESHOT, > + irq_name, charger); > + if (ret) > + dev_err(dev, "Failed to request IRQ %d: %d\n", irq, ret); > + > + return ret; > +} > + > +static int da9150_charger_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct da9150 *da9150 = dev_get_drvdata(dev->parent); > + struct da9150_charger *charger; > + struct power_supply *usb, *battery; > + u8 reg; > + int ret; > + > + charger = devm_kzalloc(dev, sizeof(struct da9150_charger), GFP_KERNEL); > + if (charger == NULL) > + return -ENOMEM; > + > + platform_set_drvdata(pdev, charger); > + charger->da9150 = da9150; > + charger->dev = dev; > + > + /* Acquire ADC channels */ > + charger->ibus_chan = iio_channel_get(dev, "CHAN_IBUS"); > + if (IS_ERR(charger->ibus_chan)) { > + ret = PTR_ERR(charger->ibus_chan); > + goto ibus_chan_fail; > + } > + > + charger->vbus_chan = iio_channel_get(dev, "CHAN_VBUS"); > + if (IS_ERR(charger->vbus_chan)) { > + ret = PTR_ERR(charger->vbus_chan); > + goto vbus_chan_fail; > + } > + > + charger->tjunc_chan = iio_channel_get(dev, "CHAN_TJUNC"); > + if (IS_ERR(charger->tjunc_chan)) { > + ret = PTR_ERR(charger->tjunc_chan); > + goto tjunc_chan_fail; > + } > + > + charger->vbat_chan = iio_channel_get(dev, "CHAN_VBAT"); > + if (IS_ERR(charger->vbat_chan)) { > + ret = PTR_ERR(charger->vbat_chan); > + goto vbat_chan_fail; > + } > + > + /* Register power supplies */ > + usb = &charger->usb; > + battery = &charger->battery; > + > + usb->name = "da9150-usb", > + usb->type = POWER_SUPPLY_TYPE_USB; > + usb->properties = da9150_charger_props; > + usb->num_properties = ARRAY_SIZE(da9150_charger_props); > + usb->get_property = da9150_charger_get_prop; > + ret = power_supply_register(dev, usb); > + if (ret) > + goto usb_fail; > + > + battery->name = "da9150-battery"; > + battery->type = POWER_SUPPLY_TYPE_BATTERY; > + battery->properties = da9150_charger_bat_props; > + battery->num_properties = ARRAY_SIZE(da9150_charger_bat_props); > + battery->get_property = da9150_charger_battery_get_prop; > + ret = power_supply_register(dev, battery); > + if (ret) > + goto battery_fail; > + > + /* Get initial online supply */ > + reg = da9150_reg_read(da9150, DA9150_STATUS_H); > + > + switch (reg & DA9150_VBUS_STAT_MASK) { > + case DA9150_VBUS_STAT_OFF: > + case DA9150_VBUS_STAT_WAIT: > + charger->supply_online = &charger->battery; > + break; > + case DA9150_VBUS_STAT_CHG: > + charger->supply_online = &charger->usb; > + break; > + default: > + dev_warn(dev, "Unknown VBUS state - reg = 0x%x\n", reg); > + charger->supply_online = NULL; > + break; > + } > + > + /* Setup OTG reporting & configuration */ > + charger->usb_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2); > + if (!IS_ERR_OR_NULL(charger->usb_phy)) { > + INIT_WORK(&charger->otg_work, da9150_charger_otg_work); > + charger->otg_nb.notifier_call = da9150_charger_otg_ncb; > + usb_register_notifier(charger->usb_phy, &charger->otg_nb); > + } > + > + /* Register IRQs */ > + ret = da9150_charger_register_irq(pdev, da9150_charger_chg_irq, > + "CHG_STATUS"); > + if (ret < 0) > + goto irq_fail; > + > + ret = da9150_charger_register_irq(pdev, da9150_charger_tjunc_irq, > + "CHG_TJUNC"); > + if (ret < 0) > + goto irq_fail; > + > + ret = da9150_charger_register_irq(pdev, da9150_charger_vfault_irq, > + "CHG_VFAULT"); > + if (ret < 0) > + goto irq_fail; > + > + ret = da9150_charger_register_irq(pdev, da9150_charger_vbus_irq, > + "CHG_VBUS"); > + if (ret < 0) > + goto irq_fail; > + > + return 0; > + > +irq_fail: > + if (!IS_ERR_OR_NULL(charger->usb_phy)) > + usb_unregister_notifier(charger->usb_phy, &charger->otg_nb); > +battery_fail: > + power_supply_unregister(usb); > + > +usb_fail: > + iio_channel_release(charger->vbat_chan); > + > +vbat_chan_fail: > + iio_channel_release(charger->tjunc_chan); > + > +tjunc_chan_fail: > + iio_channel_release(charger->vbus_chan); > + > +vbus_chan_fail: > + iio_channel_release(charger->ibus_chan); > + > +ibus_chan_fail: > + return ret; > +} > + > +static int da9150_charger_remove(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct da9150_charger *charger = platform_get_drvdata(pdev); > + int irq; > + > + /* Make sure IRQs are released before unregistering power supplies */ > + irq = platform_get_irq_byname(pdev, "CHG_VBUS"); > + devm_free_irq(dev, irq, charger); > + > + irq = platform_get_irq_byname(pdev, "CHG_VFAULT"); > + devm_free_irq(dev, irq, charger); > + > + irq = platform_get_irq_byname(pdev, "CHG_TJUNC"); > + devm_free_irq(dev, irq, charger); > + > + irq = platform_get_irq_byname(pdev, "CHG_STATUS"); > + devm_free_irq(dev, irq, charger); If you have used a devm allocation, you generally don't need to free them explicitly. That will happen when the device is freed. If you do need to free them here (to maintain ordering etc) then you don't want to be using the devm interfaces in the first place. > + > + if (!IS_ERR_OR_NULL(charger->usb_phy)) > + usb_unregister_notifier(charger->usb_phy, &charger->otg_nb); > + > + power_supply_unregister(&charger->battery); > + power_supply_unregister(&charger->usb); > + > + /* Release ADC channels */ > + iio_channel_release(charger->ibus_chan); > + iio_channel_release(charger->vbus_chan); > + iio_channel_release(charger->tjunc_chan); > + iio_channel_release(charger->vbat_chan); > + > + return 0; > +} > + > +static struct platform_driver da9150_charger_driver = { > + .driver = { > + .name = "da9150-charger", > + }, > + .probe = da9150_charger_probe, > + .remove = da9150_charger_remove, > +}; > + > +module_platform_driver(da9150_charger_driver); > + > +MODULE_DESCRIPTION("Charger Driver for DA9150"); > +MODULE_AUTHOR("Adam Thomson <Adam.Thomson.Opensource-WBD+wuPFNBhBDgjK7y7TUQ@public.gmane.org>"); > +MODULE_LICENSE("GPL"); > -- > 1.9.3 > ^ permalink raw reply [flat|nested] 20+ messages in thread
[parent not found: <54A977B7.6040300-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>]
* RE: [PATCH v5 5/7] power: Add support for DA9150 Charger [not found] ` <54A977B7.6040300-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> @ 2015-01-07 16:04 ` Opensource [Adam Thomson] 0 siblings, 0 replies; 20+ messages in thread From: Opensource [Adam Thomson] @ 2015-01-07 16:04 UTC (permalink / raw) To: Jonathan Cameron, Opensource [Adam Thomson], Lee Jones, Samuel Ortiz, Hartmut Knaack, linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Sebastian Reichel, Dmitry Eremin-Solenikov, David Woodhouse, linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Grant Likely, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Andrew Morton, Joe Perches Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Support Opensource [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1: Type: text/plain; charset="utf-8", Size: 24446 bytes --] On January 4, 2015 17:26, Jonathan Cameron wrote: > On 22/12/14 16:51, Adam Thomson wrote: > > This patch adds support for DA9150 Charger & Fuel-Gauge IC Charger. > > > > Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> > The IIO bits look fine, but your use of devm_free * doesn't... > > As a side note, looks like we could benefit from some array versions > of the IIO channel getting and release functions. Would save a fair bit > of boiler plate. Yes, I guess when more drivers come along which need multiple channels then something like you suggest would make sense to help reduce code duplication. Also devm_* functions could be good too. > > Jonathan > > --- > > drivers/power/Kconfig | 12 + > > drivers/power/Makefile | 1 + > > drivers/power/da9150-charger.c | 666 > +++++++++++++++++++++++++++++++++++++++++ > > 3 files changed, 679 insertions(+) > > create mode 100644 drivers/power/da9150-charger.c > > > > diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig > > index 0108c2a..eb79a7a 100644 > > --- a/drivers/power/Kconfig > > +++ b/drivers/power/Kconfig > > @@ -192,6 +192,18 @@ config BATTERY_DA9052 > > Say Y here to enable support for batteries charger integrated into > > DA9052 PMIC. > > > > +config CHARGER_DA9150 > > + tristate "Dialog Semiconductor DA9150 Charger support" > > + depends on MFD_DA9150 > > + depends on DA9150_GPADC > > + depends on IIO > > + help > > + Say Y here to enable support for charger unit of the DA9150 > > + Integrated Charger & Fuel-Gauge IC. > > + > > + This driver can also be built as a module. If so, the module will be > > + called da9150-charger. > > + > > config BATTERY_MAX17040 > > tristate "Maxim MAX17040 Fuel Gauge" > > depends on I2C > > diff --git a/drivers/power/Makefile b/drivers/power/Makefile > > index dfa8942..0c1896d 100644 > > --- a/drivers/power/Makefile > > +++ b/drivers/power/Makefile > > @@ -31,6 +31,7 @@ obj-$(CONFIG_BATTERY_SBS) += sbs-battery.o > > obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o > > obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o > > obj-$(CONFIG_BATTERY_DA9052) += da9052-battery.o > > +obj-$(CONFIG_CHARGER_DA9150) += da9150-charger.o > > obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o > > obj-$(CONFIG_BATTERY_MAX17042) += max17042_battery.o > > obj-$(CONFIG_BATTERY_Z2) += z2_battery.o > > diff --git a/drivers/power/da9150-charger.c b/drivers/power/da9150-charger.c > > new file mode 100644 > > index 0000000..9b1826d > > --- /dev/null > > +++ b/drivers/power/da9150-charger.c > > @@ -0,0 +1,666 @@ > > +/* > > + * DA9150 Charger Driver > > + * > > + * Copyright (c) 2014 Dialog Semiconductor > > + * > > + * Author: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> > > + * > > + * 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. > > + */ > > + > > +#include <linux/kernel.h> > > +#include <linux/slab.h> > > +#include <linux/module.h> > > +#include <linux/platform_device.h> > > +#include <linux/of.h> > > +#include <linux/of_platform.h> > > +#include <linux/interrupt.h> > > +#include <linux/power_supply.h> > > +#include <linux/notifier.h> > > +#include <linux/usb/phy.h> > > +#include <linux/iio/consumer.h> > > +#include <linux/mfd/da9150/core.h> > > +#include <linux/mfd/da9150/registers.h> > > + > > +/* Private data */ > > +struct da9150_charger { > > + struct da9150 *da9150; > > + struct device *dev; > > + > > + struct power_supply usb; > > + struct power_supply battery; > > + struct power_supply *supply_online; > > + > > + struct usb_phy *usb_phy; > > + struct notifier_block otg_nb; > > + struct work_struct otg_work; > > + unsigned long usb_event; > > + > > + struct iio_channel *ibus_chan; > > + struct iio_channel *vbus_chan; > > + struct iio_channel *tjunc_chan; > > + struct iio_channel *vbat_chan; > > +}; > > + > > +static inline int da9150_charger_supply_online(struct da9150_charger *charger, > > + struct power_supply *psy, > > + union power_supply_propval *val) > > +{ > > + val->intval = (psy == charger->supply_online) ? 1 : 0; > > + > > + return 0; > > +} > > + > > +/* Charger Properties */ > > +static int da9150_charger_vbus_voltage_now(struct da9150_charger *charger, > > + union power_supply_propval *val) > > +{ > > + int v_val, ret; > > + > > + /* Read processed value - mV units */ > > + ret = iio_read_channel_processed(charger->vbus_chan, &v_val); > > + if (ret < 0) > > + return ret; > > + > > + /* Convert voltage to expected uV units */ > > + val->intval = v_val * 1000; > > + > > + return 0; > > +} > > + > > +static int da9150_charger_ibus_current_avg(struct da9150_charger *charger, > > + union power_supply_propval *val) > > +{ > > + int i_val, ret; > > + > > + /* Read processed value - mA units */ > > + ret = iio_read_channel_processed(charger->ibus_chan, &i_val); > > + if (ret < 0) > > + return ret; > > + > > + /* Convert current to expected uA units */ > > + val->intval = i_val * 1000; > > + > > + return 0; > > +} > > + > > +static int da9150_charger_tjunc_temp(struct da9150_charger *charger, > > + union power_supply_propval *val) > > +{ > > + int t_val, ret; > > + > > + /* Read processed value - 0.001 degrees C units */ > > + ret = iio_read_channel_processed(charger->tjunc_chan, &t_val); > > + if (ret < 0) > > + return ret; > > + > > + /* Convert temp to expect 0.1 degrees C units */ > > + val->intval = t_val / 100; > > + > > + return 0; > > +} > > + > > +static enum power_supply_property da9150_charger_props[] = { > > + POWER_SUPPLY_PROP_ONLINE, > > + POWER_SUPPLY_PROP_VOLTAGE_NOW, > > + POWER_SUPPLY_PROP_CURRENT_AVG, > > + POWER_SUPPLY_PROP_TEMP, > > +}; > > + > > +static int da9150_charger_get_prop(struct power_supply *psy, > > + enum power_supply_property psp, > > + union power_supply_propval *val) > > +{ > > + struct da9150_charger *charger = dev_get_drvdata(psy->dev->parent); > > + int ret; > > + > > + switch (psp) { > > + case POWER_SUPPLY_PROP_ONLINE: > > + ret = da9150_charger_supply_online(charger, psy, val); > > + break; > > + case POWER_SUPPLY_PROP_VOLTAGE_NOW: > > + ret = da9150_charger_vbus_voltage_now(charger, val); > > + break; > > + case POWER_SUPPLY_PROP_CURRENT_AVG: > > + ret = da9150_charger_ibus_current_avg(charger, val); > > + break; > > + case POWER_SUPPLY_PROP_TEMP: > > + ret = da9150_charger_tjunc_temp(charger, val); > > + break; > > + default: > > + ret = -EINVAL; > > + break; > > + } > > + > > + return ret; > > +} > > + > > +/* Battery Properties */ > > +static int da9150_charger_battery_status(struct da9150_charger *charger, > > + union power_supply_propval *val) > > +{ > > + u8 reg; > > + > > + /* Check to see if battery is discharging */ > > + reg = da9150_reg_read(charger->da9150, DA9150_STATUS_H); > > + > > + if (((reg & DA9150_VBUS_STAT_MASK) == DA9150_VBUS_STAT_OFF) || > > + ((reg & DA9150_VBUS_STAT_MASK) == DA9150_VBUS_STAT_WAIT)) { > > + val->intval = POWER_SUPPLY_STATUS_DISCHARGING; > > + > > + return 0; > > + } > > + > > + reg = da9150_reg_read(charger->da9150, DA9150_STATUS_J); > > + > > + /* Now check for other states */ > > + switch (reg & DA9150_CHG_STAT_MASK) { > > + case DA9150_CHG_STAT_ACT: > > + case DA9150_CHG_STAT_PRE: > > + case DA9150_CHG_STAT_CC: > > + case DA9150_CHG_STAT_CV: > > + val->intval = POWER_SUPPLY_STATUS_CHARGING; > > + break; > > + case DA9150_CHG_STAT_OFF: > > + case DA9150_CHG_STAT_SUSP: > > + case DA9150_CHG_STAT_TEMP: > > + case DA9150_CHG_STAT_TIME: > > + case DA9150_CHG_STAT_BAT: > > + val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING; > > + break; > > + case DA9150_CHG_STAT_FULL: > > + val->intval = POWER_SUPPLY_STATUS_FULL; > > + break; > > + default: > > + val->intval = POWER_SUPPLY_STATUS_UNKNOWN; > > + break; > > + } > > + > > + return 0; > > +} > > + > > +static int da9150_charger_battery_health(struct da9150_charger *charger, > > + union power_supply_propval *val) > > +{ > > + u8 reg; > > + > > + reg = da9150_reg_read(charger->da9150, DA9150_STATUS_J); > > + > > + /* Check if temperature limit reached */ > > + switch (reg & DA9150_CHG_TEMP_MASK) { > > + case DA9150_CHG_TEMP_UNDER: > > + val->intval = POWER_SUPPLY_HEALTH_COLD; > > + return 0; > > + case DA9150_CHG_TEMP_OVER: > > + val->intval = POWER_SUPPLY_HEALTH_OVERHEAT; > > + return 0; > > + default: > > + break; > > + } > > + > > + /* Check for other health states */ > > + switch (reg & DA9150_CHG_STAT_MASK) { > > + case DA9150_CHG_STAT_ACT: > > + case DA9150_CHG_STAT_PRE: > > + val->intval = POWER_SUPPLY_HEALTH_DEAD; > > + break; > > + case DA9150_CHG_STAT_TIME: > > + val->intval = POWER_SUPPLY_HEALTH_UNSPEC_FAILURE; > > + break; > > + default: > > + val->intval = POWER_SUPPLY_HEALTH_GOOD; > > + break; > > + } > > + > > + return 0; > > +} > > + > > +static int da9150_charger_battery_present(struct da9150_charger *charger, > > + union power_supply_propval *val) > > +{ > > + u8 reg; > > + > > + /* Check if battery present or removed */ > > + reg = da9150_reg_read(charger->da9150, DA9150_STATUS_J); > > + if ((reg & DA9150_CHG_STAT_MASK) == DA9150_CHG_STAT_BAT) > > + val->intval = 0; > > + else > > + val->intval = 1; > > + > > + return 0; > > +} > > + > > +static int da9150_charger_battery_charge_type(struct da9150_charger *charger, > > + union power_supply_propval *val) > > +{ > > + u8 reg; > > + > > + reg = da9150_reg_read(charger->da9150, DA9150_STATUS_J); > > + > > + switch (reg & DA9150_CHG_STAT_MASK) { > > + case DA9150_CHG_STAT_CC: > > + val->intval = POWER_SUPPLY_CHARGE_TYPE_FAST; > > + break; > > + case DA9150_CHG_STAT_ACT: > > + case DA9150_CHG_STAT_PRE: > > + case DA9150_CHG_STAT_CV: > > + val->intval = POWER_SUPPLY_CHARGE_TYPE_TRICKLE; > > + break; > > + default: > > + val->intval = POWER_SUPPLY_CHARGE_TYPE_NONE; > > + break; > > + } > > + > > + return 0; > > +} > > + > > +static int da9150_charger_battery_voltage_min(struct da9150_charger *charger, > > + union power_supply_propval *val) > > +{ > > + u8 reg; > > + > > + reg = da9150_reg_read(charger->da9150, DA9150_PPR_CHGCTRL_C); > > + > > + /* Value starts at 2500 mV, 50 mV increments, presented in uV */ > > + val->intval = ((reg & DA9150_CHG_VFAULT_MASK) * 50000) + 2500000; > > + > > + return 0; > > +} > > + > > +static int da9150_charger_battery_voltage_now(struct da9150_charger *charger, > > + union power_supply_propval *val) > > +{ > > + int v_val, ret; > > + > > + /* Read processed value - mV units */ > > + ret = iio_read_channel_processed(charger->vbat_chan, &v_val); > > + if (ret < 0) > > + return ret; > > + > > + val->intval = v_val * 1000; > > + > > + return 0; > > +} > > + > > +static int da9150_charger_battery_current_max(struct da9150_charger *charger, > > + union power_supply_propval *val) > > +{ > > + int reg; > > + > > + reg = da9150_reg_read(charger->da9150, DA9150_PPR_CHGCTRL_D); > > + > > + /* 25mA increments */ > > + val->intval = reg * 25000; > > + > > + return 0; > > +} > > + > > +static int da9150_charger_battery_voltage_max(struct da9150_charger *charger, > > + union power_supply_propval *val) > > +{ > > + u8 reg; > > + > > + reg = da9150_reg_read(charger->da9150, DA9150_PPR_CHGCTRL_B); > > + > > + /* Value starts at 3650 mV, 25 mV increments, presented in uV */ > > + val->intval = ((reg & DA9150_CHG_VBAT_MASK) * 25000) + 3650000; > > + return 0; > > +} > > + > > +static enum power_supply_property da9150_charger_bat_props[] = { > > + POWER_SUPPLY_PROP_STATUS, > > + POWER_SUPPLY_PROP_ONLINE, > > + POWER_SUPPLY_PROP_HEALTH, > > + POWER_SUPPLY_PROP_PRESENT, > > + POWER_SUPPLY_PROP_CHARGE_TYPE, > > + POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN, > > + POWER_SUPPLY_PROP_VOLTAGE_NOW, > > + POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX, > > + POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX, > > +}; > > + > > +static int da9150_charger_battery_get_prop(struct power_supply *psy, > > + enum power_supply_property psp, > > + union power_supply_propval *val) > > +{ > > + struct da9150_charger *charger = dev_get_drvdata(psy->dev->parent); > > + int ret; > > + > > + switch (psp) { > > + case POWER_SUPPLY_PROP_STATUS: > > + ret = da9150_charger_battery_status(charger, val); > > + break; > > + case POWER_SUPPLY_PROP_ONLINE: > > + ret = da9150_charger_supply_online(charger, psy, val); > > + break; > > + case POWER_SUPPLY_PROP_HEALTH: > > + ret = da9150_charger_battery_health(charger, val); > > + break; > > + case POWER_SUPPLY_PROP_PRESENT: > > + ret = da9150_charger_battery_present(charger, val); > > + break; > > + case POWER_SUPPLY_PROP_CHARGE_TYPE: > > + ret = da9150_charger_battery_charge_type(charger, val); > > + break; > > + case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN: > > + ret = da9150_charger_battery_voltage_min(charger, val); > > + break; > > + case POWER_SUPPLY_PROP_VOLTAGE_NOW: > > + ret = da9150_charger_battery_voltage_now(charger, val); > > + break; > > + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX: > > + ret = da9150_charger_battery_current_max(charger, val); > > + break; > > + case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX: > > + ret = da9150_charger_battery_voltage_max(charger, val); > > + break; > > + default: > > + ret = -EINVAL; > > + break; > > + } > > + > > + return ret; > > +} > > + > > +static irqreturn_t da9150_charger_chg_irq(int irq, void *data) > > +{ > > + struct da9150_charger *charger = data; > > + > > + power_supply_changed(&charger->battery); > > + > > + return IRQ_HANDLED; > > +} > > + > > +static irqreturn_t da9150_charger_tjunc_irq(int irq, void *data) > > +{ > > + struct da9150_charger *charger = data; > > + > > + /* Nothing we can really do except report this. */ > > + dev_crit(charger->dev, "TJunc over temperature!!!\n"); > > + power_supply_changed(&charger->usb); > > + > > + return IRQ_HANDLED; > > +} > > + > > +static irqreturn_t da9150_charger_vfault_irq(int irq, void *data) > > +{ > > + struct da9150_charger *charger = data; > > + > > + /* Nothing we can really do except report this. */ > > + dev_crit(charger->dev, "VSYS under voltage!!!\n"); > > + power_supply_changed(&charger->usb); > > + power_supply_changed(&charger->battery); > > + > > + return IRQ_HANDLED; > > +} > > + > > +static irqreturn_t da9150_charger_vbus_irq(int irq, void *data) > > +{ > > + struct da9150_charger *charger = data; > > + u8 reg; > > + > > + reg = da9150_reg_read(charger->da9150, DA9150_STATUS_H); > > + > > + /* Charger plugged in or battery only */ > > + switch (reg & DA9150_VBUS_STAT_MASK) { > > + case DA9150_VBUS_STAT_OFF: > > + case DA9150_VBUS_STAT_WAIT: > > + charger->supply_online = &charger->battery; > > + break; > > + case DA9150_VBUS_STAT_CHG: > > + charger->supply_online = &charger->usb; > > + break; > > + default: > > + dev_warn(charger->dev, "Unknown VBUS state - reg = 0x%x\n", > > + reg); > > + charger->supply_online = NULL; > > + break; > > + } > > + > > + power_supply_changed(&charger->usb); > > + power_supply_changed(&charger->battery); > > + > > + return IRQ_HANDLED; > > +} > > + > > +static void da9150_charger_otg_work(struct work_struct *data) > > +{ > > + struct da9150_charger *charger = > > + container_of(data, struct da9150_charger, otg_work); > > + > > + switch (charger->usb_event) { > > + case USB_EVENT_ID: > > + /* Enable OTG Boost */ > > + da9150_set_bits(charger->da9150, DA9150_PPR_BKCTRL_A, > > + DA9150_VBUS_MODE_MASK, > DA9150_VBUS_MODE_OTG); > > + break; > > + case USB_EVENT_NONE: > > + /* Revert to charge mode */ > > + power_supply_changed(&charger->usb); > > + power_supply_changed(&charger->battery); > > + da9150_set_bits(charger->da9150, DA9150_PPR_BKCTRL_A, > > + DA9150_VBUS_MODE_MASK, > DA9150_VBUS_MODE_CHG); > > + break; > > + } > > +} > > + > > +static int da9150_charger_otg_ncb(struct notifier_block *nb, unsigned long val, > > + void *priv) > > +{ > > + struct da9150_charger *charger = > > + container_of(nb, struct da9150_charger, otg_nb); > > + > > + dev_dbg(charger->dev, "DA9150 OTG notify %lu\n", val); > > + > > + charger->usb_event = val; > > + schedule_work(&charger->otg_work); > > + > > + return NOTIFY_OK; > > +} > > + > > +static int da9150_charger_register_irq(struct platform_device *pdev, > > + irq_handler_t handler, > > + const char *irq_name) > > +{ > > + struct device *dev = &pdev->dev; > > + struct da9150_charger *charger = platform_get_drvdata(pdev); > > + int irq, ret; > > + > > + irq = platform_get_irq_byname(pdev, irq_name); > > + if (irq < 0) { > > + dev_err(dev, "Failed to get IRQ CHG_STATUS: %d\n", irq); > > + return irq; > > + } > > + > > + ret = devm_request_threaded_irq(dev, irq, NULL, handler, IRQF_ONESHOT, > > + irq_name, charger); > > + if (ret) > > + dev_err(dev, "Failed to request IRQ %d: %d\n", irq, ret); > > + > > + return ret; > > +} > > + > > +static int da9150_charger_probe(struct platform_device *pdev) > > +{ > > + struct device *dev = &pdev->dev; > > + struct da9150 *da9150 = dev_get_drvdata(dev->parent); > > + struct da9150_charger *charger; > > + struct power_supply *usb, *battery; > > + u8 reg; > > + int ret; > > + > > + charger = devm_kzalloc(dev, sizeof(struct da9150_charger), GFP_KERNEL); > > + if (charger == NULL) > > + return -ENOMEM; > > + > > + platform_set_drvdata(pdev, charger); > > + charger->da9150 = da9150; > > + charger->dev = dev; > > + > > + /* Acquire ADC channels */ > > + charger->ibus_chan = iio_channel_get(dev, "CHAN_IBUS"); > > + if (IS_ERR(charger->ibus_chan)) { > > + ret = PTR_ERR(charger->ibus_chan); > > + goto ibus_chan_fail; > > + } > > + > > + charger->vbus_chan = iio_channel_get(dev, "CHAN_VBUS"); > > + if (IS_ERR(charger->vbus_chan)) { > > + ret = PTR_ERR(charger->vbus_chan); > > + goto vbus_chan_fail; > > + } > > + > > + charger->tjunc_chan = iio_channel_get(dev, "CHAN_TJUNC"); > > + if (IS_ERR(charger->tjunc_chan)) { > > + ret = PTR_ERR(charger->tjunc_chan); > > + goto tjunc_chan_fail; > > + } > > + > > + charger->vbat_chan = iio_channel_get(dev, "CHAN_VBAT"); > > + if (IS_ERR(charger->vbat_chan)) { > > + ret = PTR_ERR(charger->vbat_chan); > > + goto vbat_chan_fail; > > + } > > + > > + /* Register power supplies */ > > + usb = &charger->usb; > > + battery = &charger->battery; > > + > > + usb->name = "da9150-usb", > > + usb->type = POWER_SUPPLY_TYPE_USB; > > + usb->properties = da9150_charger_props; > > + usb->num_properties = ARRAY_SIZE(da9150_charger_props); > > + usb->get_property = da9150_charger_get_prop; > > + ret = power_supply_register(dev, usb); > > + if (ret) > > + goto usb_fail; > > + > > + battery->name = "da9150-battery"; > > + battery->type = POWER_SUPPLY_TYPE_BATTERY; > > + battery->properties = da9150_charger_bat_props; > > + battery->num_properties = ARRAY_SIZE(da9150_charger_bat_props); > > + battery->get_property = da9150_charger_battery_get_prop; > > + ret = power_supply_register(dev, battery); > > + if (ret) > > + goto battery_fail; > > + > > + /* Get initial online supply */ > > + reg = da9150_reg_read(da9150, DA9150_STATUS_H); > > + > > + switch (reg & DA9150_VBUS_STAT_MASK) { > > + case DA9150_VBUS_STAT_OFF: > > + case DA9150_VBUS_STAT_WAIT: > > + charger->supply_online = &charger->battery; > > + break; > > + case DA9150_VBUS_STAT_CHG: > > + charger->supply_online = &charger->usb; > > + break; > > + default: > > + dev_warn(dev, "Unknown VBUS state - reg = 0x%x\n", reg); > > + charger->supply_online = NULL; > > + break; > > + } > > + > > + /* Setup OTG reporting & configuration */ > > + charger->usb_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2); > > + if (!IS_ERR_OR_NULL(charger->usb_phy)) { > > + INIT_WORK(&charger->otg_work, da9150_charger_otg_work); > > + charger->otg_nb.notifier_call = da9150_charger_otg_ncb; > > + usb_register_notifier(charger->usb_phy, &charger->otg_nb); > > + } > > + > > + /* Register IRQs */ > > + ret = da9150_charger_register_irq(pdev, da9150_charger_chg_irq, > > + "CHG_STATUS"); > > + if (ret < 0) > > + goto irq_fail; > > + > > + ret = da9150_charger_register_irq(pdev, da9150_charger_tjunc_irq, > > + "CHG_TJUNC"); > > + if (ret < 0) > > + goto irq_fail; > > + > > + ret = da9150_charger_register_irq(pdev, da9150_charger_vfault_irq, > > + "CHG_VFAULT"); > > + if (ret < 0) > > + goto irq_fail; > > + > > + ret = da9150_charger_register_irq(pdev, da9150_charger_vbus_irq, > > + "CHG_VBUS"); > > + if (ret < 0) > > + goto irq_fail; > > + > > + return 0; > > + > > +irq_fail: > > + if (!IS_ERR_OR_NULL(charger->usb_phy)) > > + usb_unregister_notifier(charger->usb_phy, &charger->otg_nb); > > +battery_fail: > > + power_supply_unregister(usb); > > + > > +usb_fail: > > + iio_channel_release(charger->vbat_chan); > > + > > +vbat_chan_fail: > > + iio_channel_release(charger->tjunc_chan); > > + > > +tjunc_chan_fail: > > + iio_channel_release(charger->vbus_chan); > > + > > +vbus_chan_fail: > > + iio_channel_release(charger->ibus_chan); > > + > > +ibus_chan_fail: > > + return ret; > > +} > > + > > +static int da9150_charger_remove(struct platform_device *pdev) > > +{ > > + struct device *dev = &pdev->dev; > > + struct da9150_charger *charger = platform_get_drvdata(pdev); > > + int irq; > > + > > + /* Make sure IRQs are released before unregistering power supplies */ > > + irq = platform_get_irq_byname(pdev, "CHG_VBUS"); > > + devm_free_irq(dev, irq, charger); > > + > > + irq = platform_get_irq_byname(pdev, "CHG_VFAULT"); > > + devm_free_irq(dev, irq, charger); > > + > > + irq = platform_get_irq_byname(pdev, "CHG_TJUNC"); > > + devm_free_irq(dev, irq, charger); > > + > > + irq = platform_get_irq_byname(pdev, "CHG_STATUS"); > > + devm_free_irq(dev, irq, charger); > If you have used a devm allocation, you generally don't need to > free them explicitly. That will happen when the device is freed. > > If you do need to free them here (to maintain ordering etc) then you > don't want to be using the devm interfaces in the first place. The ordering on release is important as power_supply_changed() is called by IRQ thread functions, so the IRQs need releasing first before unregistering power supply classes. The original intention with using devm here was to keep the cleanup on failure simple for the probe function with regards to IRQs, but looking at it again that's not going to work so I need to drop back to the non devm_* versions instead. Thanks for pointing to it. > > + > > + if (!IS_ERR_OR_NULL(charger->usb_phy)) > > + usb_unregister_notifier(charger->usb_phy, &charger->otg_nb); > > + > > + power_supply_unregister(&charger->battery); > > + power_supply_unregister(&charger->usb); > > + > > + /* Release ADC channels */ > > + iio_channel_release(charger->ibus_chan); > > + iio_channel_release(charger->vbus_chan); > > + iio_channel_release(charger->tjunc_chan); > > + iio_channel_release(charger->vbat_chan); > > + > > + return 0; > > +} > > + > > +static struct platform_driver da9150_charger_driver = { > > + .driver = { > > + .name = "da9150-charger", > > + }, > > + .probe = da9150_charger_probe, > > + .remove = da9150_charger_remove, > > +}; > > + > > +module_platform_driver(da9150_charger_driver); > > + > > +MODULE_DESCRIPTION("Charger Driver for DA9150"); > > +MODULE_AUTHOR("Adam Thomson > <Adam.Thomson.Opensource@diasemi.com>"); > > +MODULE_LICENSE("GPL"); > > -- > > 1.9.3 > > N‹§²æìr¸›yúèšØb²X¬¶Ç§vØ^–)Þº{.nÇ+‰·zøœzÚÞz)í…æèw*\x1fjg¬±¨\x1e¶‰šŽŠÝ¢j.ïÛ°\½½MŽúgjÌæa×\x02››–' ™©Þ¢¸\f¢·¦j:+v‰¨ŠwèjØm¶Ÿÿ¾\a«‘êçzZ+ƒùšŽŠÝ¢j"ú!¶i ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v5 6/7] power: da9150: Add DT binding documentation for charger 2014-12-22 16:50 [PATCH v5 0/7] Add initial support for DA9150 Charger & Fuel-Gauge IC Adam Thomson ` (4 preceding siblings ...) 2014-12-22 16:51 ` [PATCH v5 5/7] power: Add support for DA9150 Charger Adam Thomson @ 2014-12-22 16:51 ` Adam Thomson 2014-12-22 16:51 ` [PATCH v5 7/7] MAINTAINERS: Include DA9150 files in Dialog Semiconductor support list Adam Thomson 6 siblings, 0 replies; 20+ messages in thread From: Adam Thomson @ 2014-12-22 16:51 UTC (permalink / raw) To: Lee Jones, Samuel Ortiz, Jonathan Cameron, Hartmut Knaack, linux-iio, Sebastian Reichel, Dmitry Eremin-Solenikov, David Woodhouse, linux-pm, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Grant Likely, devicetree, Andrew Morton, Joe Perches Cc: linux-kernel, support.opensource Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> --- .../devicetree/bindings/power/da9150-charger.txt | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 Documentation/devicetree/bindings/power/da9150-charger.txt diff --git a/Documentation/devicetree/bindings/power/da9150-charger.txt b/Documentation/devicetree/bindings/power/da9150-charger.txt new file mode 100644 index 0000000..f390666 --- /dev/null +++ b/Documentation/devicetree/bindings/power/da9150-charger.txt @@ -0,0 +1,26 @@ +Dialog Semiconductor DA9150 Charger Power Supply bindings + +Required properties: +- compatible: "dlg,da9150-charger" for DA9150 Charger Power Supply + +Optional properties: +- io-channels: List of phandle and IIO specifier pairs +- io-channel-names: List of channel names used by charger + ["CHAN_IBUS", "CHAN_VBUS", "CHAN_TJUNC", "CHAN_VBAT"] + (See Documentation/devicetree/bindings/iio/iio-bindings.txt for further info) + + +Example: + + da9150-charger { + compatible = "dlg,da9150-charger"; + + io-channels = <&gpadc 0>, + <&gpadc 2>, + <&gpadc 8>, + <&gpadc 5>; + io-channel-names = "CHAN_IBUS", + "CHAN_VBUS", + "CHAN_TJUNC", + "CHAN_VBAT"; + }; -- 1.9.3 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v5 7/7] MAINTAINERS: Include DA9150 files in Dialog Semiconductor support list. 2014-12-22 16:50 [PATCH v5 0/7] Add initial support for DA9150 Charger & Fuel-Gauge IC Adam Thomson ` (5 preceding siblings ...) 2014-12-22 16:51 ` [PATCH v5 6/7] power: da9150: Add DT binding documentation for charger Adam Thomson @ 2014-12-22 16:51 ` Adam Thomson 6 siblings, 0 replies; 20+ messages in thread From: Adam Thomson @ 2014-12-22 16:51 UTC (permalink / raw) To: Lee Jones, Samuel Ortiz, Jonathan Cameron, Hartmut Knaack, linux-iio, Sebastian Reichel, Dmitry Eremin-Solenikov, David Woodhouse, linux-pm, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Grant Likely, devicetree, Andrew Morton, Joe Perches Cc: linux-kernel, support.opensource Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> Acked-by: Lee Jones <lee.jones@linaro.org> --- MAINTAINERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index ddb9ac8..bd83dfc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3084,12 +3084,15 @@ S: Supported F: Documentation/hwmon/da90?? F: drivers/gpio/gpio-da90??.c F: drivers/hwmon/da90??-hwmon.c +F: drivers/iio/adc/da91??-*.c F: drivers/input/misc/da90??_onkey.c F: drivers/input/touchscreen/da9052_tsi.c F: drivers/leds/leds-da90??.c F: drivers/mfd/da903x.c F: drivers/mfd/da90??-*.c +F: drivers/mfd/da91??-*.c F: drivers/power/da9052-battery.c +F: drivers/power/da91??-*.c F: drivers/regulator/da903x.c F: drivers/regulator/da9???-regulator.[ch] F: drivers/rtc/rtc-da90??.c @@ -3099,6 +3102,7 @@ F: include/linux/mfd/da903x.h F: include/linux/mfd/da9052/ F: include/linux/mfd/da9055/ F: include/linux/mfd/da9063/ +F: include/linux/mfd/da9150/ F: include/sound/da[79]*.h F: sound/soc/codecs/da[79]*.[ch] -- 1.9.3 ^ permalink raw reply related [flat|nested] 20+ messages in thread
end of thread, other threads:[~2015-01-21 11:02 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-22 16:50 [PATCH v5 0/7] Add initial support for DA9150 Charger & Fuel-Gauge IC Adam Thomson
2014-12-22 16:51 ` [PATCH v5 1/7] mfd: Add support for DA9150 combined charger & fuel-gauge device Adam Thomson
2015-01-19 11:33 ` Lee Jones
2015-01-19 13:23 ` Opensource [Adam Thomson]
2015-01-20 10:50 ` Lee Jones
2014-12-22 16:51 ` [PATCH v5 2/7] mfd: da9150: Add DT binding documentation for core Adam Thomson
2014-12-22 16:51 ` [PATCH v5 3/7] iio: Add support for DA9150 GPADC Adam Thomson
[not found] ` <58b7b001b38662c36595412f96c7d2eb5c3adcad.1419264383.git.Adam.Thomson.Opensource-WBD+wuPFNBhBDgjK7y7TUQ@public.gmane.org>
2015-01-01 20:51 ` Hartmut Knaack
2015-01-04 17:22 ` Jonathan Cameron
2015-01-07 16:03 ` Opensource [Adam Thomson]
[not found] ` <2E89032DDAA8B9408CB92943514A0337AB526A19-68WUHU125fLLPO1uwJ3ImwLouzNaz+3S@public.gmane.org>
2015-01-10 22:19 ` Jonathan Cameron
2015-01-14 11:30 ` Opensource [Adam Thomson]
2015-01-20 20:49 ` Jonathan Cameron
[not found] ` <54BEBF58.30308-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2015-01-21 11:02 ` Opensource [Adam Thomson]
2014-12-22 16:51 ` [PATCH v5 4/7] iio: da9150: Add DT binding documentation for GPADC Adam Thomson
2014-12-22 16:51 ` [PATCH v5 5/7] power: Add support for DA9150 Charger Adam Thomson
[not found] ` <680cf8b778f6e7788f5c1ee4b3fe933e365eaca1.1419264383.git.Adam.Thomson.Opensource-WBD+wuPFNBhBDgjK7y7TUQ@public.gmane.org>
2015-01-04 17:26 ` Jonathan Cameron
[not found] ` <54A977B7.6040300-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2015-01-07 16:04 ` Opensource [Adam Thomson]
2014-12-22 16:51 ` [PATCH v5 6/7] power: da9150: Add DT binding documentation for charger Adam Thomson
2014-12-22 16:51 ` [PATCH v5 7/7] MAINTAINERS: Include DA9150 files in Dialog Semiconductor support list Adam Thomson
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).