* [PATCH v2 0/4] Add support for DA9150 Fuel-Gauge
@ 2015-06-26 8:47 ` Adam Thomson
0 siblings, 0 replies; 20+ messages in thread
From: Adam Thomson @ 2015-06-26 8:47 UTC (permalink / raw)
To: Lee Jones, Samuel Ortiz, Sebastian Reichel,
Dmitry Eremin-Solenikov, David Woodhouse, Rob Herring, Pawel Moll,
Mark Rutland, Ian Campbell, Kumar Gala
Cc: linux-pm, devicetree, linux-kernel, Support Opensource
This patch set adds support for the Dialog DA9150 Fuel-Gauge.
In this patch set the following is provided:
- MFD Core and DT bindings updates.
- Power Supply Fuel-Gauge support and DT bindings documentation.
This patch set is baselined against the v4.1 kernel version.
Changes in v2:
- Moved temp callback function prototype to be part of power fuel-gauge patch,
as requested by Lee Jones.
Adam Thomson (4):
mfd: da9150: Add support for Fuel-Gauge
mfd: da9150: Update DT bindings for Fuel-Gauge support
power: Add support for DA9150 Fuel-Gauge
power: da9150: Add DT bindings documentation for Fuel-Gauge
Documentation/devicetree/bindings/mfd/da9150.txt | 6 +
.../devicetree/bindings/power/da9150-fg.txt | 23 +
drivers/mfd/da9150-core.c | 162 +++++-
drivers/power/Kconfig | 10 +
drivers/power/Makefile | 1 +
drivers/power/da9150-fg.c | 589 +++++++++++++++++++++
include/linux/mfd/da9150/core.h | 19 +
include/linux/mfd/da9150/fg.h | 39 ++
8 files changed, 841 insertions(+), 8 deletions(-)
create mode 100644 Documentation/devicetree/bindings/power/da9150-fg.txt
create mode 100644 drivers/power/da9150-fg.c
create mode 100644 include/linux/mfd/da9150/fg.h
--
1.9.3
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v2 1/4] mfd: da9150: Add support for Fuel-Gauge
2015-06-26 8:47 ` Adam Thomson
@ 2015-06-26 8:47 ` Adam Thomson
-1 siblings, 0 replies; 20+ messages in thread
From: Adam Thomson @ 2015-06-26 8:47 UTC (permalink / raw)
To: Lee Jones, Samuel Ortiz, Sebastian Reichel,
Dmitry Eremin-Solenikov, David Woodhouse, Rob Herring, Pawel Moll,
Mark Rutland, Ian Campbell, Kumar Gala
Cc: linux-pm, devicetree, linux-kernel, Support Opensource
Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
---
drivers/mfd/da9150-core.c | 162 ++++++++++++++++++++++++++++++++++++++--
include/linux/mfd/da9150/core.h | 19 +++++
include/linux/mfd/da9150/fg.h | 29 +++++++
3 files changed, 202 insertions(+), 8 deletions(-)
create mode 100644 include/linux/mfd/da9150/fg.h
diff --git a/drivers/mfd/da9150-core.c b/drivers/mfd/da9150-core.c
index 5549817..8feb75d 100644
--- a/drivers/mfd/da9150-core.c
+++ b/drivers/mfd/da9150-core.c
@@ -21,8 +21,80 @@
#include <linux/interrupt.h>
#include <linux/mfd/core.h>
#include <linux/mfd/da9150/core.h>
+#include <linux/mfd/da9150/fg.h>
#include <linux/mfd/da9150/registers.h>
+/* Raw device access, used for QIF */
+static int da9150_i2c_read_device(struct i2c_client *client, u8 addr, int count,
+ u8 *buf)
+{
+ struct i2c_msg xfer;
+ int ret;
+
+ /*
+ * Read is split into two transfers as device expects STOP/START rather
+ * than repeated start to carry out this kind of access.
+ */
+
+ /* Write address */
+ xfer.addr = client->addr;
+ xfer.flags = 0;
+ xfer.len = 1;
+ xfer.buf = &addr;
+
+ ret = i2c_transfer(client->adapter, &xfer, 1);
+ if (ret != 1) {
+ if (ret < 0)
+ return ret;
+ else
+ return -EIO;
+ }
+
+ /* Read data */
+ xfer.addr = client->addr;
+ xfer.flags = I2C_M_RD;
+ xfer.len = count;
+ xfer.buf = buf;
+
+ ret = i2c_transfer(client->adapter, &xfer, 1);
+ if (ret == 1)
+ return 0;
+ else if (ret < 0)
+ return ret;
+ else
+ return -EIO;
+}
+
+static int da9150_i2c_write_device(struct i2c_client *client, u8 addr,
+ int count, const u8 *buf)
+{
+ struct i2c_msg xfer;
+ u8 *reg_data;
+ int ret;
+
+ reg_data = kzalloc(1 + count, GFP_KERNEL);
+ if (!reg_data)
+ return -ENOMEM;
+
+ reg_data[0] = addr;
+ memcpy(®_data[1], buf, count);
+
+ /* Write address & data */
+ xfer.addr = client->addr;
+ xfer.flags = 0;
+ xfer.len = 1 + count;
+ xfer.buf = reg_data;
+
+ ret = i2c_transfer(client->adapter, &xfer, 1);
+ kfree(reg_data);
+ if (ret == 1)
+ return 0;
+ else if (ret < 0)
+ return ret;
+ else
+ return -EIO;
+}
+
static bool da9150_volatile_reg(struct device *dev, unsigned int reg)
{
switch (reg) {
@@ -107,6 +179,28 @@ static const struct regmap_config da9150_regmap_config = {
.volatile_reg = da9150_volatile_reg,
};
+void da9150_read_qif(struct da9150 *da9150, u8 addr, int count, u8 *buf)
+{
+ int ret;
+
+ ret = da9150->read_dev(da9150->core_qif, addr, count, buf);
+ if (ret < 0)
+ dev_err(da9150->dev, "Failed to read from QIF 0x%x: %d\n",
+ addr, ret);
+}
+EXPORT_SYMBOL_GPL(da9150_read_qif);
+
+void da9150_write_qif(struct da9150 *da9150, u8 addr, int count, const u8 *buf)
+{
+ int ret;
+
+ ret = da9150->write_dev(da9150->core_qif, addr, count, buf);
+ if (ret < 0)
+ dev_err(da9150->dev, "Failed to write to QIF 0x%x: %d\n",
+ addr, ret);
+}
+EXPORT_SYMBOL_GPL(da9150_write_qif);
+
u8 da9150_reg_read(struct da9150 *da9150, u16 reg)
{
int val, ret;
@@ -297,6 +391,15 @@ static struct resource da9150_charger_resources[] = {
},
};
+static struct resource da9150_fg_resources[] = {
+ {
+ .name = "FG",
+ .start = DA9150_IRQ_FG,
+ .end = DA9150_IRQ_FG,
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
static struct mfd_cell da9150_devs[] = {
{
.name = "da9150-gpadc",
@@ -310,6 +413,12 @@ static struct mfd_cell da9150_devs[] = {
.resources = da9150_charger_resources,
.num_resources = ARRAY_SIZE(da9150_charger_resources),
},
+ {
+ .name = "da9150-fuelgauge",
+ .of_compatible = "dlg,da9150-fg",
+ .resources = da9150_fg_resources,
+ .num_resources = ARRAY_SIZE(da9150_fg_resources),
+ },
};
static int da9150_probe(struct i2c_client *client,
@@ -317,11 +426,14 @@ static int da9150_probe(struct i2c_client *client,
{
struct da9150 *da9150;
struct da9150_pdata *pdata = dev_get_platdata(&client->dev);
+ int qif_addr;
int ret;
da9150 = devm_kzalloc(&client->dev, sizeof(*da9150), GFP_KERNEL);
- if (!da9150)
- return -ENOMEM;
+ if (!da9150) {
+ ret = -ENOMEM;
+ goto fail;
+ }
da9150->dev = &client->dev;
da9150->irq = client->irq;
@@ -332,19 +444,46 @@ static int da9150_probe(struct i2c_client *client,
ret = PTR_ERR(da9150->regmap);
dev_err(da9150->dev, "Failed to allocate register map: %d\n",
ret);
- return ret;
+ goto fail;
+ }
+
+ /* Setup secondary I2C interface for QIF access */
+ qif_addr = da9150_reg_read(da9150, DA9150_CORE2WIRE_CTRL_A);
+ qif_addr = (qif_addr & DA9150_CORE_BASE_ADDR_MASK) >> 1;
+ qif_addr |= DA9150_QIF_I2C_ADDR_LSB;
+ da9150->core_qif = i2c_new_dummy(client->adapter, qif_addr);
+ if (!da9150->core_qif) {
+ dev_err(da9150->dev, "Failed to attach QIF client\n");
+ ret = -ENODEV;
+ goto fail;
}
- da9150->irq_base = pdata ? pdata->irq_base : -1;
+ i2c_set_clientdata(da9150->core_qif, da9150);
+ da9150->read_dev = (read_dev_t) da9150_i2c_read_device;
+ da9150->write_dev = (write_dev_t) da9150_i2c_write_device;
+
+ if (pdata) {
+ da9150->irq_base = pdata->irq_base;
+
+ da9150_devs[2].platform_data = pdata->fg_pdata;
+ da9150_devs[2].pdata_size = sizeof(struct da9150_fg_pdata);
+ } else {
+ da9150->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;
+ if (ret) {
+ dev_err(da9150->dev, "Failed to add regmap irq chip: %d\n",
+ ret);
+ goto regmap_irq_fail;
+ }
+
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,
@@ -352,11 +491,17 @@ static int da9150_probe(struct i2c_client *client,
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;
+ goto mfd_fail;
}
return 0;
+
+mfd_fail:
+ regmap_del_irq_chip(da9150->irq, da9150->regmap_irq_data);
+regmap_irq_fail:
+ i2c_unregister_device(da9150->core_qif);
+fail:
+ return ret;
}
static int da9150_remove(struct i2c_client *client)
@@ -365,6 +510,7 @@ static int da9150_remove(struct i2c_client *client)
regmap_del_irq_chip(da9150->irq, da9150->regmap_irq_data);
mfd_remove_devices(da9150->dev);
+ i2c_unregister_device(da9150->core_qif);
return 0;
}
diff --git a/include/linux/mfd/da9150/core.h b/include/linux/mfd/da9150/core.h
index 76e6689..98ecfea 100644
--- a/include/linux/mfd/da9150/core.h
+++ b/include/linux/mfd/da9150/core.h
@@ -15,9 +15,11 @@
#define __DA9150_CORE_H
#include <linux/device.h>
+#include <linux/i2c.h>
#include <linux/interrupt.h>
#include <linux/regmap.h>
+
/* I2C address paging */
#define DA9150_REG_PAGE_SHIFT 8
#define DA9150_REG_PAGE_MASK 0xFF
@@ -46,23 +48,40 @@
#define DA9150_IRQ_GPADC 19
#define DA9150_IRQ_WKUP 20
+/* Platform Data */
+struct da9150_fg_pdata;
+
struct da9150_pdata {
int irq_base;
+ struct da9150_fg_pdata *fg_pdata;
};
+/* I/O function typedefs for raw access */
+typedef int (*read_dev_t)(void *client, u8 addr, int count, u8 *buf);
+typedef int (*write_dev_t)(void *client, u8 addr, int count, const u8 *buf);
+
struct da9150 {
struct device *dev;
struct regmap *regmap;
+ struct i2c_client *core_qif;
+
+ read_dev_t read_dev;
+ write_dev_t write_dev;
+
struct regmap_irq_chip_data *regmap_irq_data;
int irq;
int irq_base;
};
/* Device I/O */
+void da9150_read_qif(struct da9150 *da9150, u8 addr, int count, u8 *buf);
+void da9150_write_qif(struct da9150 *da9150, u8 addr, int count, const u8 *buf);
+
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/fg.h b/include/linux/mfd/da9150/fg.h
new file mode 100644
index 0000000..0ff52ab
--- /dev/null
+++ b/include/linux/mfd/da9150/fg.h
@@ -0,0 +1,29 @@
+/*
+ * DA9150 MFD Driver - Fuel Gauge Data
+ *
+ * Copyright (c) 2015 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_FG_H
+#define __DA9150_FG_H
+
+#include <linux/power_supply.h>
+
+/* I2C sub-device address */
+#define DA9150_QIF_I2C_ADDR_LSB 0x5
+
+/* Platform data */
+struct da9150_fg_pdata {
+ u32 update_interval; /* msecs */
+ u8 warn_soc_lvl; /* % value */
+ u8 crit_soc_lvl; /* % value */
+};
+
+#endif /* __DA9150_FG_H */
--
1.9.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v2 1/4] mfd: da9150: Add support for Fuel-Gauge
@ 2015-06-26 8:47 ` Adam Thomson
0 siblings, 0 replies; 20+ messages in thread
From: Adam Thomson @ 2015-06-26 8:47 UTC (permalink / raw)
To: Lee Jones, Samuel Ortiz, Sebastian Reichel,
Dmitry Eremin-Solenikov, David Woodhouse, Rob Herring, Pawel Moll,
Mark Rutland, Ian Campbell, Kumar Gala
Cc: linux-pm, devicetree, linux-kernel, Support Opensource
Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
---
drivers/mfd/da9150-core.c | 162 ++++++++++++++++++++++++++++++++++++++--
include/linux/mfd/da9150/core.h | 19 +++++
include/linux/mfd/da9150/fg.h | 29 +++++++
3 files changed, 202 insertions(+), 8 deletions(-)
create mode 100644 include/linux/mfd/da9150/fg.h
diff --git a/drivers/mfd/da9150-core.c b/drivers/mfd/da9150-core.c
index 5549817..8feb75d 100644
--- a/drivers/mfd/da9150-core.c
+++ b/drivers/mfd/da9150-core.c
@@ -21,8 +21,80 @@
#include <linux/interrupt.h>
#include <linux/mfd/core.h>
#include <linux/mfd/da9150/core.h>
+#include <linux/mfd/da9150/fg.h>
#include <linux/mfd/da9150/registers.h>
+/* Raw device access, used for QIF */
+static int da9150_i2c_read_device(struct i2c_client *client, u8 addr, int count,
+ u8 *buf)
+{
+ struct i2c_msg xfer;
+ int ret;
+
+ /*
+ * Read is split into two transfers as device expects STOP/START rather
+ * than repeated start to carry out this kind of access.
+ */
+
+ /* Write address */
+ xfer.addr = client->addr;
+ xfer.flags = 0;
+ xfer.len = 1;
+ xfer.buf = &addr;
+
+ ret = i2c_transfer(client->adapter, &xfer, 1);
+ if (ret != 1) {
+ if (ret < 0)
+ return ret;
+ else
+ return -EIO;
+ }
+
+ /* Read data */
+ xfer.addr = client->addr;
+ xfer.flags = I2C_M_RD;
+ xfer.len = count;
+ xfer.buf = buf;
+
+ ret = i2c_transfer(client->adapter, &xfer, 1);
+ if (ret == 1)
+ return 0;
+ else if (ret < 0)
+ return ret;
+ else
+ return -EIO;
+}
+
+static int da9150_i2c_write_device(struct i2c_client *client, u8 addr,
+ int count, const u8 *buf)
+{
+ struct i2c_msg xfer;
+ u8 *reg_data;
+ int ret;
+
+ reg_data = kzalloc(1 + count, GFP_KERNEL);
+ if (!reg_data)
+ return -ENOMEM;
+
+ reg_data[0] = addr;
+ memcpy(®_data[1], buf, count);
+
+ /* Write address & data */
+ xfer.addr = client->addr;
+ xfer.flags = 0;
+ xfer.len = 1 + count;
+ xfer.buf = reg_data;
+
+ ret = i2c_transfer(client->adapter, &xfer, 1);
+ kfree(reg_data);
+ if (ret == 1)
+ return 0;
+ else if (ret < 0)
+ return ret;
+ else
+ return -EIO;
+}
+
static bool da9150_volatile_reg(struct device *dev, unsigned int reg)
{
switch (reg) {
@@ -107,6 +179,28 @@ static const struct regmap_config da9150_regmap_config = {
.volatile_reg = da9150_volatile_reg,
};
+void da9150_read_qif(struct da9150 *da9150, u8 addr, int count, u8 *buf)
+{
+ int ret;
+
+ ret = da9150->read_dev(da9150->core_qif, addr, count, buf);
+ if (ret < 0)
+ dev_err(da9150->dev, "Failed to read from QIF 0x%x: %d\n",
+ addr, ret);
+}
+EXPORT_SYMBOL_GPL(da9150_read_qif);
+
+void da9150_write_qif(struct da9150 *da9150, u8 addr, int count, const u8 *buf)
+{
+ int ret;
+
+ ret = da9150->write_dev(da9150->core_qif, addr, count, buf);
+ if (ret < 0)
+ dev_err(da9150->dev, "Failed to write to QIF 0x%x: %d\n",
+ addr, ret);
+}
+EXPORT_SYMBOL_GPL(da9150_write_qif);
+
u8 da9150_reg_read(struct da9150 *da9150, u16 reg)
{
int val, ret;
@@ -297,6 +391,15 @@ static struct resource da9150_charger_resources[] = {
},
};
+static struct resource da9150_fg_resources[] = {
+ {
+ .name = "FG",
+ .start = DA9150_IRQ_FG,
+ .end = DA9150_IRQ_FG,
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
static struct mfd_cell da9150_devs[] = {
{
.name = "da9150-gpadc",
@@ -310,6 +413,12 @@ static struct mfd_cell da9150_devs[] = {
.resources = da9150_charger_resources,
.num_resources = ARRAY_SIZE(da9150_charger_resources),
},
+ {
+ .name = "da9150-fuelgauge",
+ .of_compatible = "dlg,da9150-fg",
+ .resources = da9150_fg_resources,
+ .num_resources = ARRAY_SIZE(da9150_fg_resources),
+ },
};
static int da9150_probe(struct i2c_client *client,
@@ -317,11 +426,14 @@ static int da9150_probe(struct i2c_client *client,
{
struct da9150 *da9150;
struct da9150_pdata *pdata = dev_get_platdata(&client->dev);
+ int qif_addr;
int ret;
da9150 = devm_kzalloc(&client->dev, sizeof(*da9150), GFP_KERNEL);
- if (!da9150)
- return -ENOMEM;
+ if (!da9150) {
+ ret = -ENOMEM;
+ goto fail;
+ }
da9150->dev = &client->dev;
da9150->irq = client->irq;
@@ -332,19 +444,46 @@ static int da9150_probe(struct i2c_client *client,
ret = PTR_ERR(da9150->regmap);
dev_err(da9150->dev, "Failed to allocate register map: %d\n",
ret);
- return ret;
+ goto fail;
+ }
+
+ /* Setup secondary I2C interface for QIF access */
+ qif_addr = da9150_reg_read(da9150, DA9150_CORE2WIRE_CTRL_A);
+ qif_addr = (qif_addr & DA9150_CORE_BASE_ADDR_MASK) >> 1;
+ qif_addr |= DA9150_QIF_I2C_ADDR_LSB;
+ da9150->core_qif = i2c_new_dummy(client->adapter, qif_addr);
+ if (!da9150->core_qif) {
+ dev_err(da9150->dev, "Failed to attach QIF client\n");
+ ret = -ENODEV;
+ goto fail;
}
- da9150->irq_base = pdata ? pdata->irq_base : -1;
+ i2c_set_clientdata(da9150->core_qif, da9150);
+ da9150->read_dev = (read_dev_t) da9150_i2c_read_device;
+ da9150->write_dev = (write_dev_t) da9150_i2c_write_device;
+
+ if (pdata) {
+ da9150->irq_base = pdata->irq_base;
+
+ da9150_devs[2].platform_data = pdata->fg_pdata;
+ da9150_devs[2].pdata_size = sizeof(struct da9150_fg_pdata);
+ } else {
+ da9150->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;
+ if (ret) {
+ dev_err(da9150->dev, "Failed to add regmap irq chip: %d\n",
+ ret);
+ goto regmap_irq_fail;
+ }
+
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,
@@ -352,11 +491,17 @@ static int da9150_probe(struct i2c_client *client,
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;
+ goto mfd_fail;
}
return 0;
+
+mfd_fail:
+ regmap_del_irq_chip(da9150->irq, da9150->regmap_irq_data);
+regmap_irq_fail:
+ i2c_unregister_device(da9150->core_qif);
+fail:
+ return ret;
}
static int da9150_remove(struct i2c_client *client)
@@ -365,6 +510,7 @@ static int da9150_remove(struct i2c_client *client)
regmap_del_irq_chip(da9150->irq, da9150->regmap_irq_data);
mfd_remove_devices(da9150->dev);
+ i2c_unregister_device(da9150->core_qif);
return 0;
}
diff --git a/include/linux/mfd/da9150/core.h b/include/linux/mfd/da9150/core.h
index 76e6689..98ecfea 100644
--- a/include/linux/mfd/da9150/core.h
+++ b/include/linux/mfd/da9150/core.h
@@ -15,9 +15,11 @@
#define __DA9150_CORE_H
#include <linux/device.h>
+#include <linux/i2c.h>
#include <linux/interrupt.h>
#include <linux/regmap.h>
+
/* I2C address paging */
#define DA9150_REG_PAGE_SHIFT 8
#define DA9150_REG_PAGE_MASK 0xFF
@@ -46,23 +48,40 @@
#define DA9150_IRQ_GPADC 19
#define DA9150_IRQ_WKUP 20
+/* Platform Data */
+struct da9150_fg_pdata;
+
struct da9150_pdata {
int irq_base;
+ struct da9150_fg_pdata *fg_pdata;
};
+/* I/O function typedefs for raw access */
+typedef int (*read_dev_t)(void *client, u8 addr, int count, u8 *buf);
+typedef int (*write_dev_t)(void *client, u8 addr, int count, const u8 *buf);
+
struct da9150 {
struct device *dev;
struct regmap *regmap;
+ struct i2c_client *core_qif;
+
+ read_dev_t read_dev;
+ write_dev_t write_dev;
+
struct regmap_irq_chip_data *regmap_irq_data;
int irq;
int irq_base;
};
/* Device I/O */
+void da9150_read_qif(struct da9150 *da9150, u8 addr, int count, u8 *buf);
+void da9150_write_qif(struct da9150 *da9150, u8 addr, int count, const u8 *buf);
+
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/fg.h b/include/linux/mfd/da9150/fg.h
new file mode 100644
index 0000000..0ff52ab
--- /dev/null
+++ b/include/linux/mfd/da9150/fg.h
@@ -0,0 +1,29 @@
+/*
+ * DA9150 MFD Driver - Fuel Gauge Data
+ *
+ * Copyright (c) 2015 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_FG_H
+#define __DA9150_FG_H
+
+#include <linux/power_supply.h>
+
+/* I2C sub-device address */
+#define DA9150_QIF_I2C_ADDR_LSB 0x5
+
+/* Platform data */
+struct da9150_fg_pdata {
+ u32 update_interval; /* msecs */
+ u8 warn_soc_lvl; /* % value */
+ u8 crit_soc_lvl; /* % value */
+};
+
+#endif /* __DA9150_FG_H */
--
1.9.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH v2 1/4] mfd: da9150: Add support for Fuel-Gauge
2015-06-26 8:47 ` Adam Thomson
(?)
@ 2015-07-03 15:16 ` Lee Jones
2015-07-06 14:03 ` Opensource [Adam Thomson]
-1 siblings, 1 reply; 20+ messages in thread
From: Lee Jones @ 2015-07-03 15:16 UTC (permalink / raw)
To: Adam Thomson
Cc: Samuel Ortiz, Sebastian Reichel, Dmitry Eremin-Solenikov,
David Woodhouse, Rob Herring, Pawel Moll, Mark Rutland,
Ian Campbell, Kumar Gala, linux-pm, devicetree, linux-kernel,
Support Opensource
On Fri, 26 Jun 2015, Adam Thomson wrote:
> Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
> ---
Changelog v1 => v2?
> drivers/mfd/da9150-core.c | 162 ++++++++++++++++++++++++++++++++++++++--
> include/linux/mfd/da9150/core.h | 19 +++++
> include/linux/mfd/da9150/fg.h | 29 +++++++
> 3 files changed, 202 insertions(+), 8 deletions(-)
> create mode 100644 include/linux/mfd/da9150/fg.h
>
> diff --git a/drivers/mfd/da9150-core.c b/drivers/mfd/da9150-core.c
> index 5549817..8feb75d 100644
> --- a/drivers/mfd/da9150-core.c
> +++ b/drivers/mfd/da9150-core.c
> @@ -21,8 +21,80 @@
> #include <linux/interrupt.h>
> #include <linux/mfd/core.h>
> #include <linux/mfd/da9150/core.h>
> +#include <linux/mfd/da9150/fg.h>
> #include <linux/mfd/da9150/registers.h>
>
> +/* Raw device access, used for QIF */
> +static int da9150_i2c_read_device(struct i2c_client *client, u8 addr, int count,
> + u8 *buf)
> +{
> + struct i2c_msg xfer;
> + int ret;
> +
> + /*
> + * Read is split into two transfers as device expects STOP/START rather
> + * than repeated start to carry out this kind of access.
> + */
> +
> + /* Write address */
> + xfer.addr = client->addr;
> + xfer.flags = 0;
> + xfer.len = 1;
> + xfer.buf = &addr;
> +
> + ret = i2c_transfer(client->adapter, &xfer, 1);
> + if (ret != 1) {
> + if (ret < 0)
> + return ret;
> + else
> + return -EIO;
> + }
> +
> + /* Read data */
> + xfer.addr = client->addr;
> + xfer.flags = I2C_M_RD;
> + xfer.len = count;
> + xfer.buf = buf;
> +
> + ret = i2c_transfer(client->adapter, &xfer, 1);
> + if (ret == 1)
> + return 0;
> + else if (ret < 0)
> + return ret;
> + else
> + return -EIO;
> +}
> +
> +static int da9150_i2c_write_device(struct i2c_client *client, u8 addr,
> + int count, const u8 *buf)
> +{
> + struct i2c_msg xfer;
> + u8 *reg_data;
> + int ret;
> +
> + reg_data = kzalloc(1 + count, GFP_KERNEL);
> + if (!reg_data)
> + return -ENOMEM;
> +
> + reg_data[0] = addr;
> + memcpy(®_data[1], buf, count);
> +
> + /* Write address & data */
> + xfer.addr = client->addr;
> + xfer.flags = 0;
> + xfer.len = 1 + count;
> + xfer.buf = reg_data;
> +
> + ret = i2c_transfer(client->adapter, &xfer, 1);
> + kfree(reg_data);
> + if (ret == 1)
> + return 0;
> + else if (ret < 0)
> + return ret;
> + else
> + return -EIO;
> +}
> +
> static bool da9150_volatile_reg(struct device *dev, unsigned int reg)
> {
> switch (reg) {
> @@ -107,6 +179,28 @@ static const struct regmap_config da9150_regmap_config = {
> .volatile_reg = da9150_volatile_reg,
> };
>
> +void da9150_read_qif(struct da9150 *da9150, u8 addr, int count, u8 *buf)
> +{
> + int ret;
> +
> + ret = da9150->read_dev(da9150->core_qif, addr, count, buf);
> + if (ret < 0)
> + dev_err(da9150->dev, "Failed to read from QIF 0x%x: %d\n",
> + addr, ret);
> +}
> +EXPORT_SYMBOL_GPL(da9150_read_qif);
> +
> +void da9150_write_qif(struct da9150 *da9150, u8 addr, int count, const u8 *buf)
> +{
> + int ret;
> +
> + ret = da9150->write_dev(da9150->core_qif, addr, count, buf);
> + if (ret < 0)
> + dev_err(da9150->dev, "Failed to write to QIF 0x%x: %d\n",
> + addr, ret);
> +}
> +EXPORT_SYMBOL_GPL(da9150_write_qif);
> +
> u8 da9150_reg_read(struct da9150 *da9150, u16 reg)
> {
> int val, ret;
> @@ -297,6 +391,15 @@ static struct resource da9150_charger_resources[] = {
> },
> };
>
> +static struct resource da9150_fg_resources[] = {
> + {
> + .name = "FG",
> + .start = DA9150_IRQ_FG,
> + .end = DA9150_IRQ_FG,
> + .flags = IORESOURCE_IRQ,
Can you use the DEFINE_RES_* helpers?
> + },
> +};
> +
> static struct mfd_cell da9150_devs[] = {
> {
> .name = "da9150-gpadc",
> @@ -310,6 +413,12 @@ static struct mfd_cell da9150_devs[] = {
> .resources = da9150_charger_resources,
> .num_resources = ARRAY_SIZE(da9150_charger_resources),
> },
> + {
> + .name = "da9150-fuelgauge",
> + .of_compatible = "dlg,da9150-fg",
> + .resources = da9150_fg_resources,
> + .num_resources = ARRAY_SIZE(da9150_fg_resources),
> + },
> };
>
> static int da9150_probe(struct i2c_client *client,
> @@ -317,11 +426,14 @@ static int da9150_probe(struct i2c_client *client,
> {
> struct da9150 *da9150;
> struct da9150_pdata *pdata = dev_get_platdata(&client->dev);
> + int qif_addr;
> int ret;
>
> da9150 = devm_kzalloc(&client->dev, sizeof(*da9150), GFP_KERNEL);
> - if (!da9150)
> - return -ENOMEM;
> + if (!da9150) {
> + ret = -ENOMEM;
> + goto fail;
Don't do this. 'fail' doesn't do anything, just return here.
> + }
>
> da9150->dev = &client->dev;
> da9150->irq = client->irq;
> @@ -332,19 +444,46 @@ static int da9150_probe(struct i2c_client *client,
> ret = PTR_ERR(da9150->regmap);
> dev_err(da9150->dev, "Failed to allocate register map: %d\n",
> ret);
> - return ret;
> + goto fail;
It was better before.
> + }
> +
> + /* Setup secondary I2C interface for QIF access */
> + qif_addr = da9150_reg_read(da9150, DA9150_CORE2WIRE_CTRL_A);
> + qif_addr = (qif_addr & DA9150_CORE_BASE_ADDR_MASK) >> 1;
> + qif_addr |= DA9150_QIF_I2C_ADDR_LSB;
> + da9150->core_qif = i2c_new_dummy(client->adapter, qif_addr);
> + if (!da9150->core_qif) {
> + dev_err(da9150->dev, "Failed to attach QIF client\n");
> + ret = -ENODEV;
> + goto fail;
Same.
> }
>
> - da9150->irq_base = pdata ? pdata->irq_base : -1;
> + i2c_set_clientdata(da9150->core_qif, da9150);
> + da9150->read_dev = (read_dev_t) da9150_i2c_read_device;
> + da9150->write_dev = (write_dev_t) da9150_i2c_write_device;
Is it possible for read_dev to be set to anything other than
da9150_i2c_read_device?
> + if (pdata) {
> + da9150->irq_base = pdata->irq_base;
> +
> + da9150_devs[2].platform_data = pdata->fg_pdata;
> + da9150_devs[2].pdata_size = sizeof(struct da9150_fg_pdata);
This is fragile.
If another device gets inserted above the FG, this will break.
> + } else {
> + da9150->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;
> + if (ret) {
> + dev_err(da9150->dev, "Failed to add regmap irq chip: %d\n",
> + ret);
> + goto regmap_irq_fail;
> + }
> +
>
> 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,
> @@ -352,11 +491,17 @@ static int da9150_probe(struct i2c_client *client,
> 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;
> + goto mfd_fail;
> }
>
> return 0;
> +
> +mfd_fail:
> + regmap_del_irq_chip(da9150->irq, da9150->regmap_irq_data);
> +regmap_irq_fail:
> + i2c_unregister_device(da9150->core_qif);
> +fail:
> + return ret;
> }
>
> static int da9150_remove(struct i2c_client *client)
> @@ -365,6 +510,7 @@ static int da9150_remove(struct i2c_client *client)
>
> regmap_del_irq_chip(da9150->irq, da9150->regmap_irq_data);
> mfd_remove_devices(da9150->dev);
> + i2c_unregister_device(da9150->core_qif);
>
> return 0;
> }
> diff --git a/include/linux/mfd/da9150/core.h b/include/linux/mfd/da9150/core.h
> index 76e6689..98ecfea 100644
> --- a/include/linux/mfd/da9150/core.h
> +++ b/include/linux/mfd/da9150/core.h
> @@ -15,9 +15,11 @@
> #define __DA9150_CORE_H
>
> #include <linux/device.h>
> +#include <linux/i2c.h>
> #include <linux/interrupt.h>
> #include <linux/regmap.h>
>
> +
Please remove this.
> /* I2C address paging */
> #define DA9150_REG_PAGE_SHIFT 8
> #define DA9150_REG_PAGE_MASK 0xFF
> @@ -46,23 +48,40 @@
> #define DA9150_IRQ_GPADC 19
> #define DA9150_IRQ_WKUP 20
>
> +/* Platform Data */
No need for this comment. The pdata in the name give it away.
> +struct da9150_fg_pdata;
Why can't you just put the struct definition in here?
> struct da9150_pdata {
> int irq_base;
> + struct da9150_fg_pdata *fg_pdata;
> };
>
> +/* I/O function typedefs for raw access */
> +typedef int (*read_dev_t)(void *client, u8 addr, int count, u8 *buf);
> +typedef int (*write_dev_t)(void *client, u8 addr, int count, const u8 *buf);
No need to typedef, just pop them directly into the struct. Although
I'm not convinced that need them at all really.
> struct da9150 {
> struct device *dev;
> struct regmap *regmap;
> + struct i2c_client *core_qif;
> +
> + read_dev_t read_dev;
> + write_dev_t write_dev;
> +
> struct regmap_irq_chip_data *regmap_irq_data;
> int irq;
> int irq_base;
Why are there 2 irq_bases? That could get pretty confusing.
Why is it being stored?
Same with irq.
> };
>
> /* Device I/O */
> +void da9150_read_qif(struct da9150 *da9150, u8 addr, int count, u8 *buf);
> +void da9150_write_qif(struct da9150 *da9150, u8 addr, int count, const u8 *buf);
What is qif? The naming convention isn't very transparent.
> 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/fg.h b/include/linux/mfd/da9150/fg.h
> new file mode 100644
> index 0000000..0ff52ab
> --- /dev/null
> +++ b/include/linux/mfd/da9150/fg.h
> @@ -0,0 +1,29 @@
> +/*
> + * DA9150 MFD Driver - Fuel Gauge Data
Does it really require it's very own header file?
> + * Copyright (c) 2015 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_FG_H
> +#define __DA9150_FG_H
> +
> +#include <linux/power_supply.h>
> +
> +/* I2C sub-device address */
> +#define DA9150_QIF_I2C_ADDR_LSB 0x5
> +
> +/* Platform data */
> +struct da9150_fg_pdata {
> + u32 update_interval; /* msecs */
> + u8 warn_soc_lvl; /* % value */
> + u8 crit_soc_lvl; /* % value */
> +};
> +
> +#endif /* __DA9150_FG_H */
--
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 v2 1/4] mfd: da9150: Add support for Fuel-Gauge
2015-07-03 15:16 ` Lee Jones
@ 2015-07-06 14:03 ` Opensource [Adam Thomson]
0 siblings, 0 replies; 20+ messages in thread
From: Opensource [Adam Thomson] @ 2015-07-06 14:03 UTC (permalink / raw)
To: Lee Jones, Opensource [Adam Thomson]
Cc: Samuel Ortiz, Sebastian Reichel, Dmitry Eremin-Solenikov,
David Woodhouse, Rob Herring, Pawel Moll, Mark Rutland,
Ian Campbell, Kumar Gala, linux-pm@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
Support Opensource
On July 3, 2015 16:16, Lee Jones wrote:
>
> Changelog v1 => v2?
Is described in the cover letter, but can move that information to the individual
patches in the future, if that helps.
> >
> > +static struct resource da9150_fg_resources[] = {
> > + {
> > + .name = "FG",
> > + .start = DA9150_IRQ_FG,
> > + .end = DA9150_IRQ_FG,
> > + .flags = IORESOURCE_IRQ,
>
> Can you use the DEFINE_RES_* helpers?
Hadn't spotted those before. Will use those instead.
> > - if (!da9150)
> > - return -ENOMEM;
> > + if (!da9150) {
> > + ret = -ENOMEM;
> > + goto fail;
>
> Don't do this. 'fail' doesn't do anything, just return here.
Ok. I was opting for choosing one consistent method of handling failure, rather
than a combination of gotos and immediate returns, but will change.
>
> > + }
> >
> > da9150->dev = &client->dev;
> > da9150->irq = client->irq;
> > @@ -332,19 +444,46 @@ static int da9150_probe(struct i2c_client *client,
> > ret = PTR_ERR(da9150->regmap);
> > dev_err(da9150->dev, "Failed to allocate register map: %d\n",
> > ret);
> > - return ret;
> > + goto fail;
>
> It was better before.
Ok
>
> > + }
> > +
> > + /* Setup secondary I2C interface for QIF access */
> > + qif_addr = da9150_reg_read(da9150, DA9150_CORE2WIRE_CTRL_A);
> > + qif_addr = (qif_addr & DA9150_CORE_BASE_ADDR_MASK) >> 1;
> > + qif_addr |= DA9150_QIF_I2C_ADDR_LSB;
> > + da9150->core_qif = i2c_new_dummy(client->adapter, qif_addr);
> > + if (!da9150->core_qif) {
> > + dev_err(da9150->dev, "Failed to attach QIF client\n");
> > + ret = -ENODEV;
> > + goto fail;
>
> Same.
Ok
>
> > }
> >
> > - da9150->irq_base = pdata ? pdata->irq_base : -1;
> > + i2c_set_clientdata(da9150->core_qif, da9150);
> > + da9150->read_dev = (read_dev_t) da9150_i2c_read_device;
> > + da9150->write_dev = (write_dev_t) da9150_i2c_write_device;
>
> Is it possible for read_dev to be set to anything other than
> da9150_i2c_read_device?
Right now there is no SPI support in the driver so no. Given the comment further
down, I'll remove these function pointers for now, and directly call the I2C
related functions.
>
> > + if (pdata) {
> > + da9150->irq_base = pdata->irq_base;
> > +
> > + da9150_devs[2].platform_data = pdata->fg_pdata;
> > + da9150_devs[2].pdata_size = sizeof(struct da9150_fg_pdata);
>
> This is fragile.
>
> If another device gets inserted above the FG, this will break.
>
It is unlikely, but you are right. Will fix this.
> > diff --git a/include/linux/mfd/da9150/core.h b/include/linux/mfd/da9150/core.h
> > index 76e6689..98ecfea 100644
> > --- a/include/linux/mfd/da9150/core.h
> > +++ b/include/linux/mfd/da9150/core.h
> > @@ -15,9 +15,11 @@
> > #define __DA9150_CORE_H
> >
> > #include <linux/device.h>
> > +#include <linux/i2c.h>
> > #include <linux/interrupt.h>
> > #include <linux/regmap.h>
> >
> > +
>
> Please remove this.
Yep.
>
> > /* I2C address paging */
> > #define DA9150_REG_PAGE_SHIFT 8
> > #define DA9150_REG_PAGE_MASK 0xFF
> > @@ -46,23 +48,40 @@
> > #define DA9150_IRQ_GPADC 19
> > #define DA9150_IRQ_WKUP 20
> >
> > +/* Platform Data */
>
> No need for this comment. The pdata in the name give it away.
Fine.
>
> > +struct da9150_fg_pdata;
>
> Why can't you just put the struct definition in here?
>
Was a design choice as I was providing a header for FG to expose the temp
reading callback function and figured it made sense to keep other FG related
items in there as well. Can fold them all into the core.h though if that's the
preferred method.
> > struct da9150_pdata {
> > int irq_base;
> > + struct da9150_fg_pdata *fg_pdata;
> > };
> >
> > +/* I/O function typedefs for raw access */
> > +typedef int (*read_dev_t)(void *client, u8 addr, int count, u8 *buf);
> > +typedef int (*write_dev_t)(void *client, u8 addr, int count, const u8 *buf);
>
> No need to typedef, just pop them directly into the struct. Although
> I'm not convinced that need them at all really.
Will remove use of this for now, as without SPI support, they don't add
anything.
>
> > struct da9150 {
> > struct device *dev;
> > struct regmap *regmap;
> > + struct i2c_client *core_qif;
> > +
> > + read_dev_t read_dev;
> > + write_dev_t write_dev;
> > +
> > struct regmap_irq_chip_data *regmap_irq_data;
> > int irq;
> > int irq_base;
>
> Why are there 2 irq_bases? That could get pretty confusing.
>
> Why is it being stored?
>
> Same with irq.
Not 2 IRQ bases. 'irq' is the chip IRQ. Same as is done in a number of other
MFD drivers. Technically though they don't need storing within the private data,
and was done as a convenience. I can add a follow up patch to remove this, if
it's wanted though.
>
> > };
> >
> > /* Device I/O */
> > +void da9150_read_qif(struct da9150 *da9150, u8 addr, int count, u8 *buf);
> > +void da9150_write_qif(struct da9150 *da9150, u8 addr, int count, const u8 *buf);
>
> What is qif? The naming convention isn't very transparent.
This is an interface which is specific to the device (Query Interface), and is
used to access data from the fuel-gauge. Is documented in the device
datasheet, but can add comments here just to clarify.
>
> > 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/fg.h b/include/linux/mfd/da9150/fg.h
> > new file mode 100644
> > index 0000000..0ff52ab
> > --- /dev/null
> > +++ b/include/linux/mfd/da9150/fg.h
> > @@ -0,0 +1,29 @@
> > +/*
> > + * DA9150 MFD Driver - Fuel Gauge Data
>
> Does it really require it's very own header file?
Will fold this into the main header, if you don't want to separate out the FG
related data and temp callback related defines.
^ permalink raw reply [flat|nested] 20+ messages in thread* RE: [PATCH v2 1/4] mfd: da9150: Add support for Fuel-Gauge
@ 2015-07-06 14:03 ` Opensource [Adam Thomson]
0 siblings, 0 replies; 20+ messages in thread
From: Opensource [Adam Thomson] @ 2015-07-06 14:03 UTC (permalink / raw)
To: Lee Jones, Opensource [Adam Thomson]
Cc: Samuel Ortiz, Sebastian Reichel, Dmitry Eremin-Solenikov,
David Woodhouse, Rob Herring, Pawel Moll, Mark Rutland,
Ian Campbell, Kumar Gala, linux-pm@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
Support Opensource
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 6174 bytes --]
On July 3, 2015 16:16, Lee Jones wrote:
>
> Changelog v1 => v2?
Is described in the cover letter, but can move that information to the individual
patches in the future, if that helps.
> >
> > +static struct resource da9150_fg_resources[] = {
> > + {
> > + .name = "FG",
> > + .start = DA9150_IRQ_FG,
> > + .end = DA9150_IRQ_FG,
> > + .flags = IORESOURCE_IRQ,
>
> Can you use the DEFINE_RES_* helpers?
Hadn't spotted those before. Will use those instead.
> > - if (!da9150)
> > - return -ENOMEM;
> > + if (!da9150) {
> > + ret = -ENOMEM;
> > + goto fail;
>
> Don't do this. 'fail' doesn't do anything, just return here.
Ok. I was opting for choosing one consistent method of handling failure, rather
than a combination of gotos and immediate returns, but will change.
>
> > + }
> >
> > da9150->dev = &client->dev;
> > da9150->irq = client->irq;
> > @@ -332,19 +444,46 @@ static int da9150_probe(struct i2c_client *client,
> > ret = PTR_ERR(da9150->regmap);
> > dev_err(da9150->dev, "Failed to allocate register map: %d\n",
> > ret);
> > - return ret;
> > + goto fail;
>
> It was better before.
Ok
>
> > + }
> > +
> > + /* Setup secondary I2C interface for QIF access */
> > + qif_addr = da9150_reg_read(da9150, DA9150_CORE2WIRE_CTRL_A);
> > + qif_addr = (qif_addr & DA9150_CORE_BASE_ADDR_MASK) >> 1;
> > + qif_addr |= DA9150_QIF_I2C_ADDR_LSB;
> > + da9150->core_qif = i2c_new_dummy(client->adapter, qif_addr);
> > + if (!da9150->core_qif) {
> > + dev_err(da9150->dev, "Failed to attach QIF client\n");
> > + ret = -ENODEV;
> > + goto fail;
>
> Same.
Ok
>
> > }
> >
> > - da9150->irq_base = pdata ? pdata->irq_base : -1;
> > + i2c_set_clientdata(da9150->core_qif, da9150);
> > + da9150->read_dev = (read_dev_t) da9150_i2c_read_device;
> > + da9150->write_dev = (write_dev_t) da9150_i2c_write_device;
>
> Is it possible for read_dev to be set to anything other than
> da9150_i2c_read_device?
Right now there is no SPI support in the driver so no. Given the comment further
down, I'll remove these function pointers for now, and directly call the I2C
related functions.
>
> > + if (pdata) {
> > + da9150->irq_base = pdata->irq_base;
> > +
> > + da9150_devs[2].platform_data = pdata->fg_pdata;
> > + da9150_devs[2].pdata_size = sizeof(struct da9150_fg_pdata);
>
> This is fragile.
>
> If another device gets inserted above the FG, this will break.
>
It is unlikely, but you are right. Will fix this.
> > diff --git a/include/linux/mfd/da9150/core.h b/include/linux/mfd/da9150/core.h
> > index 76e6689..98ecfea 100644
> > --- a/include/linux/mfd/da9150/core.h
> > +++ b/include/linux/mfd/da9150/core.h
> > @@ -15,9 +15,11 @@
> > #define __DA9150_CORE_H
> >
> > #include <linux/device.h>
> > +#include <linux/i2c.h>
> > #include <linux/interrupt.h>
> > #include <linux/regmap.h>
> >
> > +
>
> Please remove this.
Yep.
>
> > /* I2C address paging */
> > #define DA9150_REG_PAGE_SHIFT 8
> > #define DA9150_REG_PAGE_MASK 0xFF
> > @@ -46,23 +48,40 @@
> > #define DA9150_IRQ_GPADC 19
> > #define DA9150_IRQ_WKUP 20
> >
> > +/* Platform Data */
>
> No need for this comment. The pdata in the name give it away.
Fine.
>
> > +struct da9150_fg_pdata;
>
> Why can't you just put the struct definition in here?
>
Was a design choice as I was providing a header for FG to expose the temp
reading callback function and figured it made sense to keep other FG related
items in there as well. Can fold them all into the core.h though if that's the
preferred method.
> > struct da9150_pdata {
> > int irq_base;
> > + struct da9150_fg_pdata *fg_pdata;
> > };
> >
> > +/* I/O function typedefs for raw access */
> > +typedef int (*read_dev_t)(void *client, u8 addr, int count, u8 *buf);
> > +typedef int (*write_dev_t)(void *client, u8 addr, int count, const u8 *buf);
>
> No need to typedef, just pop them directly into the struct. Although
> I'm not convinced that need them at all really.
Will remove use of this for now, as without SPI support, they don't add
anything.
>
> > struct da9150 {
> > struct device *dev;
> > struct regmap *regmap;
> > + struct i2c_client *core_qif;
> > +
> > + read_dev_t read_dev;
> > + write_dev_t write_dev;
> > +
> > struct regmap_irq_chip_data *regmap_irq_data;
> > int irq;
> > int irq_base;
>
> Why are there 2 irq_bases? That could get pretty confusing.
>
> Why is it being stored?
>
> Same with irq.
Not 2 IRQ bases. 'irq' is the chip IRQ. Same as is done in a number of other
MFD drivers. Technically though they don't need storing within the private data,
and was done as a convenience. I can add a follow up patch to remove this, if
it's wanted though.
>
> > };
> >
> > /* Device I/O */
> > +void da9150_read_qif(struct da9150 *da9150, u8 addr, int count, u8 *buf);
> > +void da9150_write_qif(struct da9150 *da9150, u8 addr, int count, const u8 *buf);
>
> What is qif? The naming convention isn't very transparent.
This is an interface which is specific to the device (Query Interface), and is
used to access data from the fuel-gauge. Is documented in the device
datasheet, but can add comments here just to clarify.
>
> > 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/fg.h b/include/linux/mfd/da9150/fg.h
> > new file mode 100644
> > index 0000000..0ff52ab
> > --- /dev/null
> > +++ b/include/linux/mfd/da9150/fg.h
> > @@ -0,0 +1,29 @@
> > +/*
> > + * DA9150 MFD Driver - Fuel Gauge Data
>
> Does it really require it's very own header file?
Will fold this into the main header, if you don't want to separate out the FG
related data and temp callback related defines.
ÿôèº{.nÇ+‰·Ÿ®‰†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a¢f£¢·hšïêÿ‘êçz_è®\x03(階ŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨èÚ&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v2 2/4] mfd: da9150: Update DT bindings for Fuel-Gauge support
2015-06-26 8:47 ` Adam Thomson
@ 2015-06-26 8:47 ` Adam Thomson
-1 siblings, 0 replies; 20+ messages in thread
From: Adam Thomson @ 2015-06-26 8:47 UTC (permalink / raw)
To: Lee Jones, Samuel Ortiz, Sebastian Reichel,
Dmitry Eremin-Solenikov, David Woodhouse, Rob Herring, Pawel Moll,
Mark Rutland, Ian Campbell, Kumar Gala
Cc: linux-pm, devicetree, linux-kernel, Support Opensource
Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
---
Documentation/devicetree/bindings/mfd/da9150.txt | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Documentation/devicetree/bindings/mfd/da9150.txt b/Documentation/devicetree/bindings/mfd/da9150.txt
index d0588ea..8bf1a20 100644
--- a/Documentation/devicetree/bindings/mfd/da9150.txt
+++ b/Documentation/devicetree/bindings/mfd/da9150.txt
@@ -6,6 +6,7 @@ Device Description
------ -----------
da9150-gpadc : General Purpose ADC
da9150-charger : Battery Charger
+da9150-fg : Battery Fuel-Gauge
======
@@ -22,6 +23,7 @@ Required properties:
Sub-devices:
- da9150-gpadc: See Documentation/devicetree/bindings/iio/adc/da9150-gpadc.txt
- da9150-charger: See Documentation/devicetree/bindings/power/da9150-charger.txt
+- da9150-fg: See Documentation/devicetree/bindings/power/da9150-fg.txt
Example:
@@ -40,4 +42,8 @@ Example:
da9150-charger {
...
};
+
+ da9150-fg {
+ ...
+ };
};
--
1.9.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v2 2/4] mfd: da9150: Update DT bindings for Fuel-Gauge support
@ 2015-06-26 8:47 ` Adam Thomson
0 siblings, 0 replies; 20+ messages in thread
From: Adam Thomson @ 2015-06-26 8:47 UTC (permalink / raw)
To: Lee Jones, Samuel Ortiz, Sebastian Reichel,
Dmitry Eremin-Solenikov, David Woodhouse, Rob Herring, Pawel Moll,
Mark Rutland, Ian Campbell, Kumar Gala
Cc: linux-pm, devicetree, linux-kernel, Support Opensource
Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
---
Documentation/devicetree/bindings/mfd/da9150.txt | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Documentation/devicetree/bindings/mfd/da9150.txt b/Documentation/devicetree/bindings/mfd/da9150.txt
index d0588ea..8bf1a20 100644
--- a/Documentation/devicetree/bindings/mfd/da9150.txt
+++ b/Documentation/devicetree/bindings/mfd/da9150.txt
@@ -6,6 +6,7 @@ Device Description
------ -----------
da9150-gpadc : General Purpose ADC
da9150-charger : Battery Charger
+da9150-fg : Battery Fuel-Gauge
======
@@ -22,6 +23,7 @@ Required properties:
Sub-devices:
- da9150-gpadc: See Documentation/devicetree/bindings/iio/adc/da9150-gpadc.txt
- da9150-charger: See Documentation/devicetree/bindings/power/da9150-charger.txt
+- da9150-fg: See Documentation/devicetree/bindings/power/da9150-fg.txt
Example:
@@ -40,4 +42,8 @@ Example:
da9150-charger {
...
};
+
+ da9150-fg {
+ ...
+ };
};
--
1.9.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH v2 2/4] mfd: da9150: Update DT bindings for Fuel-Gauge support
2015-06-26 8:47 ` Adam Thomson
(?)
@ 2015-07-03 15:19 ` Lee Jones
2015-07-06 14:23 ` Opensource [Adam Thomson]
-1 siblings, 1 reply; 20+ messages in thread
From: Lee Jones @ 2015-07-03 15:19 UTC (permalink / raw)
To: Adam Thomson
Cc: Samuel Ortiz, Sebastian Reichel, Dmitry Eremin-Solenikov,
David Woodhouse, Rob Herring, Pawel Moll, Mark Rutland,
Ian Campbell, Kumar Gala, linux-pm, devicetree, linux-kernel,
Support Opensource
On Fri, 26 Jun 2015, Adam Thomson wrote:
> Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
> ---
> Documentation/devicetree/bindings/mfd/da9150.txt | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/mfd/da9150.txt b/Documentation/devicetree/bindings/mfd/da9150.txt
> index d0588ea..8bf1a20 100644
> --- a/Documentation/devicetree/bindings/mfd/da9150.txt
> +++ b/Documentation/devicetree/bindings/mfd/da9150.txt
> @@ -6,6 +6,7 @@ Device Description
> ------ -----------
> da9150-gpadc : General Purpose ADC
> da9150-charger : Battery Charger
> +da9150-fg : Battery Fuel-Gauge
>
> ======
>
> @@ -22,6 +23,7 @@ Required properties:
> Sub-devices:
> - da9150-gpadc: See Documentation/devicetree/bindings/iio/adc/da9150-gpadc.txt
> - da9150-charger: See Documentation/devicetree/bindings/power/da9150-charger.txt
> +- da9150-fg: See Documentation/devicetree/bindings/power/da9150-fg.txt
Can you send a subsequent patch doing:
s-Documentation/devicetree/bindings/-../-
>
>
Superfluous '\n' here.
> Example:
> @@ -40,4 +42,8 @@ Example:
> da9150-charger {
> ...
> };
> +
> + da9150-fg {
> + ...
> + };
Perhaps a little content wouldn't go amiss here for quick reference.
Saves dipping in and out of the other binding files.
This patch is fine though:
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* RE: [PATCH v2 2/4] mfd: da9150: Update DT bindings for Fuel-Gauge support
2015-07-03 15:19 ` Lee Jones
@ 2015-07-06 14:23 ` Opensource [Adam Thomson]
0 siblings, 0 replies; 20+ messages in thread
From: Opensource [Adam Thomson] @ 2015-07-06 14:23 UTC (permalink / raw)
To: Lee Jones, Opensource [Adam Thomson]
Cc: Samuel Ortiz, Sebastian Reichel, Dmitry Eremin-Solenikov,
David Woodhouse, Rob Herring, Pawel Moll, Mark Rutland,
Ian Campbell, Kumar Gala, linux-pm@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
Support Opensource
On July 3, 2015 16:19, Lee Jones wrote:
> > @@ -22,6 +23,7 @@ Required properties:
> > Sub-devices:
> > - da9150-gpadc: See Documentation/devicetree/bindings/iio/adc/da9150-
> gpadc.txt
> > - da9150-charger: See Documentation/devicetree/bindings/power/da9150-
> charger.txt
> > +- da9150-fg: See Documentation/devicetree/bindings/power/da9150-fg.txt
>
> Can you send a subsequent patch doing:
>
> s-Documentation/devicetree/bindings/-../-
Yep, can do.
> >
> >
>
> Superfluous '\n' here.
Will remove.
>
> > Example:
> > @@ -40,4 +42,8 @@ Example:
> > da9150-charger {
> > ...
> > };
> > +
> > + da9150-fg {
> > + ...
> > + };
>
> Perhaps a little content wouldn't go amiss here for quick reference.
>
> Saves dipping in and out of the other binding files.
>
> This patch is fine though:
> Acked-by: Lee Jones <lee.jones@linaro.org>
>
Thanks for the ack. Will add a little info in the example.
^ permalink raw reply [flat|nested] 20+ messages in thread* RE: [PATCH v2 2/4] mfd: da9150: Update DT bindings for Fuel-Gauge support
@ 2015-07-06 14:23 ` Opensource [Adam Thomson]
0 siblings, 0 replies; 20+ messages in thread
From: Opensource [Adam Thomson] @ 2015-07-06 14:23 UTC (permalink / raw)
To: Lee Jones, Opensource [Adam Thomson]
Cc: Samuel Ortiz, Sebastian Reichel, Dmitry Eremin-Solenikov,
David Woodhouse, Rob Herring, Pawel Moll, Mark Rutland,
Ian Campbell, Kumar Gala, linux-pm@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
Support Opensource
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 1086 bytes --]
On July 3, 2015 16:19, Lee Jones wrote:
> > @@ -22,6 +23,7 @@ Required properties:
> > Sub-devices:
> > - da9150-gpadc: See Documentation/devicetree/bindings/iio/adc/da9150-
> gpadc.txt
> > - da9150-charger: See Documentation/devicetree/bindings/power/da9150-
> charger.txt
> > +- da9150-fg: See Documentation/devicetree/bindings/power/da9150-fg.txt
>
> Can you send a subsequent patch doing:
>
> s-Documentation/devicetree/bindings/-../-
Yep, can do.
> >
> >
>
> Superfluous '\n' here.
Will remove.
>
> > Example:
> > @@ -40,4 +42,8 @@ Example:
> > da9150-charger {
> > ...
> > };
> > +
> > + da9150-fg {
> > + ...
> > + };
>
> Perhaps a little content wouldn't go amiss here for quick reference.
>
> Saves dipping in and out of the other binding files.
>
> This patch is fine though:
> Acked-by: Lee Jones <lee.jones@linaro.org>
>
Thanks for the ack. Will add a little info in the example.
ÿôèº{.nÇ+‰·Ÿ®‰†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a¢f£¢·hšïêÿ‘êçz_è®\x03(階ŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨èÚ&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v2 3/4] power: Add support for DA9150 Fuel-Gauge
2015-06-26 8:47 ` Adam Thomson
@ 2015-06-26 8:47 ` Adam Thomson
-1 siblings, 0 replies; 20+ messages in thread
From: Adam Thomson @ 2015-06-26 8:47 UTC (permalink / raw)
To: Lee Jones, Samuel Ortiz, Sebastian Reichel,
Dmitry Eremin-Solenikov, David Woodhouse, Rob Herring, Pawel Moll,
Mark Rutland, Ian Campbell, Kumar Gala
Cc: linux-pm, devicetree, linux-kernel, Support Opensource
Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
---
drivers/power/Kconfig | 10 +
drivers/power/Makefile | 1 +
drivers/power/da9150-fg.c | 589 ++++++++++++++++++++++++++++++++++++++++++
include/linux/mfd/da9150/fg.h | 10 +
4 files changed, 610 insertions(+)
create mode 100644 drivers/power/da9150-fg.c
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 4091fb0..8054f1a 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -204,6 +204,16 @@ config CHARGER_DA9150
This driver can also be built as a module. If so, the module will be
called da9150-charger.
+config FG_DA9150
+ tristate "Dialog Semiconductor DA9150 Fuel Gauge support"
+ depends on CHARGER_DA9150
+ help
+ Say Y here to enable support for the Fuel-Gauge 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-fg.
+
config AXP288_FUEL_GAUGE
tristate "X-Powers AXP288 Fuel Gauge"
depends on MFD_AXP20X && IIO
diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index b7b0181..b421b54 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -33,6 +33,7 @@ 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_FG_DA9150) += da9150-fg.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-fg.c b/drivers/power/da9150-fg.c
new file mode 100644
index 0000000..8dee156
--- /dev/null
+++ b/drivers/power/da9150-fg.c
@@ -0,0 +1,589 @@
+/*
+ * DA9150 Fuel-Gauge Driver
+ *
+ * Copyright (c) 2015 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/of.h>
+#include <linux/of_platform.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+#include <linux/power_supply.h>
+#include <linux/list.h>
+#include <asm/div64.h>
+#include <linux/mfd/da9150/core.h>
+#include <linux/mfd/da9150/registers.h>
+#include <linux/mfd/da9150/fg.h>
+
+/* Core2Wire */
+#define DA9150_QIF_READ (0x0 << 7)
+#define DA9150_QIF_WRITE (0x1 << 7)
+#define DA9150_QIF_CODE_MASK 0x7F
+
+#define DA9150_QIF_BYTE_SIZE 8
+#define DA9150_QIF_BYTE_MASK 0xFF
+#define DA9150_QIF_SHORT_SIZE 2
+#define DA9150_QIF_LONG_SIZE 4
+
+/* QIF Codes */
+#define DA9150_QIF_UAVG 6
+#define DA9150_QIF_UAVG_SIZE DA9150_QIF_LONG_SIZE
+#define DA9150_QIF_IAVG 8
+#define DA9150_QIF_IAVG_SIZE DA9150_QIF_LONG_SIZE
+#define DA9150_QIF_NTCAVG 12
+#define DA9150_QIF_NTCAVG_SIZE DA9150_QIF_LONG_SIZE
+#define DA9150_QIF_SHUNT_VAL 36
+#define DA9150_QIF_SHUNT_VAL_SIZE DA9150_QIF_SHORT_SIZE
+#define DA9150_QIF_SD_GAIN 38
+#define DA9150_QIF_SD_GAIN_SIZE DA9150_QIF_LONG_SIZE
+#define DA9150_QIF_FCC_MAH 40
+#define DA9150_QIF_FCC_MAH_SIZE DA9150_QIF_SHORT_SIZE
+#define DA9150_QIF_SOC_PCT 43
+#define DA9150_QIF_SOC_PCT_SIZE DA9150_QIF_SHORT_SIZE
+#define DA9150_QIF_CHARGE_LIMIT 44
+#define DA9150_QIF_CHARGE_LIMIT_SIZE DA9150_QIF_SHORT_SIZE
+#define DA9150_QIF_DISCHARGE_LIMIT 45
+#define DA9150_QIF_DISCHARGE_LIMIT_SIZE DA9150_QIF_SHORT_SIZE
+#define DA9150_QIF_FW_MAIN_VER 118
+#define DA9150_QIF_FW_MAIN_VER_SIZE DA9150_QIF_SHORT_SIZE
+#define DA9150_QIF_E_FG_STATUS 126
+#define DA9150_QIF_E_FG_STATUS_SIZE DA9150_QIF_SHORT_SIZE
+#define DA9150_QIF_SYNC 127
+#define DA9150_QIF_SYNC_SIZE DA9150_QIF_SHORT_SIZE
+#define DA9150_QIF_MAX_CODES 128
+
+/* QIF Sync Timeout */
+#define DA9150_QIF_SYNC_TIMEOUT 1000
+#define DA9150_QIF_SYNC_RETRIES 10
+
+/* QIF E_FG_STATUS */
+#define DA9150_FG_IRQ_LOW_SOC_MASK (1 << 0)
+#define DA9150_FG_IRQ_HIGH_SOC_MASK (1 << 1)
+
+/* Private data */
+struct da9150_fg {
+ struct da9150 *da9150;
+ struct device *dev;
+
+ struct mutex io_lock;
+
+ struct power_supply *battery;
+ struct delayed_work work;
+ u32 interval;
+
+ da9150_read_temp_t read_bat_temp;
+ void *bat_temp_context;
+
+ int warn_soc;
+ int crit_soc;
+ int soc;
+};
+
+/* Battery Properties */
+static u32 da9150_fg_read_attr(struct da9150_fg *fg, u8 code, u8 size)
+
+{
+ u8 buf[size];
+ u8 read_addr;
+ u32 res = 0;
+ int i;
+
+ /* Set QIF code (READ mode) */
+ read_addr = (code & DA9150_QIF_CODE_MASK) | DA9150_QIF_READ;
+
+ da9150_read_qif(fg->da9150, read_addr, size, buf);
+ for (i = 0; i < size; ++i)
+ res |= (buf[i] << (i * DA9150_QIF_BYTE_SIZE));
+
+ return res;
+}
+
+static void da9150_fg_write_attr(struct da9150_fg *fg, u8 code, u8 size,
+ u32 val)
+
+{
+ u8 buf[size];
+ u8 write_addr;
+ int i;
+
+ /* Set QIF code (WRITE mode) */
+ write_addr = (code & DA9150_QIF_CODE_MASK) | DA9150_QIF_WRITE;
+
+ for (i = 0; i < size; ++i) {
+ buf[i] = (val >> (i * DA9150_QIF_BYTE_SIZE)) &
+ DA9150_QIF_BYTE_MASK;
+ }
+ da9150_write_qif(fg->da9150, write_addr, size, buf);
+}
+
+/* Trigger QIF Sync to update QIF readable data */
+static void da9150_fg_read_sync_start(struct da9150_fg *fg)
+{
+ int i = 0;
+ u32 res = 0;
+
+ mutex_lock(&fg->io_lock);
+
+ /* Check if QIF sync already requested, and write to sync if not */
+ res = da9150_fg_read_attr(fg, DA9150_QIF_SYNC,
+ DA9150_QIF_SYNC_SIZE);
+ if (res > 0)
+ da9150_fg_write_attr(fg, DA9150_QIF_SYNC,
+ DA9150_QIF_SYNC_SIZE, 0);
+
+ /* Wait for sync to complete */
+ res = 0;
+ while ((res == 0) && (i++ < DA9150_QIF_SYNC_RETRIES)) {
+ usleep_range(DA9150_QIF_SYNC_TIMEOUT,
+ DA9150_QIF_SYNC_TIMEOUT * 2);
+ res = da9150_fg_read_attr(fg, DA9150_QIF_SYNC,
+ DA9150_QIF_SYNC_SIZE);
+ }
+
+ /* Check if sync completed */
+ if (res == 0)
+ dev_err(fg->dev, "Failed to perform QIF read sync!\n");
+}
+
+/*
+ * Should always be called after QIF sync read has been performed, and all
+ * attributes required have been accessed.
+ */
+static inline void da9150_fg_read_sync_end(struct da9150_fg *fg)
+{
+ mutex_unlock(&fg->io_lock);
+}
+
+/* Wait for QIF Sync, write QIF data and wait for ack */
+static void da9150_fg_write_attr_sync(struct da9150_fg *fg, u8 code, u8 size,
+ u32 val)
+{
+ int i = 0;
+ u32 res = 0, sync_val;
+
+ mutex_lock(&fg->io_lock);
+
+ /* Check if QIF sync already requested */
+ res = da9150_fg_read_attr(fg, DA9150_QIF_SYNC,
+ DA9150_QIF_SYNC_SIZE);
+
+ /* Wait for an existing sync to complete */
+ while ((res == 0) && (i++ < DA9150_QIF_SYNC_RETRIES)) {
+ usleep_range(DA9150_QIF_SYNC_TIMEOUT,
+ DA9150_QIF_SYNC_TIMEOUT * 2);
+ res = da9150_fg_read_attr(fg, DA9150_QIF_SYNC,
+ DA9150_QIF_SYNC_SIZE);
+ }
+
+ if (res == 0) {
+ dev_err(fg->dev, "Timeout waiting for existing QIF sync!\n");
+ mutex_unlock(&fg->io_lock);
+ return;
+ }
+
+ /* Write value for QIF code */
+ da9150_fg_write_attr(fg, code, size, val);
+
+ /* Wait for write acknowledgment */
+ i = 0;
+ sync_val = res;
+ while ((res == sync_val) && (i++ < DA9150_QIF_SYNC_RETRIES)) {
+ usleep_range(DA9150_QIF_SYNC_TIMEOUT,
+ DA9150_QIF_SYNC_TIMEOUT * 2);
+ res = da9150_fg_read_attr(fg, DA9150_QIF_SYNC,
+ DA9150_QIF_SYNC_SIZE);
+ }
+
+ mutex_unlock(&fg->io_lock);
+
+ /* Check write was actually successful */
+ if (res != (sync_val + 1))
+ dev_err(fg->dev, "Error performing QIF sync write for code %d\n",
+ code);
+}
+
+/* Power Supply attributes */
+static int da9150_fg_capacity(struct da9150_fg *fg,
+ union power_supply_propval *val)
+{
+ da9150_fg_read_sync_start(fg);
+ val->intval = da9150_fg_read_attr(fg, DA9150_QIF_SOC_PCT,
+ DA9150_QIF_SOC_PCT_SIZE);
+ da9150_fg_read_sync_end(fg);
+
+ if (val->intval > 100)
+ val->intval = 100;
+
+ return 0;
+}
+
+static int da9150_fg_current_avg(struct da9150_fg *fg,
+ union power_supply_propval *val)
+{
+ u32 iavg, sd_gain, shunt_val;
+ u64 div, res;
+
+ da9150_fg_read_sync_start(fg);
+ iavg = da9150_fg_read_attr(fg, DA9150_QIF_IAVG,
+ DA9150_QIF_IAVG_SIZE);
+ shunt_val = da9150_fg_read_attr(fg, DA9150_QIF_SHUNT_VAL,
+ DA9150_QIF_SHUNT_VAL_SIZE);
+ sd_gain = da9150_fg_read_attr(fg, DA9150_QIF_SD_GAIN,
+ DA9150_QIF_SD_GAIN_SIZE);
+ da9150_fg_read_sync_end(fg);
+
+ div = (u64) (sd_gain * shunt_val * 65536ULL);
+ do_div(div, 1000000);
+ res = (u64) (iavg * 1000000ULL);
+ do_div(res, div);
+
+ val->intval = (int) res;
+
+ return 0;
+}
+
+static int da9150_fg_voltage_avg(struct da9150_fg *fg,
+ union power_supply_propval *val)
+{
+ u64 res;
+
+ da9150_fg_read_sync_start(fg);
+ val->intval = da9150_fg_read_attr(fg, DA9150_QIF_UAVG,
+ DA9150_QIF_UAVG_SIZE);
+ da9150_fg_read_sync_end(fg);
+
+ res = (u64) (val->intval * 186ULL);
+ do_div(res, 10000);
+ val->intval = (int) res;
+
+ return 0;
+}
+
+static int da9150_fg_charge_full(struct da9150_fg *fg,
+ union power_supply_propval *val)
+{
+ da9150_fg_read_sync_start(fg);
+ val->intval = da9150_fg_read_attr(fg, DA9150_QIF_FCC_MAH,
+ DA9150_QIF_FCC_MAH_SIZE);
+ da9150_fg_read_sync_end(fg);
+
+ val->intval = val->intval * 1000;
+
+ return 0;
+}
+
+static int da9150_fg_temp(struct da9150_fg *fg,
+ union power_supply_propval *val)
+{
+ if (!fg->read_bat_temp) {
+ da9150_fg_read_sync_start(fg);
+ val->intval = da9150_fg_read_attr(fg, DA9150_QIF_NTCAVG,
+ DA9150_QIF_NTCAVG_SIZE);
+ da9150_fg_read_sync_end(fg);
+
+ val->intval = (val->intval * 10) / 1048576;
+ } else {
+ val->intval = fg->read_bat_temp(fg->bat_temp_context);
+ }
+
+ return 0;
+}
+
+static enum power_supply_property da9150_fg_props[] = {
+ POWER_SUPPLY_PROP_CAPACITY,
+ POWER_SUPPLY_PROP_CURRENT_AVG,
+ POWER_SUPPLY_PROP_VOLTAGE_AVG,
+ POWER_SUPPLY_PROP_CHARGE_FULL,
+ POWER_SUPPLY_PROP_TEMP,
+};
+
+static int da9150_fg_get_prop(struct power_supply *psy,
+ enum power_supply_property psp,
+ union power_supply_propval *val)
+{
+ struct da9150_fg *fg = dev_get_drvdata(psy->dev.parent);
+ int ret;
+
+ switch (psp) {
+ case POWER_SUPPLY_PROP_CAPACITY:
+ ret = da9150_fg_capacity(fg, val);
+ break;
+ case POWER_SUPPLY_PROP_CURRENT_AVG:
+ ret = da9150_fg_current_avg(fg, val);
+ break;
+ case POWER_SUPPLY_PROP_VOLTAGE_AVG:
+ ret = da9150_fg_voltage_avg(fg, val);
+ break;
+ case POWER_SUPPLY_PROP_CHARGE_FULL:
+ ret = da9150_fg_charge_full(fg, val);
+ break;
+ case POWER_SUPPLY_PROP_TEMP:
+ ret = da9150_fg_temp(fg, val);
+ break;
+ default:
+ ret = -EINVAL;
+ break;
+ }
+
+ return ret;
+}
+
+/* Repeated SOC check */
+static bool da9150_fg_soc_changed(struct da9150_fg *fg)
+{
+ union power_supply_propval val;
+
+ da9150_fg_capacity(fg, &val);
+ if (val.intval != fg->soc) {
+ fg->soc = val.intval;
+ return true;
+ }
+
+ return false;
+}
+
+static void da9150_fg_work(struct work_struct *work)
+{
+ struct da9150_fg *fg = container_of(work, struct da9150_fg, work.work);
+
+ /* Report if SOC has changed */
+ if (da9150_fg_soc_changed(fg))
+ power_supply_changed(fg->battery);
+
+ schedule_delayed_work(&fg->work, msecs_to_jiffies(fg->interval));
+}
+
+/* Register external function to give battery temperature */
+void da9150_fg_register_temp_cb(struct power_supply *psy, da9150_read_temp_t cb,
+ void *cb_context)
+{
+ struct da9150_fg *fg = dev_get_drvdata(psy->dev.parent);
+
+ fg->read_bat_temp = cb;
+ fg->bat_temp_context = cb_context;
+}
+EXPORT_SYMBOL_GPL(da9150_fg_register_temp_cb);
+
+/* SOC level event configuration */
+static void da9150_fg_soc_event_config(struct da9150_fg *fg)
+{
+ int soc;
+
+ da9150_fg_read_sync_start(fg);
+ soc = da9150_fg_read_attr(fg, DA9150_QIF_SOC_PCT,
+ DA9150_QIF_SOC_PCT_SIZE);
+ da9150_fg_read_sync_end(fg);
+
+ if (soc > fg->warn_soc) {
+ /* If SOC > warn level, set discharge warn level event */
+ da9150_fg_write_attr_sync(fg, DA9150_QIF_DISCHARGE_LIMIT,
+ DA9150_QIF_DISCHARGE_LIMIT_SIZE,
+ fg->warn_soc + 1);
+ } else if ((soc <= fg->warn_soc) && (soc > fg->crit_soc)) {
+ /*
+ * If SOC <= warn level, set discharge crit level event,
+ * and set charge warn level event.
+ */
+ da9150_fg_write_attr_sync(fg, DA9150_QIF_DISCHARGE_LIMIT,
+ DA9150_QIF_DISCHARGE_LIMIT_SIZE,
+ fg->crit_soc + 1);
+
+ da9150_fg_write_attr_sync(fg, DA9150_QIF_CHARGE_LIMIT,
+ DA9150_QIF_CHARGE_LIMIT_SIZE,
+ fg->warn_soc);
+ } else if (soc <= fg->crit_soc) {
+ /* If SOC <= crit level, set charge crit level event */
+ da9150_fg_write_attr_sync(fg, DA9150_QIF_CHARGE_LIMIT,
+ DA9150_QIF_CHARGE_LIMIT_SIZE,
+ fg->crit_soc);
+ }
+}
+
+static irqreturn_t da9150_fg_irq(int irq, void *data)
+{
+ struct da9150_fg *fg = data;
+ u32 e_fg_status;
+
+ /* Read FG IRQ status info */
+ e_fg_status = da9150_fg_read_attr(fg, DA9150_QIF_E_FG_STATUS,
+ DA9150_QIF_E_FG_STATUS_SIZE);
+
+ /* Handle warning/critical threhold events */
+ if ((DA9150_FG_IRQ_LOW_SOC_MASK | DA9150_FG_IRQ_HIGH_SOC_MASK) &
+ e_fg_status)
+ da9150_fg_soc_event_config(fg);
+
+ /* Clear any FG IRQs */
+ da9150_fg_write_attr(fg, DA9150_QIF_E_FG_STATUS,
+ DA9150_QIF_E_FG_STATUS_SIZE, e_fg_status);
+
+ return IRQ_HANDLED;
+}
+
+static struct da9150_fg_pdata *da9150_fg_dt_pdata(struct device *dev)
+{
+ struct device_node *fg_node = dev->of_node;
+ struct da9150_fg_pdata *pdata;
+
+ pdata = devm_kzalloc(dev, sizeof(struct da9150_fg_pdata), GFP_KERNEL);
+ if (!pdata)
+ return NULL;
+
+ of_property_read_u32(fg_node, "dlg,update-interval",
+ &pdata->update_interval);
+ of_property_read_u8(fg_node, "dlg,warn-soc-level",
+ &pdata->warn_soc_lvl);
+ of_property_read_u8(fg_node, "dlg,crit-soc-level",
+ &pdata->crit_soc_lvl);
+
+ return pdata;
+}
+
+static const struct power_supply_desc fg_desc = {
+ .name = "da9150-fg",
+ .type = POWER_SUPPLY_TYPE_BATTERY,
+ .properties = da9150_fg_props,
+ .num_properties = ARRAY_SIZE(da9150_fg_props),
+ .get_property = da9150_fg_get_prop,
+};
+
+static int da9150_fg_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct da9150 *da9150 = dev_get_drvdata(dev->parent);
+ struct da9150_fg_pdata *fg_pdata = dev_get_platdata(dev);
+ struct da9150_fg *fg;
+ int ver, irq, ret;
+
+ fg = devm_kzalloc(dev, sizeof(*fg), GFP_KERNEL);
+ if (fg == NULL)
+ return -ENOMEM;
+
+ platform_set_drvdata(pdev, fg);
+ fg->da9150 = da9150;
+ fg->dev = dev;
+
+ mutex_init(&fg->io_lock);
+
+ /* Enable QIF */
+ da9150_set_bits(da9150, DA9150_CORE2WIRE_CTRL_A, DA9150_FG_QIF_EN_MASK,
+ DA9150_FG_QIF_EN_MASK);
+
+ fg->battery = power_supply_register(dev, &fg_desc, NULL);
+ if (IS_ERR(fg->battery)) {
+ ret = PTR_ERR(fg->battery);
+ return ret;
+ }
+
+ ver = da9150_fg_read_attr(fg, DA9150_QIF_FW_MAIN_VER,
+ DA9150_QIF_FW_MAIN_VER_SIZE);
+ dev_info(dev, "Version: 0x%x\n", ver);
+
+ /* Handle DT data if provided */
+ if (dev->of_node) {
+ fg_pdata = da9150_fg_dt_pdata(dev);
+ dev->platform_data = fg_pdata;
+ }
+
+ /* Handle any pdata provided */
+ if (fg_pdata) {
+ fg->interval = fg_pdata->update_interval;
+
+ if (fg_pdata->warn_soc_lvl > 100)
+ dev_warn(dev, "Invalid SOC warning level provided, Ignoring");
+ else
+ fg->warn_soc = fg_pdata->warn_soc_lvl;
+
+ if ((fg_pdata->crit_soc_lvl > 100) ||
+ (fg_pdata->crit_soc_lvl >= fg_pdata->warn_soc_lvl))
+ dev_warn(dev, "Invalid SOC critical level provided, Ignoring");
+ else
+ fg->crit_soc = fg_pdata->crit_soc_lvl;
+
+
+ }
+
+ /* Configure initial SOC level events */
+ da9150_fg_soc_event_config(fg);
+
+ /*
+ * If an interval period has been provided then setup repeating
+ * work for reporting data updates.
+ */
+ if (fg->interval) {
+ INIT_DELAYED_WORK(&fg->work, da9150_fg_work);
+ schedule_delayed_work(&fg->work,
+ msecs_to_jiffies(fg->interval));
+ }
+
+ /* Register IRQ */
+ irq = platform_get_irq_byname(pdev, "FG");
+ ret = request_threaded_irq(irq, NULL, da9150_fg_irq, IRQF_ONESHOT, "FG",
+ fg);
+ if (ret)
+ goto irq_fail;
+
+ return ret;
+
+irq_fail:
+ cancel_delayed_work(&fg->work);
+ power_supply_unregister(fg->battery);
+
+ return ret;
+}
+
+static int da9150_fg_remove(struct platform_device *pdev)
+{
+ struct da9150_fg *fg = platform_get_drvdata(pdev);
+ int irq;
+
+ irq = platform_get_irq_byname(pdev, "FG");
+ free_irq(irq, fg);
+
+ if (fg->interval)
+ cancel_delayed_work(&fg->work);
+
+ power_supply_unregister(fg->battery);
+
+ return 0;
+}
+
+static int da9150_fg_resume(struct platform_device *pdev)
+{
+ struct da9150_fg *fg = platform_get_drvdata(pdev);
+
+ /*
+ * Trigger SOC check to happen now so as to indicate any value change
+ * since last check before suspend.
+ */
+ if (fg->interval)
+ flush_delayed_work(&fg->work);
+
+ return 0;
+}
+
+static struct platform_driver da9150_fg_driver = {
+ .driver = {
+ .name = "da9150-fuelgauge",
+ },
+ .probe = da9150_fg_probe,
+ .remove = da9150_fg_remove,
+ .resume = da9150_fg_resume,
+};
+
+module_platform_driver(da9150_fg_driver);
+
+MODULE_DESCRIPTION("Fuel-Gauge Driver for DA9150");
+MODULE_AUTHOR("Adam Thomson <Adam.Thomson.Opensource@diasemi.com>");
+MODULE_LICENSE("GPL");
diff --git a/include/linux/mfd/da9150/fg.h b/include/linux/mfd/da9150/fg.h
index 0ff52ab..2cff203 100644
--- a/include/linux/mfd/da9150/fg.h
+++ b/include/linux/mfd/da9150/fg.h
@@ -26,4 +26,14 @@ struct da9150_fg_pdata {
u8 crit_soc_lvl; /* % value */
};
+/*
+ * Function template to provide battery temperature. Should provide
+ * 0.1 degrees C resolution return values.
+ */
+typedef int (*da9150_read_temp_t)(void *context);
+
+/* Register temp callback function */
+void da9150_fg_register_temp_cb(struct power_supply *psy, da9150_read_temp_t cb,
+ void *cb_context);
+
#endif /* __DA9150_FG_H */
--
1.9.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v2 3/4] power: Add support for DA9150 Fuel-Gauge
@ 2015-06-26 8:47 ` Adam Thomson
0 siblings, 0 replies; 20+ messages in thread
From: Adam Thomson @ 2015-06-26 8:47 UTC (permalink / raw)
To: Lee Jones, Samuel Ortiz, Sebastian Reichel,
Dmitry Eremin-Solenikov, David Woodhouse, Rob Herring, Pawel Moll,
Mark Rutland, Ian Campbell, Kumar Gala
Cc: linux-pm, devicetree, linux-kernel, Support Opensource
Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
---
drivers/power/Kconfig | 10 +
drivers/power/Makefile | 1 +
drivers/power/da9150-fg.c | 589 ++++++++++++++++++++++++++++++++++++++++++
include/linux/mfd/da9150/fg.h | 10 +
4 files changed, 610 insertions(+)
create mode 100644 drivers/power/da9150-fg.c
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 4091fb0..8054f1a 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -204,6 +204,16 @@ config CHARGER_DA9150
This driver can also be built as a module. If so, the module will be
called da9150-charger.
+config FG_DA9150
+ tristate "Dialog Semiconductor DA9150 Fuel Gauge support"
+ depends on CHARGER_DA9150
+ help
+ Say Y here to enable support for the Fuel-Gauge 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-fg.
+
config AXP288_FUEL_GAUGE
tristate "X-Powers AXP288 Fuel Gauge"
depends on MFD_AXP20X && IIO
diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index b7b0181..b421b54 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -33,6 +33,7 @@ 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_FG_DA9150) += da9150-fg.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-fg.c b/drivers/power/da9150-fg.c
new file mode 100644
index 0000000..8dee156
--- /dev/null
+++ b/drivers/power/da9150-fg.c
@@ -0,0 +1,589 @@
+/*
+ * DA9150 Fuel-Gauge Driver
+ *
+ * Copyright (c) 2015 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/of.h>
+#include <linux/of_platform.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+#include <linux/power_supply.h>
+#include <linux/list.h>
+#include <asm/div64.h>
+#include <linux/mfd/da9150/core.h>
+#include <linux/mfd/da9150/registers.h>
+#include <linux/mfd/da9150/fg.h>
+
+/* Core2Wire */
+#define DA9150_QIF_READ (0x0 << 7)
+#define DA9150_QIF_WRITE (0x1 << 7)
+#define DA9150_QIF_CODE_MASK 0x7F
+
+#define DA9150_QIF_BYTE_SIZE 8
+#define DA9150_QIF_BYTE_MASK 0xFF
+#define DA9150_QIF_SHORT_SIZE 2
+#define DA9150_QIF_LONG_SIZE 4
+
+/* QIF Codes */
+#define DA9150_QIF_UAVG 6
+#define DA9150_QIF_UAVG_SIZE DA9150_QIF_LONG_SIZE
+#define DA9150_QIF_IAVG 8
+#define DA9150_QIF_IAVG_SIZE DA9150_QIF_LONG_SIZE
+#define DA9150_QIF_NTCAVG 12
+#define DA9150_QIF_NTCAVG_SIZE DA9150_QIF_LONG_SIZE
+#define DA9150_QIF_SHUNT_VAL 36
+#define DA9150_QIF_SHUNT_VAL_SIZE DA9150_QIF_SHORT_SIZE
+#define DA9150_QIF_SD_GAIN 38
+#define DA9150_QIF_SD_GAIN_SIZE DA9150_QIF_LONG_SIZE
+#define DA9150_QIF_FCC_MAH 40
+#define DA9150_QIF_FCC_MAH_SIZE DA9150_QIF_SHORT_SIZE
+#define DA9150_QIF_SOC_PCT 43
+#define DA9150_QIF_SOC_PCT_SIZE DA9150_QIF_SHORT_SIZE
+#define DA9150_QIF_CHARGE_LIMIT 44
+#define DA9150_QIF_CHARGE_LIMIT_SIZE DA9150_QIF_SHORT_SIZE
+#define DA9150_QIF_DISCHARGE_LIMIT 45
+#define DA9150_QIF_DISCHARGE_LIMIT_SIZE DA9150_QIF_SHORT_SIZE
+#define DA9150_QIF_FW_MAIN_VER 118
+#define DA9150_QIF_FW_MAIN_VER_SIZE DA9150_QIF_SHORT_SIZE
+#define DA9150_QIF_E_FG_STATUS 126
+#define DA9150_QIF_E_FG_STATUS_SIZE DA9150_QIF_SHORT_SIZE
+#define DA9150_QIF_SYNC 127
+#define DA9150_QIF_SYNC_SIZE DA9150_QIF_SHORT_SIZE
+#define DA9150_QIF_MAX_CODES 128
+
+/* QIF Sync Timeout */
+#define DA9150_QIF_SYNC_TIMEOUT 1000
+#define DA9150_QIF_SYNC_RETRIES 10
+
+/* QIF E_FG_STATUS */
+#define DA9150_FG_IRQ_LOW_SOC_MASK (1 << 0)
+#define DA9150_FG_IRQ_HIGH_SOC_MASK (1 << 1)
+
+/* Private data */
+struct da9150_fg {
+ struct da9150 *da9150;
+ struct device *dev;
+
+ struct mutex io_lock;
+
+ struct power_supply *battery;
+ struct delayed_work work;
+ u32 interval;
+
+ da9150_read_temp_t read_bat_temp;
+ void *bat_temp_context;
+
+ int warn_soc;
+ int crit_soc;
+ int soc;
+};
+
+/* Battery Properties */
+static u32 da9150_fg_read_attr(struct da9150_fg *fg, u8 code, u8 size)
+
+{
+ u8 buf[size];
+ u8 read_addr;
+ u32 res = 0;
+ int i;
+
+ /* Set QIF code (READ mode) */
+ read_addr = (code & DA9150_QIF_CODE_MASK) | DA9150_QIF_READ;
+
+ da9150_read_qif(fg->da9150, read_addr, size, buf);
+ for (i = 0; i < size; ++i)
+ res |= (buf[i] << (i * DA9150_QIF_BYTE_SIZE));
+
+ return res;
+}
+
+static void da9150_fg_write_attr(struct da9150_fg *fg, u8 code, u8 size,
+ u32 val)
+
+{
+ u8 buf[size];
+ u8 write_addr;
+ int i;
+
+ /* Set QIF code (WRITE mode) */
+ write_addr = (code & DA9150_QIF_CODE_MASK) | DA9150_QIF_WRITE;
+
+ for (i = 0; i < size; ++i) {
+ buf[i] = (val >> (i * DA9150_QIF_BYTE_SIZE)) &
+ DA9150_QIF_BYTE_MASK;
+ }
+ da9150_write_qif(fg->da9150, write_addr, size, buf);
+}
+
+/* Trigger QIF Sync to update QIF readable data */
+static void da9150_fg_read_sync_start(struct da9150_fg *fg)
+{
+ int i = 0;
+ u32 res = 0;
+
+ mutex_lock(&fg->io_lock);
+
+ /* Check if QIF sync already requested, and write to sync if not */
+ res = da9150_fg_read_attr(fg, DA9150_QIF_SYNC,
+ DA9150_QIF_SYNC_SIZE);
+ if (res > 0)
+ da9150_fg_write_attr(fg, DA9150_QIF_SYNC,
+ DA9150_QIF_SYNC_SIZE, 0);
+
+ /* Wait for sync to complete */
+ res = 0;
+ while ((res == 0) && (i++ < DA9150_QIF_SYNC_RETRIES)) {
+ usleep_range(DA9150_QIF_SYNC_TIMEOUT,
+ DA9150_QIF_SYNC_TIMEOUT * 2);
+ res = da9150_fg_read_attr(fg, DA9150_QIF_SYNC,
+ DA9150_QIF_SYNC_SIZE);
+ }
+
+ /* Check if sync completed */
+ if (res == 0)
+ dev_err(fg->dev, "Failed to perform QIF read sync!\n");
+}
+
+/*
+ * Should always be called after QIF sync read has been performed, and all
+ * attributes required have been accessed.
+ */
+static inline void da9150_fg_read_sync_end(struct da9150_fg *fg)
+{
+ mutex_unlock(&fg->io_lock);
+}
+
+/* Wait for QIF Sync, write QIF data and wait for ack */
+static void da9150_fg_write_attr_sync(struct da9150_fg *fg, u8 code, u8 size,
+ u32 val)
+{
+ int i = 0;
+ u32 res = 0, sync_val;
+
+ mutex_lock(&fg->io_lock);
+
+ /* Check if QIF sync already requested */
+ res = da9150_fg_read_attr(fg, DA9150_QIF_SYNC,
+ DA9150_QIF_SYNC_SIZE);
+
+ /* Wait for an existing sync to complete */
+ while ((res == 0) && (i++ < DA9150_QIF_SYNC_RETRIES)) {
+ usleep_range(DA9150_QIF_SYNC_TIMEOUT,
+ DA9150_QIF_SYNC_TIMEOUT * 2);
+ res = da9150_fg_read_attr(fg, DA9150_QIF_SYNC,
+ DA9150_QIF_SYNC_SIZE);
+ }
+
+ if (res == 0) {
+ dev_err(fg->dev, "Timeout waiting for existing QIF sync!\n");
+ mutex_unlock(&fg->io_lock);
+ return;
+ }
+
+ /* Write value for QIF code */
+ da9150_fg_write_attr(fg, code, size, val);
+
+ /* Wait for write acknowledgment */
+ i = 0;
+ sync_val = res;
+ while ((res == sync_val) && (i++ < DA9150_QIF_SYNC_RETRIES)) {
+ usleep_range(DA9150_QIF_SYNC_TIMEOUT,
+ DA9150_QIF_SYNC_TIMEOUT * 2);
+ res = da9150_fg_read_attr(fg, DA9150_QIF_SYNC,
+ DA9150_QIF_SYNC_SIZE);
+ }
+
+ mutex_unlock(&fg->io_lock);
+
+ /* Check write was actually successful */
+ if (res != (sync_val + 1))
+ dev_err(fg->dev, "Error performing QIF sync write for code %d\n",
+ code);
+}
+
+/* Power Supply attributes */
+static int da9150_fg_capacity(struct da9150_fg *fg,
+ union power_supply_propval *val)
+{
+ da9150_fg_read_sync_start(fg);
+ val->intval = da9150_fg_read_attr(fg, DA9150_QIF_SOC_PCT,
+ DA9150_QIF_SOC_PCT_SIZE);
+ da9150_fg_read_sync_end(fg);
+
+ if (val->intval > 100)
+ val->intval = 100;
+
+ return 0;
+}
+
+static int da9150_fg_current_avg(struct da9150_fg *fg,
+ union power_supply_propval *val)
+{
+ u32 iavg, sd_gain, shunt_val;
+ u64 div, res;
+
+ da9150_fg_read_sync_start(fg);
+ iavg = da9150_fg_read_attr(fg, DA9150_QIF_IAVG,
+ DA9150_QIF_IAVG_SIZE);
+ shunt_val = da9150_fg_read_attr(fg, DA9150_QIF_SHUNT_VAL,
+ DA9150_QIF_SHUNT_VAL_SIZE);
+ sd_gain = da9150_fg_read_attr(fg, DA9150_QIF_SD_GAIN,
+ DA9150_QIF_SD_GAIN_SIZE);
+ da9150_fg_read_sync_end(fg);
+
+ div = (u64) (sd_gain * shunt_val * 65536ULL);
+ do_div(div, 1000000);
+ res = (u64) (iavg * 1000000ULL);
+ do_div(res, div);
+
+ val->intval = (int) res;
+
+ return 0;
+}
+
+static int da9150_fg_voltage_avg(struct da9150_fg *fg,
+ union power_supply_propval *val)
+{
+ u64 res;
+
+ da9150_fg_read_sync_start(fg);
+ val->intval = da9150_fg_read_attr(fg, DA9150_QIF_UAVG,
+ DA9150_QIF_UAVG_SIZE);
+ da9150_fg_read_sync_end(fg);
+
+ res = (u64) (val->intval * 186ULL);
+ do_div(res, 10000);
+ val->intval = (int) res;
+
+ return 0;
+}
+
+static int da9150_fg_charge_full(struct da9150_fg *fg,
+ union power_supply_propval *val)
+{
+ da9150_fg_read_sync_start(fg);
+ val->intval = da9150_fg_read_attr(fg, DA9150_QIF_FCC_MAH,
+ DA9150_QIF_FCC_MAH_SIZE);
+ da9150_fg_read_sync_end(fg);
+
+ val->intval = val->intval * 1000;
+
+ return 0;
+}
+
+static int da9150_fg_temp(struct da9150_fg *fg,
+ union power_supply_propval *val)
+{
+ if (!fg->read_bat_temp) {
+ da9150_fg_read_sync_start(fg);
+ val->intval = da9150_fg_read_attr(fg, DA9150_QIF_NTCAVG,
+ DA9150_QIF_NTCAVG_SIZE);
+ da9150_fg_read_sync_end(fg);
+
+ val->intval = (val->intval * 10) / 1048576;
+ } else {
+ val->intval = fg->read_bat_temp(fg->bat_temp_context);
+ }
+
+ return 0;
+}
+
+static enum power_supply_property da9150_fg_props[] = {
+ POWER_SUPPLY_PROP_CAPACITY,
+ POWER_SUPPLY_PROP_CURRENT_AVG,
+ POWER_SUPPLY_PROP_VOLTAGE_AVG,
+ POWER_SUPPLY_PROP_CHARGE_FULL,
+ POWER_SUPPLY_PROP_TEMP,
+};
+
+static int da9150_fg_get_prop(struct power_supply *psy,
+ enum power_supply_property psp,
+ union power_supply_propval *val)
+{
+ struct da9150_fg *fg = dev_get_drvdata(psy->dev.parent);
+ int ret;
+
+ switch (psp) {
+ case POWER_SUPPLY_PROP_CAPACITY:
+ ret = da9150_fg_capacity(fg, val);
+ break;
+ case POWER_SUPPLY_PROP_CURRENT_AVG:
+ ret = da9150_fg_current_avg(fg, val);
+ break;
+ case POWER_SUPPLY_PROP_VOLTAGE_AVG:
+ ret = da9150_fg_voltage_avg(fg, val);
+ break;
+ case POWER_SUPPLY_PROP_CHARGE_FULL:
+ ret = da9150_fg_charge_full(fg, val);
+ break;
+ case POWER_SUPPLY_PROP_TEMP:
+ ret = da9150_fg_temp(fg, val);
+ break;
+ default:
+ ret = -EINVAL;
+ break;
+ }
+
+ return ret;
+}
+
+/* Repeated SOC check */
+static bool da9150_fg_soc_changed(struct da9150_fg *fg)
+{
+ union power_supply_propval val;
+
+ da9150_fg_capacity(fg, &val);
+ if (val.intval != fg->soc) {
+ fg->soc = val.intval;
+ return true;
+ }
+
+ return false;
+}
+
+static void da9150_fg_work(struct work_struct *work)
+{
+ struct da9150_fg *fg = container_of(work, struct da9150_fg, work.work);
+
+ /* Report if SOC has changed */
+ if (da9150_fg_soc_changed(fg))
+ power_supply_changed(fg->battery);
+
+ schedule_delayed_work(&fg->work, msecs_to_jiffies(fg->interval));
+}
+
+/* Register external function to give battery temperature */
+void da9150_fg_register_temp_cb(struct power_supply *psy, da9150_read_temp_t cb,
+ void *cb_context)
+{
+ struct da9150_fg *fg = dev_get_drvdata(psy->dev.parent);
+
+ fg->read_bat_temp = cb;
+ fg->bat_temp_context = cb_context;
+}
+EXPORT_SYMBOL_GPL(da9150_fg_register_temp_cb);
+
+/* SOC level event configuration */
+static void da9150_fg_soc_event_config(struct da9150_fg *fg)
+{
+ int soc;
+
+ da9150_fg_read_sync_start(fg);
+ soc = da9150_fg_read_attr(fg, DA9150_QIF_SOC_PCT,
+ DA9150_QIF_SOC_PCT_SIZE);
+ da9150_fg_read_sync_end(fg);
+
+ if (soc > fg->warn_soc) {
+ /* If SOC > warn level, set discharge warn level event */
+ da9150_fg_write_attr_sync(fg, DA9150_QIF_DISCHARGE_LIMIT,
+ DA9150_QIF_DISCHARGE_LIMIT_SIZE,
+ fg->warn_soc + 1);
+ } else if ((soc <= fg->warn_soc) && (soc > fg->crit_soc)) {
+ /*
+ * If SOC <= warn level, set discharge crit level event,
+ * and set charge warn level event.
+ */
+ da9150_fg_write_attr_sync(fg, DA9150_QIF_DISCHARGE_LIMIT,
+ DA9150_QIF_DISCHARGE_LIMIT_SIZE,
+ fg->crit_soc + 1);
+
+ da9150_fg_write_attr_sync(fg, DA9150_QIF_CHARGE_LIMIT,
+ DA9150_QIF_CHARGE_LIMIT_SIZE,
+ fg->warn_soc);
+ } else if (soc <= fg->crit_soc) {
+ /* If SOC <= crit level, set charge crit level event */
+ da9150_fg_write_attr_sync(fg, DA9150_QIF_CHARGE_LIMIT,
+ DA9150_QIF_CHARGE_LIMIT_SIZE,
+ fg->crit_soc);
+ }
+}
+
+static irqreturn_t da9150_fg_irq(int irq, void *data)
+{
+ struct da9150_fg *fg = data;
+ u32 e_fg_status;
+
+ /* Read FG IRQ status info */
+ e_fg_status = da9150_fg_read_attr(fg, DA9150_QIF_E_FG_STATUS,
+ DA9150_QIF_E_FG_STATUS_SIZE);
+
+ /* Handle warning/critical threhold events */
+ if ((DA9150_FG_IRQ_LOW_SOC_MASK | DA9150_FG_IRQ_HIGH_SOC_MASK) &
+ e_fg_status)
+ da9150_fg_soc_event_config(fg);
+
+ /* Clear any FG IRQs */
+ da9150_fg_write_attr(fg, DA9150_QIF_E_FG_STATUS,
+ DA9150_QIF_E_FG_STATUS_SIZE, e_fg_status);
+
+ return IRQ_HANDLED;
+}
+
+static struct da9150_fg_pdata *da9150_fg_dt_pdata(struct device *dev)
+{
+ struct device_node *fg_node = dev->of_node;
+ struct da9150_fg_pdata *pdata;
+
+ pdata = devm_kzalloc(dev, sizeof(struct da9150_fg_pdata), GFP_KERNEL);
+ if (!pdata)
+ return NULL;
+
+ of_property_read_u32(fg_node, "dlg,update-interval",
+ &pdata->update_interval);
+ of_property_read_u8(fg_node, "dlg,warn-soc-level",
+ &pdata->warn_soc_lvl);
+ of_property_read_u8(fg_node, "dlg,crit-soc-level",
+ &pdata->crit_soc_lvl);
+
+ return pdata;
+}
+
+static const struct power_supply_desc fg_desc = {
+ .name = "da9150-fg",
+ .type = POWER_SUPPLY_TYPE_BATTERY,
+ .properties = da9150_fg_props,
+ .num_properties = ARRAY_SIZE(da9150_fg_props),
+ .get_property = da9150_fg_get_prop,
+};
+
+static int da9150_fg_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct da9150 *da9150 = dev_get_drvdata(dev->parent);
+ struct da9150_fg_pdata *fg_pdata = dev_get_platdata(dev);
+ struct da9150_fg *fg;
+ int ver, irq, ret;
+
+ fg = devm_kzalloc(dev, sizeof(*fg), GFP_KERNEL);
+ if (fg == NULL)
+ return -ENOMEM;
+
+ platform_set_drvdata(pdev, fg);
+ fg->da9150 = da9150;
+ fg->dev = dev;
+
+ mutex_init(&fg->io_lock);
+
+ /* Enable QIF */
+ da9150_set_bits(da9150, DA9150_CORE2WIRE_CTRL_A, DA9150_FG_QIF_EN_MASK,
+ DA9150_FG_QIF_EN_MASK);
+
+ fg->battery = power_supply_register(dev, &fg_desc, NULL);
+ if (IS_ERR(fg->battery)) {
+ ret = PTR_ERR(fg->battery);
+ return ret;
+ }
+
+ ver = da9150_fg_read_attr(fg, DA9150_QIF_FW_MAIN_VER,
+ DA9150_QIF_FW_MAIN_VER_SIZE);
+ dev_info(dev, "Version: 0x%x\n", ver);
+
+ /* Handle DT data if provided */
+ if (dev->of_node) {
+ fg_pdata = da9150_fg_dt_pdata(dev);
+ dev->platform_data = fg_pdata;
+ }
+
+ /* Handle any pdata provided */
+ if (fg_pdata) {
+ fg->interval = fg_pdata->update_interval;
+
+ if (fg_pdata->warn_soc_lvl > 100)
+ dev_warn(dev, "Invalid SOC warning level provided, Ignoring");
+ else
+ fg->warn_soc = fg_pdata->warn_soc_lvl;
+
+ if ((fg_pdata->crit_soc_lvl > 100) ||
+ (fg_pdata->crit_soc_lvl >= fg_pdata->warn_soc_lvl))
+ dev_warn(dev, "Invalid SOC critical level provided, Ignoring");
+ else
+ fg->crit_soc = fg_pdata->crit_soc_lvl;
+
+
+ }
+
+ /* Configure initial SOC level events */
+ da9150_fg_soc_event_config(fg);
+
+ /*
+ * If an interval period has been provided then setup repeating
+ * work for reporting data updates.
+ */
+ if (fg->interval) {
+ INIT_DELAYED_WORK(&fg->work, da9150_fg_work);
+ schedule_delayed_work(&fg->work,
+ msecs_to_jiffies(fg->interval));
+ }
+
+ /* Register IRQ */
+ irq = platform_get_irq_byname(pdev, "FG");
+ ret = request_threaded_irq(irq, NULL, da9150_fg_irq, IRQF_ONESHOT, "FG",
+ fg);
+ if (ret)
+ goto irq_fail;
+
+ return ret;
+
+irq_fail:
+ cancel_delayed_work(&fg->work);
+ power_supply_unregister(fg->battery);
+
+ return ret;
+}
+
+static int da9150_fg_remove(struct platform_device *pdev)
+{
+ struct da9150_fg *fg = platform_get_drvdata(pdev);
+ int irq;
+
+ irq = platform_get_irq_byname(pdev, "FG");
+ free_irq(irq, fg);
+
+ if (fg->interval)
+ cancel_delayed_work(&fg->work);
+
+ power_supply_unregister(fg->battery);
+
+ return 0;
+}
+
+static int da9150_fg_resume(struct platform_device *pdev)
+{
+ struct da9150_fg *fg = platform_get_drvdata(pdev);
+
+ /*
+ * Trigger SOC check to happen now so as to indicate any value change
+ * since last check before suspend.
+ */
+ if (fg->interval)
+ flush_delayed_work(&fg->work);
+
+ return 0;
+}
+
+static struct platform_driver da9150_fg_driver = {
+ .driver = {
+ .name = "da9150-fuelgauge",
+ },
+ .probe = da9150_fg_probe,
+ .remove = da9150_fg_remove,
+ .resume = da9150_fg_resume,
+};
+
+module_platform_driver(da9150_fg_driver);
+
+MODULE_DESCRIPTION("Fuel-Gauge Driver for DA9150");
+MODULE_AUTHOR("Adam Thomson <Adam.Thomson.Opensource@diasemi.com>");
+MODULE_LICENSE("GPL");
diff --git a/include/linux/mfd/da9150/fg.h b/include/linux/mfd/da9150/fg.h
index 0ff52ab..2cff203 100644
--- a/include/linux/mfd/da9150/fg.h
+++ b/include/linux/mfd/da9150/fg.h
@@ -26,4 +26,14 @@ struct da9150_fg_pdata {
u8 crit_soc_lvl; /* % value */
};
+/*
+ * Function template to provide battery temperature. Should provide
+ * 0.1 degrees C resolution return values.
+ */
+typedef int (*da9150_read_temp_t)(void *context);
+
+/* Register temp callback function */
+void da9150_fg_register_temp_cb(struct power_supply *psy, da9150_read_temp_t cb,
+ void *cb_context);
+
#endif /* __DA9150_FG_H */
--
1.9.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH v2 3/4] power: Add support for DA9150 Fuel-Gauge
2015-06-26 8:47 ` Adam Thomson
(?)
@ 2015-07-03 15:22 ` Lee Jones
2015-07-06 14:27 ` Opensource [Adam Thomson]
-1 siblings, 1 reply; 20+ messages in thread
From: Lee Jones @ 2015-07-03 15:22 UTC (permalink / raw)
To: Adam Thomson
Cc: Samuel Ortiz, Sebastian Reichel, Dmitry Eremin-Solenikov,
David Woodhouse, Rob Herring, Pawel Moll, Mark Rutland,
Ian Campbell, Kumar Gala, linux-pm, devicetree, linux-kernel,
Support Opensource
On Fri, 26 Jun 2015, Adam Thomson wrote:
> Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
> ---
> drivers/power/Kconfig | 10 +
> drivers/power/Makefile | 1 +
> drivers/power/da9150-fg.c | 589 ++++++++++++++++++++++++++++++++++++++++++
> include/linux/mfd/da9150/fg.h | 10 +
> 4 files changed, 610 insertions(+)
> create mode 100644 drivers/power/da9150-fg.c
>
> diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
> index 4091fb0..8054f1a 100644
> --- a/drivers/power/Kconfig
> +++ b/drivers/power/Kconfig
> @@ -204,6 +204,16 @@ config CHARGER_DA9150
> This driver can also be built as a module. If so, the module will be
> called da9150-charger.
>
> +config FG_DA9150
> + tristate "Dialog Semiconductor DA9150 Fuel Gauge support"
> + depends on CHARGER_DA9150
> + help
> + Say Y here to enable support for the Fuel-Gauge 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-fg.
> +
> config AXP288_FUEL_GAUGE
> tristate "X-Powers AXP288 Fuel Gauge"
> depends on MFD_AXP20X && IIO
> diff --git a/drivers/power/Makefile b/drivers/power/Makefile
> index b7b0181..b421b54 100644
> --- a/drivers/power/Makefile
> +++ b/drivers/power/Makefile
> @@ -33,6 +33,7 @@ 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_FG_DA9150) += da9150-fg.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-fg.c b/drivers/power/da9150-fg.c
> new file mode 100644
> index 0000000..8dee156
> --- /dev/null
> +++ b/drivers/power/da9150-fg.c
> @@ -0,0 +1,589 @@
> +/*
> + * DA9150 Fuel-Gauge Driver
> + *
> + * Copyright (c) 2015 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/of.h>
> +#include <linux/of_platform.h>
> +#include <linux/slab.h>
> +#include <linux/interrupt.h>
> +#include <linux/delay.h>
> +#include <linux/power_supply.h>
> +#include <linux/list.h>
> +#include <asm/div64.h>
> +#include <linux/mfd/da9150/core.h>
> +#include <linux/mfd/da9150/registers.h>
> +#include <linux/mfd/da9150/fg.h>
> +
> +/* Core2Wire */
> +#define DA9150_QIF_READ (0x0 << 7)
> +#define DA9150_QIF_WRITE (0x1 << 7)
> +#define DA9150_QIF_CODE_MASK 0x7F
> +
> +#define DA9150_QIF_BYTE_SIZE 8
> +#define DA9150_QIF_BYTE_MASK 0xFF
> +#define DA9150_QIF_SHORT_SIZE 2
> +#define DA9150_QIF_LONG_SIZE 4
> +
> +/* QIF Codes */
> +#define DA9150_QIF_UAVG 6
> +#define DA9150_QIF_UAVG_SIZE DA9150_QIF_LONG_SIZE
> +#define DA9150_QIF_IAVG 8
> +#define DA9150_QIF_IAVG_SIZE DA9150_QIF_LONG_SIZE
> +#define DA9150_QIF_NTCAVG 12
> +#define DA9150_QIF_NTCAVG_SIZE DA9150_QIF_LONG_SIZE
> +#define DA9150_QIF_SHUNT_VAL 36
> +#define DA9150_QIF_SHUNT_VAL_SIZE DA9150_QIF_SHORT_SIZE
> +#define DA9150_QIF_SD_GAIN 38
> +#define DA9150_QIF_SD_GAIN_SIZE DA9150_QIF_LONG_SIZE
> +#define DA9150_QIF_FCC_MAH 40
> +#define DA9150_QIF_FCC_MAH_SIZE DA9150_QIF_SHORT_SIZE
> +#define DA9150_QIF_SOC_PCT 43
> +#define DA9150_QIF_SOC_PCT_SIZE DA9150_QIF_SHORT_SIZE
> +#define DA9150_QIF_CHARGE_LIMIT 44
> +#define DA9150_QIF_CHARGE_LIMIT_SIZE DA9150_QIF_SHORT_SIZE
> +#define DA9150_QIF_DISCHARGE_LIMIT 45
> +#define DA9150_QIF_DISCHARGE_LIMIT_SIZE DA9150_QIF_SHORT_SIZE
> +#define DA9150_QIF_FW_MAIN_VER 118
> +#define DA9150_QIF_FW_MAIN_VER_SIZE DA9150_QIF_SHORT_SIZE
> +#define DA9150_QIF_E_FG_STATUS 126
> +#define DA9150_QIF_E_FG_STATUS_SIZE DA9150_QIF_SHORT_SIZE
> +#define DA9150_QIF_SYNC 127
> +#define DA9150_QIF_SYNC_SIZE DA9150_QIF_SHORT_SIZE
> +#define DA9150_QIF_MAX_CODES 128
> +
> +/* QIF Sync Timeout */
> +#define DA9150_QIF_SYNC_TIMEOUT 1000
> +#define DA9150_QIF_SYNC_RETRIES 10
> +
> +/* QIF E_FG_STATUS */
> +#define DA9150_FG_IRQ_LOW_SOC_MASK (1 << 0)
> +#define DA9150_FG_IRQ_HIGH_SOC_MASK (1 << 1)
> +
> +/* Private data */
> +struct da9150_fg {
> + struct da9150 *da9150;
> + struct device *dev;
> +
> + struct mutex io_lock;
> +
> + struct power_supply *battery;
> + struct delayed_work work;
> + u32 interval;
> +
> + da9150_read_temp_t read_bat_temp;
> + void *bat_temp_context;
> +
> + int warn_soc;
> + int crit_soc;
> + int soc;
> +};
> +
> +/* Battery Properties */
> +static u32 da9150_fg_read_attr(struct da9150_fg *fg, u8 code, u8 size)
> +
> +{
> + u8 buf[size];
> + u8 read_addr;
> + u32 res = 0;
> + int i;
> +
> + /* Set QIF code (READ mode) */
> + read_addr = (code & DA9150_QIF_CODE_MASK) | DA9150_QIF_READ;
> +
> + da9150_read_qif(fg->da9150, read_addr, size, buf);
> + for (i = 0; i < size; ++i)
> + res |= (buf[i] << (i * DA9150_QIF_BYTE_SIZE));
> +
> + return res;
> +}
> +
> +static void da9150_fg_write_attr(struct da9150_fg *fg, u8 code, u8 size,
> + u32 val)
> +
> +{
> + u8 buf[size];
> + u8 write_addr;
> + int i;
> +
> + /* Set QIF code (WRITE mode) */
> + write_addr = (code & DA9150_QIF_CODE_MASK) | DA9150_QIF_WRITE;
> +
> + for (i = 0; i < size; ++i) {
> + buf[i] = (val >> (i * DA9150_QIF_BYTE_SIZE)) &
> + DA9150_QIF_BYTE_MASK;
> + }
> + da9150_write_qif(fg->da9150, write_addr, size, buf);
> +}
> +
> +/* Trigger QIF Sync to update QIF readable data */
> +static void da9150_fg_read_sync_start(struct da9150_fg *fg)
> +{
> + int i = 0;
> + u32 res = 0;
> +
> + mutex_lock(&fg->io_lock);
> +
> + /* Check if QIF sync already requested, and write to sync if not */
> + res = da9150_fg_read_attr(fg, DA9150_QIF_SYNC,
> + DA9150_QIF_SYNC_SIZE);
> + if (res > 0)
> + da9150_fg_write_attr(fg, DA9150_QIF_SYNC,
> + DA9150_QIF_SYNC_SIZE, 0);
> +
> + /* Wait for sync to complete */
> + res = 0;
> + while ((res == 0) && (i++ < DA9150_QIF_SYNC_RETRIES)) {
> + usleep_range(DA9150_QIF_SYNC_TIMEOUT,
> + DA9150_QIF_SYNC_TIMEOUT * 2);
> + res = da9150_fg_read_attr(fg, DA9150_QIF_SYNC,
> + DA9150_QIF_SYNC_SIZE);
> + }
> +
> + /* Check if sync completed */
> + if (res == 0)
> + dev_err(fg->dev, "Failed to perform QIF read sync!\n");
> +}
> +
> +/*
> + * Should always be called after QIF sync read has been performed, and all
> + * attributes required have been accessed.
> + */
> +static inline void da9150_fg_read_sync_end(struct da9150_fg *fg)
> +{
> + mutex_unlock(&fg->io_lock);
> +}
> +
> +/* Wait for QIF Sync, write QIF data and wait for ack */
> +static void da9150_fg_write_attr_sync(struct da9150_fg *fg, u8 code, u8 size,
> + u32 val)
> +{
> + int i = 0;
> + u32 res = 0, sync_val;
> +
> + mutex_lock(&fg->io_lock);
> +
> + /* Check if QIF sync already requested */
> + res = da9150_fg_read_attr(fg, DA9150_QIF_SYNC,
> + DA9150_QIF_SYNC_SIZE);
> +
> + /* Wait for an existing sync to complete */
> + while ((res == 0) && (i++ < DA9150_QIF_SYNC_RETRIES)) {
> + usleep_range(DA9150_QIF_SYNC_TIMEOUT,
> + DA9150_QIF_SYNC_TIMEOUT * 2);
> + res = da9150_fg_read_attr(fg, DA9150_QIF_SYNC,
> + DA9150_QIF_SYNC_SIZE);
> + }
> +
> + if (res == 0) {
> + dev_err(fg->dev, "Timeout waiting for existing QIF sync!\n");
> + mutex_unlock(&fg->io_lock);
> + return;
> + }
> +
> + /* Write value for QIF code */
> + da9150_fg_write_attr(fg, code, size, val);
> +
> + /* Wait for write acknowledgment */
> + i = 0;
> + sync_val = res;
> + while ((res == sync_val) && (i++ < DA9150_QIF_SYNC_RETRIES)) {
> + usleep_range(DA9150_QIF_SYNC_TIMEOUT,
> + DA9150_QIF_SYNC_TIMEOUT * 2);
> + res = da9150_fg_read_attr(fg, DA9150_QIF_SYNC,
> + DA9150_QIF_SYNC_SIZE);
> + }
> +
> + mutex_unlock(&fg->io_lock);
> +
> + /* Check write was actually successful */
> + if (res != (sync_val + 1))
> + dev_err(fg->dev, "Error performing QIF sync write for code %d\n",
> + code);
> +}
> +
> +/* Power Supply attributes */
> +static int da9150_fg_capacity(struct da9150_fg *fg,
> + union power_supply_propval *val)
> +{
> + da9150_fg_read_sync_start(fg);
> + val->intval = da9150_fg_read_attr(fg, DA9150_QIF_SOC_PCT,
> + DA9150_QIF_SOC_PCT_SIZE);
> + da9150_fg_read_sync_end(fg);
> +
> + if (val->intval > 100)
> + val->intval = 100;
> +
> + return 0;
> +}
> +
> +static int da9150_fg_current_avg(struct da9150_fg *fg,
> + union power_supply_propval *val)
> +{
> + u32 iavg, sd_gain, shunt_val;
> + u64 div, res;
> +
> + da9150_fg_read_sync_start(fg);
> + iavg = da9150_fg_read_attr(fg, DA9150_QIF_IAVG,
> + DA9150_QIF_IAVG_SIZE);
> + shunt_val = da9150_fg_read_attr(fg, DA9150_QIF_SHUNT_VAL,
> + DA9150_QIF_SHUNT_VAL_SIZE);
> + sd_gain = da9150_fg_read_attr(fg, DA9150_QIF_SD_GAIN,
> + DA9150_QIF_SD_GAIN_SIZE);
> + da9150_fg_read_sync_end(fg);
> +
> + div = (u64) (sd_gain * shunt_val * 65536ULL);
> + do_div(div, 1000000);
> + res = (u64) (iavg * 1000000ULL);
> + do_div(res, div);
> +
> + val->intval = (int) res;
> +
> + return 0;
> +}
> +
> +static int da9150_fg_voltage_avg(struct da9150_fg *fg,
> + union power_supply_propval *val)
> +{
> + u64 res;
> +
> + da9150_fg_read_sync_start(fg);
> + val->intval = da9150_fg_read_attr(fg, DA9150_QIF_UAVG,
> + DA9150_QIF_UAVG_SIZE);
> + da9150_fg_read_sync_end(fg);
> +
> + res = (u64) (val->intval * 186ULL);
> + do_div(res, 10000);
> + val->intval = (int) res;
> +
> + return 0;
> +}
> +
> +static int da9150_fg_charge_full(struct da9150_fg *fg,
> + union power_supply_propval *val)
> +{
> + da9150_fg_read_sync_start(fg);
> + val->intval = da9150_fg_read_attr(fg, DA9150_QIF_FCC_MAH,
> + DA9150_QIF_FCC_MAH_SIZE);
> + da9150_fg_read_sync_end(fg);
> +
> + val->intval = val->intval * 1000;
> +
> + return 0;
> +}
> +
> +static int da9150_fg_temp(struct da9150_fg *fg,
> + union power_supply_propval *val)
> +{
> + if (!fg->read_bat_temp) {
> + da9150_fg_read_sync_start(fg);
> + val->intval = da9150_fg_read_attr(fg, DA9150_QIF_NTCAVG,
> + DA9150_QIF_NTCAVG_SIZE);
> + da9150_fg_read_sync_end(fg);
> +
> + val->intval = (val->intval * 10) / 1048576;
> + } else {
> + val->intval = fg->read_bat_temp(fg->bat_temp_context);
> + }
> +
> + return 0;
> +}
> +
> +static enum power_supply_property da9150_fg_props[] = {
> + POWER_SUPPLY_PROP_CAPACITY,
> + POWER_SUPPLY_PROP_CURRENT_AVG,
> + POWER_SUPPLY_PROP_VOLTAGE_AVG,
> + POWER_SUPPLY_PROP_CHARGE_FULL,
> + POWER_SUPPLY_PROP_TEMP,
> +};
> +
> +static int da9150_fg_get_prop(struct power_supply *psy,
> + enum power_supply_property psp,
> + union power_supply_propval *val)
> +{
> + struct da9150_fg *fg = dev_get_drvdata(psy->dev.parent);
> + int ret;
> +
> + switch (psp) {
> + case POWER_SUPPLY_PROP_CAPACITY:
> + ret = da9150_fg_capacity(fg, val);
> + break;
> + case POWER_SUPPLY_PROP_CURRENT_AVG:
> + ret = da9150_fg_current_avg(fg, val);
> + break;
> + case POWER_SUPPLY_PROP_VOLTAGE_AVG:
> + ret = da9150_fg_voltage_avg(fg, val);
> + break;
> + case POWER_SUPPLY_PROP_CHARGE_FULL:
> + ret = da9150_fg_charge_full(fg, val);
> + break;
> + case POWER_SUPPLY_PROP_TEMP:
> + ret = da9150_fg_temp(fg, val);
> + break;
> + default:
> + ret = -EINVAL;
> + break;
> + }
> +
> + return ret;
> +}
> +
> +/* Repeated SOC check */
> +static bool da9150_fg_soc_changed(struct da9150_fg *fg)
> +{
> + union power_supply_propval val;
> +
> + da9150_fg_capacity(fg, &val);
> + if (val.intval != fg->soc) {
> + fg->soc = val.intval;
> + return true;
> + }
> +
> + return false;
> +}
> +
> +static void da9150_fg_work(struct work_struct *work)
> +{
> + struct da9150_fg *fg = container_of(work, struct da9150_fg, work.work);
> +
> + /* Report if SOC has changed */
> + if (da9150_fg_soc_changed(fg))
> + power_supply_changed(fg->battery);
> +
> + schedule_delayed_work(&fg->work, msecs_to_jiffies(fg->interval));
> +}
> +
> +/* Register external function to give battery temperature */
> +void da9150_fg_register_temp_cb(struct power_supply *psy, da9150_read_temp_t cb,
> + void *cb_context)
> +{
> + struct da9150_fg *fg = dev_get_drvdata(psy->dev.parent);
> +
> + fg->read_bat_temp = cb;
> + fg->bat_temp_context = cb_context;
> +}
> +EXPORT_SYMBOL_GPL(da9150_fg_register_temp_cb);
> +
> +/* SOC level event configuration */
> +static void da9150_fg_soc_event_config(struct da9150_fg *fg)
> +{
> + int soc;
> +
> + da9150_fg_read_sync_start(fg);
> + soc = da9150_fg_read_attr(fg, DA9150_QIF_SOC_PCT,
> + DA9150_QIF_SOC_PCT_SIZE);
> + da9150_fg_read_sync_end(fg);
> +
> + if (soc > fg->warn_soc) {
> + /* If SOC > warn level, set discharge warn level event */
> + da9150_fg_write_attr_sync(fg, DA9150_QIF_DISCHARGE_LIMIT,
> + DA9150_QIF_DISCHARGE_LIMIT_SIZE,
> + fg->warn_soc + 1);
> + } else if ((soc <= fg->warn_soc) && (soc > fg->crit_soc)) {
> + /*
> + * If SOC <= warn level, set discharge crit level event,
> + * and set charge warn level event.
> + */
> + da9150_fg_write_attr_sync(fg, DA9150_QIF_DISCHARGE_LIMIT,
> + DA9150_QIF_DISCHARGE_LIMIT_SIZE,
> + fg->crit_soc + 1);
> +
> + da9150_fg_write_attr_sync(fg, DA9150_QIF_CHARGE_LIMIT,
> + DA9150_QIF_CHARGE_LIMIT_SIZE,
> + fg->warn_soc);
> + } else if (soc <= fg->crit_soc) {
> + /* If SOC <= crit level, set charge crit level event */
> + da9150_fg_write_attr_sync(fg, DA9150_QIF_CHARGE_LIMIT,
> + DA9150_QIF_CHARGE_LIMIT_SIZE,
> + fg->crit_soc);
> + }
> +}
> +
> +static irqreturn_t da9150_fg_irq(int irq, void *data)
> +{
> + struct da9150_fg *fg = data;
> + u32 e_fg_status;
> +
> + /* Read FG IRQ status info */
> + e_fg_status = da9150_fg_read_attr(fg, DA9150_QIF_E_FG_STATUS,
> + DA9150_QIF_E_FG_STATUS_SIZE);
> +
> + /* Handle warning/critical threhold events */
> + if ((DA9150_FG_IRQ_LOW_SOC_MASK | DA9150_FG_IRQ_HIGH_SOC_MASK) &
> + e_fg_status)
> + da9150_fg_soc_event_config(fg);
> +
> + /* Clear any FG IRQs */
> + da9150_fg_write_attr(fg, DA9150_QIF_E_FG_STATUS,
> + DA9150_QIF_E_FG_STATUS_SIZE, e_fg_status);
> +
> + return IRQ_HANDLED;
> +}
> +
> +static struct da9150_fg_pdata *da9150_fg_dt_pdata(struct device *dev)
> +{
> + struct device_node *fg_node = dev->of_node;
> + struct da9150_fg_pdata *pdata;
> +
> + pdata = devm_kzalloc(dev, sizeof(struct da9150_fg_pdata), GFP_KERNEL);
> + if (!pdata)
> + return NULL;
> +
> + of_property_read_u32(fg_node, "dlg,update-interval",
> + &pdata->update_interval);
> + of_property_read_u8(fg_node, "dlg,warn-soc-level",
> + &pdata->warn_soc_lvl);
> + of_property_read_u8(fg_node, "dlg,crit-soc-level",
> + &pdata->crit_soc_lvl);
> +
> + return pdata;
> +}
> +
> +static const struct power_supply_desc fg_desc = {
> + .name = "da9150-fg",
> + .type = POWER_SUPPLY_TYPE_BATTERY,
> + .properties = da9150_fg_props,
> + .num_properties = ARRAY_SIZE(da9150_fg_props),
> + .get_property = da9150_fg_get_prop,
> +};
> +
> +static int da9150_fg_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct da9150 *da9150 = dev_get_drvdata(dev->parent);
> + struct da9150_fg_pdata *fg_pdata = dev_get_platdata(dev);
> + struct da9150_fg *fg;
> + int ver, irq, ret;
> +
> + fg = devm_kzalloc(dev, sizeof(*fg), GFP_KERNEL);
> + if (fg == NULL)
> + return -ENOMEM;
> +
> + platform_set_drvdata(pdev, fg);
> + fg->da9150 = da9150;
> + fg->dev = dev;
> +
> + mutex_init(&fg->io_lock);
> +
> + /* Enable QIF */
> + da9150_set_bits(da9150, DA9150_CORE2WIRE_CTRL_A, DA9150_FG_QIF_EN_MASK,
> + DA9150_FG_QIF_EN_MASK);
> +
> + fg->battery = power_supply_register(dev, &fg_desc, NULL);
> + if (IS_ERR(fg->battery)) {
> + ret = PTR_ERR(fg->battery);
> + return ret;
> + }
> +
> + ver = da9150_fg_read_attr(fg, DA9150_QIF_FW_MAIN_VER,
> + DA9150_QIF_FW_MAIN_VER_SIZE);
> + dev_info(dev, "Version: 0x%x\n", ver);
> +
> + /* Handle DT data if provided */
> + if (dev->of_node) {
> + fg_pdata = da9150_fg_dt_pdata(dev);
> + dev->platform_data = fg_pdata;
> + }
> +
> + /* Handle any pdata provided */
> + if (fg_pdata) {
> + fg->interval = fg_pdata->update_interval;
> +
> + if (fg_pdata->warn_soc_lvl > 100)
> + dev_warn(dev, "Invalid SOC warning level provided, Ignoring");
> + else
> + fg->warn_soc = fg_pdata->warn_soc_lvl;
> +
> + if ((fg_pdata->crit_soc_lvl > 100) ||
> + (fg_pdata->crit_soc_lvl >= fg_pdata->warn_soc_lvl))
> + dev_warn(dev, "Invalid SOC critical level provided, Ignoring");
> + else
> + fg->crit_soc = fg_pdata->crit_soc_lvl;
> +
> +
> + }
> +
> + /* Configure initial SOC level events */
> + da9150_fg_soc_event_config(fg);
> +
> + /*
> + * If an interval period has been provided then setup repeating
> + * work for reporting data updates.
> + */
> + if (fg->interval) {
> + INIT_DELAYED_WORK(&fg->work, da9150_fg_work);
> + schedule_delayed_work(&fg->work,
> + msecs_to_jiffies(fg->interval));
> + }
> +
> + /* Register IRQ */
> + irq = platform_get_irq_byname(pdev, "FG");
> + ret = request_threaded_irq(irq, NULL, da9150_fg_irq, IRQF_ONESHOT, "FG",
> + fg);
> + if (ret)
> + goto irq_fail;
> +
> + return ret;
> +
> +irq_fail:
> + cancel_delayed_work(&fg->work);
> + power_supply_unregister(fg->battery);
> +
> + return ret;
> +}
> +
> +static int da9150_fg_remove(struct platform_device *pdev)
> +{
> + struct da9150_fg *fg = platform_get_drvdata(pdev);
> + int irq;
> +
> + irq = platform_get_irq_byname(pdev, "FG");
> + free_irq(irq, fg);
> +
> + if (fg->interval)
> + cancel_delayed_work(&fg->work);
> +
> + power_supply_unregister(fg->battery);
> +
> + return 0;
> +}
> +
> +static int da9150_fg_resume(struct platform_device *pdev)
> +{
> + struct da9150_fg *fg = platform_get_drvdata(pdev);
> +
> + /*
> + * Trigger SOC check to happen now so as to indicate any value change
> + * since last check before suspend.
> + */
> + if (fg->interval)
> + flush_delayed_work(&fg->work);
> +
> + return 0;
> +}
> +
> +static struct platform_driver da9150_fg_driver = {
> + .driver = {
> + .name = "da9150-fuelgauge",
> + },
> + .probe = da9150_fg_probe,
> + .remove = da9150_fg_remove,
> + .resume = da9150_fg_resume,
> +};
> +
> +module_platform_driver(da9150_fg_driver);
> +
> +MODULE_DESCRIPTION("Fuel-Gauge Driver for DA9150");
> +MODULE_AUTHOR("Adam Thomson <Adam.Thomson.Opensource@diasemi.com>");
> +MODULE_LICENSE("GPL");
> diff --git a/include/linux/mfd/da9150/fg.h b/include/linux/mfd/da9150/fg.h
> index 0ff52ab..2cff203 100644
> --- a/include/linux/mfd/da9150/fg.h
> +++ b/include/linux/mfd/da9150/fg.h
> @@ -26,4 +26,14 @@ struct da9150_fg_pdata {
> u8 crit_soc_lvl; /* % value */
> };
>
> +/*
> + * Function template to provide battery temperature. Should provide
> + * 0.1 degrees C resolution return values.
> + */
> +typedef int (*da9150_read_temp_t)(void *context);
> +
> +/* Register temp callback function */
> +void da9150_fg_register_temp_cb(struct power_supply *psy, da9150_read_temp_t cb,
> + void *cb_context);
> +
> #endif /* __DA9150_FG_H */
I still don't get why you think pointers are better than just calling
the function directly. Can the *fn() ever point to different functions?
--
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 v2 3/4] power: Add support for DA9150 Fuel-Gauge
2015-07-03 15:22 ` Lee Jones
@ 2015-07-06 14:27 ` Opensource [Adam Thomson]
0 siblings, 0 replies; 20+ messages in thread
From: Opensource [Adam Thomson] @ 2015-07-06 14:27 UTC (permalink / raw)
To: Lee Jones, Opensource [Adam Thomson]
Cc: Samuel Ortiz, Sebastian Reichel, Dmitry Eremin-Solenikov,
David Woodhouse, Rob Herring, Pawel Moll, Mark Rutland,
Ian Campbell, Kumar Gala, linux-pm@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
Support Opensource
On July 3, 2015 16:22, Lee Jones wrote:
> > +/*
> > + * Function template to provide battery temperature. Should provide
> > + * 0.1 degrees C resolution return values.
> > + */
> > +typedef int (*da9150_read_temp_t)(void *context);
> > +
> > +/* Register temp callback function */
> > +void da9150_fg_register_temp_cb(struct power_supply *psy,
> da9150_read_temp_t cb,
> > + void *cb_context);
> > +
> > #endif /* __DA9150_FG_H */
>
> I still don't get why you think pointers are better than just calling
> the function directly. Can the *fn() ever point to different functions?
Here, the intention is to cover the scenario where a battery has no internal
thermistor, and cannot provide temperature readings to the DA9150 device. In
that scenario I've allowed for the option of providing an external function
which can give the temperature reading instead as DA9150 will not be able to
provide a correct reading in that scenario. This would be platform dependent and
such a platform using a battery not employing an NTC in their battery can
register its own call-back function to provide battery temperature instead.
So, in answer to your question, yes.
^ permalink raw reply [flat|nested] 20+ messages in thread
* RE: [PATCH v2 3/4] power: Add support for DA9150 Fuel-Gauge
@ 2015-07-06 14:27 ` Opensource [Adam Thomson]
0 siblings, 0 replies; 20+ messages in thread
From: Opensource [Adam Thomson] @ 2015-07-06 14:27 UTC (permalink / raw)
To: Lee Jones, Opensource [Adam Thomson]
Cc: Samuel Ortiz, Sebastian Reichel, Dmitry Eremin-Solenikov,
David Woodhouse, Rob Herring, Pawel Moll, Mark Rutland,
Ian Campbell, Kumar Gala, linux-pm@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
Support Opensource
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 1324 bytes --]
On July 3, 2015 16:22, Lee Jones wrote:
> > +/*
> > + * Function template to provide battery temperature. Should provide
> > + * 0.1 degrees C resolution return values.
> > + */
> > +typedef int (*da9150_read_temp_t)(void *context);
> > +
> > +/* Register temp callback function */
> > +void da9150_fg_register_temp_cb(struct power_supply *psy,
> da9150_read_temp_t cb,
> > + void *cb_context);
> > +
> > #endif /* __DA9150_FG_H */
>
> I still don't get why you think pointers are better than just calling
> the function directly. Can the *fn() ever point to different functions?
Here, the intention is to cover the scenario where a battery has no internal
thermistor, and cannot provide temperature readings to the DA9150 device. In
that scenario I've allowed for the option of providing an external function
which can give the temperature reading instead as DA9150 will not be able to
provide a correct reading in that scenario. This would be platform dependent and
such a platform using a battery not employing an NTC in their battery can
register its own call-back function to provide battery temperature instead.
So, in answer to your question, yes.
ÿôèº{.nÇ+‰·Ÿ®‰†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a¢f£¢·hšïêÿ‘êçz_è®\x03(階ŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨èÚ&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥
^ permalink raw reply [flat|nested] 20+ messages in thread* Re: [PATCH v2 3/4] power: Add support for DA9150 Fuel-Gauge
2015-07-06 14:27 ` Opensource [Adam Thomson]
(?)
@ 2015-07-07 6:58 ` Lee Jones
-1 siblings, 0 replies; 20+ messages in thread
From: Lee Jones @ 2015-07-07 6:58 UTC (permalink / raw)
To: Opensource [Adam Thomson]
Cc: Samuel Ortiz, Sebastian Reichel, Dmitry Eremin-Solenikov,
David Woodhouse, Rob Herring, Pawel Moll, Mark Rutland,
Ian Campbell, Kumar Gala, linux-pm@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
Support Opensource, jic23
On Mon, 06 Jul 2015, Opensource [Adam Thomson] wrote:
> On July 3, 2015 16:22, Lee Jones wrote:
>
> > > +/*
> > > + * Function template to provide battery temperature. Should provide
> > > + * 0.1 degrees C resolution return values.
> > > + */
> > > +typedef int (*da9150_read_temp_t)(void *context);
> > > +
> > > +/* Register temp callback function */
> > > +void da9150_fg_register_temp_cb(struct power_supply *psy,
> > da9150_read_temp_t cb,
> > > + void *cb_context);
> > > +
> > > #endif /* __DA9150_FG_H */
> >
> > I still don't get why you think pointers are better than just calling
> > the function directly. Can the *fn() ever point to different functions?
>
> Here, the intention is to cover the scenario where a battery has no internal
> thermistor, and cannot provide temperature readings to the DA9150 device. In
> that scenario I've allowed for the option of providing an external function
> which can give the temperature reading instead as DA9150 will not be able to
> provide a correct reading in that scenario. This would be platform dependent and
> such a platform using a battery not employing an NTC in their battery can
> register its own call-back function to provide battery temperature instead.
>
> So, in answer to your question, yes.
Before you add this scenario, I would like to see the code which
utilises it. I'm not a fan of coding-up 'just-in-case's. Please
re-submit when you have a user in the same patch-set.
This whole idea will need a discussion with Jonathan (the IIO
Maintainer), now CC'ed.
--
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 v2 4/4] power: da9150: Add DT bindings documentation for Fuel-Gauge
2015-06-26 8:47 ` Adam Thomson
@ 2015-06-26 8:47 ` Adam Thomson
-1 siblings, 0 replies; 20+ messages in thread
From: Adam Thomson @ 2015-06-26 8:47 UTC (permalink / raw)
To: Lee Jones, Samuel Ortiz, Sebastian Reichel,
Dmitry Eremin-Solenikov, David Woodhouse, Rob Herring, Pawel Moll,
Mark Rutland, Ian Campbell, Kumar Gala
Cc: linux-pm, devicetree, linux-kernel, Support Opensource
Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
---
.../devicetree/bindings/power/da9150-fg.txt | 23 ++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 Documentation/devicetree/bindings/power/da9150-fg.txt
diff --git a/Documentation/devicetree/bindings/power/da9150-fg.txt b/Documentation/devicetree/bindings/power/da9150-fg.txt
new file mode 100644
index 0000000..c3c76eb
--- /dev/null
+++ b/Documentation/devicetree/bindings/power/da9150-fg.txt
@@ -0,0 +1,23 @@
+Dialog Semiconductor DA9150 Fuel-Gauge Power Supply bindings
+
+Required properties:
+- compatible: "dlg,da9150-fg" for DA9150 Fuel-Gauge Power Supply
+
+Optional properties:
+- dlg,update-interval: Interval time (milliseconds) between battery level checks.
+- dlg,warn-soc-level: Battery discharge level (%) where warning event raised.
+ [1 - 100]
+- dlg,crit-soc-level: Battery discharge level (%) where critical event raised.
+ This value should be lower than the warning level.
+ [1 - 100]
+
+
+Example:
+
+ da9150-fg {
+ compatible = "dlg,da9150-fg";
+
+ dlg,update-interval = <10000>;
+ dlg,warn-soc-level = /bits/ 8 <15>;
+ dlg,crit-soc-level = /bits/ 8 <5>;
+ };
--
1.9.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH v2 4/4] power: da9150: Add DT bindings documentation for Fuel-Gauge
@ 2015-06-26 8:47 ` Adam Thomson
0 siblings, 0 replies; 20+ messages in thread
From: Adam Thomson @ 2015-06-26 8:47 UTC (permalink / raw)
To: Lee Jones, Samuel Ortiz, Sebastian Reichel,
Dmitry Eremin-Solenikov, David Woodhouse, Rob Herring, Pawel Moll,
Mark Rutland, Ian Campbell, Kumar Gala
Cc: linux-pm, devicetree, linux-kernel, Support Opensource
Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
---
.../devicetree/bindings/power/da9150-fg.txt | 23 ++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 Documentation/devicetree/bindings/power/da9150-fg.txt
diff --git a/Documentation/devicetree/bindings/power/da9150-fg.txt b/Documentation/devicetree/bindings/power/da9150-fg.txt
new file mode 100644
index 0000000..c3c76eb
--- /dev/null
+++ b/Documentation/devicetree/bindings/power/da9150-fg.txt
@@ -0,0 +1,23 @@
+Dialog Semiconductor DA9150 Fuel-Gauge Power Supply bindings
+
+Required properties:
+- compatible: "dlg,da9150-fg" for DA9150 Fuel-Gauge Power Supply
+
+Optional properties:
+- dlg,update-interval: Interval time (milliseconds) between battery level checks.
+- dlg,warn-soc-level: Battery discharge level (%) where warning event raised.
+ [1 - 100]
+- dlg,crit-soc-level: Battery discharge level (%) where critical event raised.
+ This value should be lower than the warning level.
+ [1 - 100]
+
+
+Example:
+
+ da9150-fg {
+ compatible = "dlg,da9150-fg";
+
+ dlg,update-interval = <10000>;
+ dlg,warn-soc-level = /bits/ 8 <15>;
+ dlg,crit-soc-level = /bits/ 8 <5>;
+ };
--
1.9.3
^ permalink raw reply related [flat|nested] 20+ messages in thread