Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/793179/?format=api
{ "id": 793179, "url": "http://patchwork.ozlabs.org/api/patches/793179/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linux-i2c/patch/1500954024-6860-9-git-send-email-preid@electromag.com.au/", "project": { "id": 35, "url": "http://patchwork.ozlabs.org/api/projects/35/?format=api", "name": "Linux I2C development", "link_name": "linux-i2c", "list_id": "linux-i2c.vger.kernel.org", "list_email": "linux-i2c@vger.kernel.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1500954024-6860-9-git-send-email-preid@electromag.com.au>", "list_archive_url": null, "date": "2017-07-25T03:40:22", "name": "[v10,08/10] power: Adds support for Smart Battery System Manager", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "961236b499d69a68e3d7b864832ef006f6a44cee", "submitter": { "id": 66145, "url": "http://patchwork.ozlabs.org/api/people/66145/?format=api", "name": "Phil Reid", "email": "preid@electromag.com.au" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linux-i2c/patch/1500954024-6860-9-git-send-email-preid@electromag.com.au/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/793179/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/793179/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<linux-i2c-owner@vger.kernel.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=linux-i2c-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)", "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xGkY94sMNz9s72\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 25 Jul 2017 13:41:01 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1755131AbdGYDk4 (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);\n\tMon, 24 Jul 2017 23:40:56 -0400", "from anchovy1.45ru.net.au ([203.30.46.145]:36659 \"EHLO\n\tanchovy.45ru.net.au\" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org\n\twith ESMTP id S1755121AbdGYDkg (ORCPT\n\t<rfc822; linux-i2c@vger.kernel.org>); Mon, 24 Jul 2017 23:40:36 -0400", "(qmail 7658 invoked by uid 5089); 25 Jul 2017 03:40:34 -0000", "by simscan 1.2.0 ppid: 7441, pid: 7445, t: 0.1334s\n\tscanners: regex: 1.2.0 attach: 1.2.0 clamav: 0.88.3/m:40/d:1950", "from unknown (HELO preid-centos7.electromag.com.au)\n\t(preid@electromag.com.au@203.59.230.133)\n\tby anchovy1.45ru.net.au with ESMTPA; 25 Jul 2017 03:40:33 -0000", "by preid-centos7.electromag.com.au (Postfix, from userid 1000)\n\tid 9E1AB30249B7E; Tue, 25 Jul 2017 11:40:29 +0800 (AWST)" ], "X-RBL": "$rbltext", "From": "Phil Reid <preid@electromag.com.au>", "To": "wsa@the-dreams.de, robh+dt@kernel.org, mark.rutland@arm.com,\n\tsre@kernel.org, jdelvare@suse.com, jglauber@cavium.com,\n\tdavid.daney@cavium.com, peda@axentia.se, preid@electromag.com.au,\n\tbenjamin.tissoires@redhat.com, linux-i2c@vger.kernel.org,\n\tdevicetree@vger.kernel.org, linux-pm@vger.kernel.org", "Cc": "Karl-Heinz Schneider <karl-heinz@schneider-inet.de>", "Subject": "[PATCH v10 08/10] power: Adds support for Smart Battery System\n\tManager", "Date": "Tue, 25 Jul 2017 11:40:22 +0800", "Message-Id": "<1500954024-6860-9-git-send-email-preid@electromag.com.au>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1500954024-6860-1-git-send-email-preid@electromag.com.au>", "References": "<1500954024-6860-1-git-send-email-preid@electromag.com.au>", "Sender": "linux-i2c-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<linux-i2c.vger.kernel.org>", "X-Mailing-List": "linux-i2c@vger.kernel.org" }, "content": "From: Karl-Heinz Schneider <karl-heinz@schneider-inet.de>\n\nThis patch adds support for Smart Battery System Manager.\nA SBSM is a device listening at I2C/SMBus address 0x0a and is capable of\ncommunicating up to four I2C smart battery devices. All smart battery\ndevices are listening at address 0x0b, so the SBSM muliplexes between\nthem. The driver makes use of the I2C-Mux framework to allow smart\nbatteries to be bound via device tree, i.e. the sbs-battery driver.\n\nVia sysfs interface the online state and charge type are presented. If\nthe driver is bound as ltc1760 (an implementation of a Dual Smart Battery\nSystem Manager) the charge type can also be changed from trickle to fast.\n\nSigned-off-by: Karl-Heinz Schneider <karl-heinz@schneider-inet.de>\nSigned-off-by: Phil Reid <preid@electromag.com.au>\nReviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>\n---\n drivers/power/supply/Kconfig | 13 ++\n drivers/power/supply/Makefile | 1 +\n drivers/power/supply/sbs-manager.c | 323 +++++++++++++++++++++++++++++++++++++\n 3 files changed, 337 insertions(+)\n create mode 100644 drivers/power/supply/sbs-manager.c", "diff": "diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig\nindex 969f500..e7e16ec 100644\n--- a/drivers/power/supply/Kconfig\n+++ b/drivers/power/supply/Kconfig\n@@ -184,6 +184,19 @@ config CHARGER_SBS\n help\n \t Say Y to include support for SBS compilant battery chargers.\n \n+config MANAGER_SBS\n+\ttristate \"Smart Battery System Manager\"\n+\tdepends on I2C && I2C_MUX\n+\thelp\n+\t Say Y here to include support for Smart Battery System Manager\n+\t ICs. The driver reports online and charging status via sysfs.\n+\t It presents itself also as I2C mux which allows to bind\n+\t smart battery driver to its ports.\n+\t Supported is for example LTC1760.\n+\n+\t This driver can also be built as a module. If so, the module will be\n+\t called sbs-manager.\n+\n config BATTERY_BQ27XXX\n \ttristate \"BQ27xxx battery driver\"\n \thelp\ndiff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile\nindex a41f409..2958807 100644\n--- a/drivers/power/supply/Makefile\n+++ b/drivers/power/supply/Makefile\n@@ -36,6 +36,7 @@ obj-$(CONFIG_BATTERY_IPAQ_MICRO) += ipaq_micro_battery.o\n obj-$(CONFIG_BATTERY_WM97XX)\t+= wm97xx_battery.o\n obj-$(CONFIG_BATTERY_SBS)\t+= sbs-battery.o\n obj-$(CONFIG_CHARGER_SBS)\t+= sbs-charger.o\n+obj-$(CONFIG_MANAGER_SBS)\t+= sbs-manager.o\n obj-$(CONFIG_BATTERY_BQ27XXX)\t+= bq27xxx_battery.o\n obj-$(CONFIG_BATTERY_BQ27XXX_I2C) += bq27xxx_battery_i2c.o\n obj-$(CONFIG_BATTERY_DA9030)\t+= da9030_battery.o\ndiff --git a/drivers/power/supply/sbs-manager.c b/drivers/power/supply/sbs-manager.c\nnew file mode 100644\nindex 0000000..47c09a1\n--- /dev/null\n+++ b/drivers/power/supply/sbs-manager.c\n@@ -0,0 +1,323 @@\n+/*\n+ * Driver for SBS compliant Smart Battery System Managers\n+ *\n+ * The device communicates via i2c at address 0x0a and multiplexes access to up\n+ * to four smart batteries at address 0x0b.\n+ *\n+ * Via sysfs interface the online state and charge type are presented.\n+ *\n+ * Datasheet SBSM: http://sbs-forum.org/specs/sbsm100b.pdf\n+ * Datasheet LTC1760: http://cds.linear.com/docs/en/datasheet/1760fb.pdf\n+ *\n+ * Karl-Heinz Schneider <karl-heinz@schneider-inet.de>\n+ *\n+ * This program is free software; you can redistribute it and/or modify\n+ * it under the terms of the GNU General Public License version 2 as\n+ * published by the Free Software Foundation.\n+ */\n+\n+#include <linux/module.h>\n+#include <linux/i2c.h>\n+#include <linux/i2c-mux.h>\n+#include <linux/power_supply.h>\n+\n+#define SBSM_MAX_BATS 4\n+#define SBSM_RETRY_CNT 3\n+\n+/* registers addresses */\n+#define SBSM_CMD_BATSYSSTATE 0x01\n+#define SBSM_CMD_BATSYSSTATECONT 0x02\n+#define SBSM_CMD_BATSYSINFO 0x04\n+#define SBSM_CMD_LTC 0x3c\n+\n+#define SBSM_MASK_BAT_SUPPORTED GENMASK(3, 0)\n+#define SBSM_MASK_CHARGE_BAT GENMASK(7, 4)\n+#define SBSM_BIT_AC_PRESENT BIT(0)\n+#define SBSM_BIT_TURBO BIT(7)\n+\n+#define SBSM_SMB_BAT_OFFSET 11\n+struct sbsm_data {\n+\tstruct i2c_client *client;\n+\tstruct i2c_mux_core *muxc;\n+\n+\tstruct power_supply *psy;\n+\n+\tu8 cur_chan; /* currently selected channel */\n+\tbool is_ltc1760; /* special capabilities */\n+};\n+\n+static enum power_supply_property sbsm_props[] = {\n+\tPOWER_SUPPLY_PROP_ONLINE,\n+\tPOWER_SUPPLY_PROP_CHARGE_TYPE,\n+};\n+\n+static int sbsm_read_word(struct i2c_client *client, u8 address)\n+{\n+\tint reg, retries;\n+\n+\tfor (retries = SBSM_RETRY_CNT; retries > 0; retries--) {\n+\t\treg = i2c_smbus_read_word_data(client, address);\n+\t\tif (reg >= 0)\n+\t\t\tbreak;\n+\t}\n+\n+\tif (reg < 0) {\n+\t\tdev_err(&client->dev, \"failed to read register 0x%02x\\n\",\n+\t\t\taddress);\n+\t}\n+\n+\treturn reg;\n+}\n+\n+static int sbsm_write_word(struct i2c_client *client, u8 address, u16 word)\n+{\n+\tint ret, retries;\n+\n+\tfor (retries = SBSM_RETRY_CNT; retries > 0; retries--) {\n+\t\tret = i2c_smbus_write_word_data(client, address, word);\n+\t\tif (ret >= 0)\n+\t\t\tbreak;\n+\t}\n+\tif (ret < 0)\n+\t\tdev_err(&client->dev, \"failed to write to register 0x%02x\\n\",\n+\t\t\taddress);\n+\n+\treturn ret;\n+}\n+\n+static int sbsm_get_property(struct power_supply *psy,\n+\t\t\t enum power_supply_property psp,\n+\t\t\t union power_supply_propval *val)\n+{\n+\tstruct sbsm_data *data = power_supply_get_drvdata(psy);\n+\tint regval = 0;\n+\n+\tswitch (psp) {\n+\tcase POWER_SUPPLY_PROP_ONLINE:\n+\t\tregval = sbsm_read_word(data->client, SBSM_CMD_BATSYSSTATECONT);\n+\t\tif (regval < 0)\n+\t\t\treturn regval;\n+\t\tval->intval = !!(regval & SBSM_BIT_AC_PRESENT);\n+\t\tbreak;\n+\n+\tcase POWER_SUPPLY_PROP_CHARGE_TYPE:\n+\t\tregval = sbsm_read_word(data->client, SBSM_CMD_BATSYSSTATE);\n+\t\tif (regval < 0)\n+\t\t\treturn regval;\n+\n+\t\tif ((regval & SBSM_MASK_CHARGE_BAT) == 0) {\n+\t\t\tval->intval = POWER_SUPPLY_CHARGE_TYPE_NONE;\n+\t\t\treturn 0;\n+\t\t}\n+\t\tval->intval = POWER_SUPPLY_CHARGE_TYPE_TRICKLE;\n+\n+\t\tif (data->is_ltc1760) {\n+\t\t\t/* charge mode fast if turbo is active */\n+\t\t\tregval = sbsm_read_word(data->client, SBSM_CMD_LTC);\n+\t\t\tif (regval < 0)\n+\t\t\t\treturn regval;\n+\t\t\telse if (regval & SBSM_BIT_TURBO)\n+\t\t\t\tval->intval = POWER_SUPPLY_CHARGE_TYPE_FAST;\n+\t\t}\n+\t\tbreak;\n+\n+\tdefault:\n+\t\treturn -EINVAL;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int sbsm_prop_is_writeable(struct power_supply *psy,\n+\t\t\t\t enum power_supply_property psp)\n+{\n+\tstruct sbsm_data *data = power_supply_get_drvdata(psy);\n+\n+\treturn (psp == POWER_SUPPLY_PROP_CHARGE_TYPE) && data->is_ltc1760;\n+}\n+\n+static int sbsm_set_property(struct power_supply *psy,\n+\t\t\t enum power_supply_property psp,\n+\t\t\t const union power_supply_propval *val)\n+{\n+\tstruct sbsm_data *data = power_supply_get_drvdata(psy);\n+\tint ret = -EINVAL;\n+\tu16 regval;\n+\n+\tswitch (psp) {\n+\tcase POWER_SUPPLY_PROP_CHARGE_TYPE:\n+\t\t/* write 1 to TURBO if type fast is given */\n+\t\tif (!data->is_ltc1760)\n+\t\t\tbreak;\n+\t\tregval = val->intval ==\n+\t\t\t POWER_SUPPLY_CHARGE_TYPE_FAST ? SBSM_BIT_TURBO : 0;\n+\t\tret = sbsm_write_word(data->client, SBSM_CMD_LTC, regval);\n+\t\tbreak;\n+\n+\tdefault:\n+\t\tbreak;\n+\t}\n+\n+\treturn ret;\n+}\n+\n+/*\n+ * Switch to battery\n+ * Parameter chan is directly the content of SMB_BAT* nibble\n+ */\n+static int sbsm_select(struct i2c_mux_core *muxc, u32 chan)\n+{\n+\tstruct sbsm_data *data = i2c_mux_priv(muxc);\n+\tstruct device *dev = &data->client->dev;\n+\tint ret = 0;\n+\tu16 reg;\n+\n+\tif (data->cur_chan == chan)\n+\t\treturn ret;\n+\n+\t/* chan goes from 1 ... 4 */\n+\treg = 1 << BIT(SBSM_SMB_BAT_OFFSET + chan);\n+\tret = sbsm_write_word(data->client, SBSM_CMD_BATSYSSTATE, reg);\n+\tif (ret)\n+\t\tdev_err(dev, \"Failed to select channel %i\\n\", chan);\n+\telse\n+\t\tdata->cur_chan = chan;\n+\n+\treturn ret;\n+}\n+\n+static const struct power_supply_desc sbsm_default_psy_desc = {\n+\t.type = POWER_SUPPLY_TYPE_MAINS,\n+\t.properties = sbsm_props,\n+\t.num_properties = ARRAY_SIZE(sbsm_props),\n+\t.get_property = &sbsm_get_property,\n+\t.set_property = &sbsm_set_property,\n+\t.property_is_writeable = &sbsm_prop_is_writeable,\n+};\n+\n+static int sbsm_probe(struct i2c_client *client,\n+\t\t const struct i2c_device_id *id)\n+{\n+\tstruct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);\n+\tstruct sbsm_data *data;\n+\tstruct device *dev = &client->dev;\n+\tstruct power_supply_desc *psy_desc;\n+\tstruct power_supply_config psy_cfg = {};\n+\tint ret = 0, i, supported_bats;\n+\n+\t/* Device listens only at address 0x0a */\n+\tif (client->addr != 0x0a)\n+\t\treturn -EINVAL;\n+\n+\tif (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA))\n+\t\treturn -EPFNOSUPPORT;\n+\n+\tdata = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);\n+\tif (!data)\n+\t\treturn -ENOMEM;\n+\n+\ti2c_set_clientdata(client, data);\n+\n+\tdata->client = client;\n+\tdata->is_ltc1760 = !!strstr(id->name, \"ltc1760\");\n+\n+\tret = sbsm_read_word(client, SBSM_CMD_BATSYSINFO);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\tsupported_bats = ret & SBSM_MASK_BAT_SUPPORTED;\n+\n+\tdata->muxc = i2c_mux_alloc(adapter, dev, SBSM_MAX_BATS, 0,\n+\t\t\t\t I2C_MUX_LOCKED, &sbsm_select, NULL);\n+\tif (!data->muxc) {\n+\t\tdev_err(dev, \"failed to alloc i2c mux\\n\");\n+\t\tret = -ENOMEM;\n+\t\tgoto err_mux_alloc;\n+\t}\n+\tdata->muxc->priv = data;\n+\n+\t/* register muxed i2c channels. One for each supported battery */\n+\tfor (i = 0; i < SBSM_MAX_BATS; ++i) {\n+\t\tif (supported_bats & BIT(i)) {\n+\t\t\tret = i2c_mux_add_adapter(data->muxc, 0, i + 1, 0);\n+\t\t\tif (ret)\n+\t\t\t\tbreak;\n+\t\t}\n+\t}\n+\tif (ret) {\n+\t\tdev_err(dev, \"failed to register i2c mux channel %d\\n\", i + 1);\n+\t\tgoto err_mux_register;\n+\t}\n+\n+\tpsy_desc = devm_kmemdup(dev, &sbsm_default_psy_desc,\n+\t\t\t\tsizeof(struct power_supply_desc),\n+\t\t\t\tGFP_KERNEL);\n+\tif (!psy_desc) {\n+\t\tret = -ENOMEM;\n+\t\tgoto err_psy;\n+\t}\n+\n+\tpsy_desc->name = devm_kasprintf(dev, GFP_KERNEL, \"sbsm-%s\",\n+\t\t\t\t\tdev_name(&client->dev));\n+\tif (!psy_desc->name) {\n+\t\tret = -ENOMEM;\n+\t\tgoto err_psy;\n+\t}\n+\n+\tpsy_cfg.drv_data = data;\n+\tpsy_cfg.of_node = dev->of_node;\n+\tdata->psy = devm_power_supply_register(dev, psy_desc, &psy_cfg);\n+\tif (IS_ERR(data->psy)) {\n+\t\tret = PTR_ERR(data->psy);\n+\t\tdev_err(dev, \"failed to register power supply %s\\n\",\n+\t\t\tpsy_desc->name);\n+\t\tgoto err_psy;\n+\t}\n+\n+\treturn 0;\n+\n+err_psy:\n+err_mux_register:\n+\ti2c_mux_del_adapters(data->muxc);\n+\n+err_mux_alloc:\n+\treturn ret;\n+}\n+\n+static int sbsm_remove(struct i2c_client *client)\n+{\n+\tstruct sbsm_data *data = i2c_get_clientdata(client);\n+\n+\ti2c_mux_del_adapters(data->muxc);\n+\treturn 0;\n+}\n+\n+static const struct i2c_device_id sbsm_ids[] = {\n+\t{ \"sbs-manager\", 0 },\n+\t{ \"ltc1760\", 0 },\n+\t{ }\n+};\n+MODULE_DEVICE_TABLE(i2c, sbsm_ids);\n+\n+#ifdef CONFIG_OF\n+static const struct of_device_id sbsm_dt_ids[] = {\n+\t{ .compatible = \"sbs,sbs-manager\" },\n+\t{ .compatible = \"lltc,ltc1760\" },\n+\t{ }\n+};\n+MODULE_DEVICE_TABLE(of, sbsm_dt_ids);\n+#endif\n+\n+static struct i2c_driver sbsm_driver = {\n+\t.driver = {\n+\t\t.name = \"sbsm\",\n+\t\t.of_match_table = of_match_ptr(sbsm_dt_ids),\n+\t},\n+\t.probe\t\t= sbsm_probe,\n+\t.remove\t\t= sbsm_remove,\n+\t.id_table\t= sbsm_ids\n+};\n+module_i2c_driver(sbsm_driver);\n+\n+MODULE_LICENSE(\"GPL\");\n+MODULE_AUTHOR(\"Karl-Heinz Schneider <karl-heinz@schneider-inet.de>\");\n+MODULE_DESCRIPTION(\"SBSM Smart Battery System Manager\");\n", "prefixes": [ "v10", "08/10" ] }