From patchwork Fri Mar 17 09:55:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 740219 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vl19W1fyQz9s0Z for ; Fri, 17 Mar 2017 21:02:39 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751088AbdCQKCg (ORCPT ); Fri, 17 Mar 2017 06:02:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41848 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751049AbdCQJ4t (ORCPT ); Fri, 17 Mar 2017 05:56:49 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8BD5B2BCD7C; Fri, 17 Mar 2017 09:55:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8BD5B2BCD7C Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=hdegoede@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 8BD5B2BCD7C Received: from shalem.localdomain.com (ovpn-116-172.ams2.redhat.com [10.36.116.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id 21E845C3FD; Fri, 17 Mar 2017 09:55:52 +0000 (UTC) From: Hans de Goede To: "Rafael J . Wysocki" , Len Brown , Wolfram Sang , Andy Shevchenko , Lee Jones , Sebastian Reichel , MyungJoo Ham , Chanwoo Choi Cc: Hans de Goede , linux-acpi@vger.kernel.org, Takashi Iwai , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH 08/15] power: supply: bq24190_charger: Add support for external fuel gauge Date: Fri, 17 Mar 2017 10:55:20 +0100 Message-Id: <20170317095527.10487-9-hdegoede@redhat.com> In-Reply-To: <20170317095527.10487-1-hdegoede@redhat.com> References: <20170317095527.10487-1-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 17 Mar 2017 09:55:55 +0000 (UTC) Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Some platforms with a bq24190_charger have an external fuel gauge which makes it possible to reliably report battery (dis)charge state, at support for this by adding an optional get_ext_bat_property callback to the platform_data and using this if the platform provides it. By convention the callback will return -ENXIO when it is not ready yet, or the driver providing it has been unbound from its device. Since it returns the same error when unbound it cannot return -EPROBE_DEFER as that is not a valid errno. Signed-off-by: Hans de Goede --- drivers/power/supply/bq24190_charger.c | 41 +++++++++++++++++++++++++++++++--- include/linux/power/bq24190_charger.h | 4 ++++ 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/drivers/power/supply/bq24190_charger.c b/drivers/power/supply/bq24190_charger.c index 9014dee..9fe69a5 100644 --- a/drivers/power/supply/bq24190_charger.c +++ b/drivers/power/supply/bq24190_charger.c @@ -1111,7 +1111,10 @@ static int bq24190_battery_get_property(struct power_supply *psy, ret = 0; break; default: - ret = -ENODATA; + if (bdi->pdata && bdi->pdata->get_ext_bat_property) + ret = bdi->pdata->get_ext_bat_property(psp, val); + else + ret = -ENODATA; } pm_runtime_put_sync(bdi->dev); @@ -1168,12 +1171,31 @@ static enum power_supply_property bq24190_battery_properties[] = { POWER_SUPPLY_PROP_TECHNOLOGY, POWER_SUPPLY_PROP_TEMP_ALERT_MAX, POWER_SUPPLY_PROP_SCOPE, + /* Begin of extended battery properties */ + POWER_SUPPLY_PROP_VOLTAGE_NOW, + POWER_SUPPLY_PROP_VOLTAGE_AVG, + POWER_SUPPLY_PROP_VOLTAGE_OCV, + POWER_SUPPLY_PROP_CURRENT_NOW, + POWER_SUPPLY_PROP_CURRENT_AVG, + POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN, + POWER_SUPPLY_PROP_CHARGE_FULL, + POWER_SUPPLY_PROP_CHARGE_NOW, }; static const struct power_supply_desc bq24190_battery_desc = { .name = "bq24190-battery", .type = POWER_SUPPLY_TYPE_BATTERY, .properties = bq24190_battery_properties, + .num_properties = 6, + .get_property = bq24190_battery_get_property, + .set_property = bq24190_battery_set_property, + .property_is_writeable = bq24190_battery_property_is_writeable, +}; + +static const struct power_supply_desc bq24190_ext_battery_desc = { + .name = "bq24190-battery", + .type = POWER_SUPPLY_TYPE_BATTERY, + .properties = bq24190_battery_properties, .num_properties = ARRAY_SIZE(bq24190_battery_properties), .get_property = bq24190_battery_get_property, .set_property = bq24190_battery_set_property, @@ -1336,6 +1358,15 @@ static int bq24190_probe(struct i2c_client *client, return -EINVAL; } + if (bdi->pdata && bdi->pdata->get_ext_bat_property) { + union power_supply_propval val; + + /* Check external fuel gauge is ready */ + ret = bdi->pdata->get_ext_bat_property(0, &val); + if (ret == -ENXIO) + return -EPROBE_DEFER; + } + pm_runtime_enable(dev); pm_runtime_resume(dev); @@ -1357,8 +1388,12 @@ static int bq24190_probe(struct i2c_client *client, } battery_cfg.drv_data = bdi; - bdi->battery = power_supply_register(dev, &bq24190_battery_desc, - &battery_cfg); + if (bdi->pdata && bdi->pdata->get_ext_bat_property) + bdi->battery = power_supply_register(dev, + &bq24190_ext_battery_desc, &battery_cfg); + else + bdi->battery = power_supply_register(dev, + &bq24190_battery_desc, &battery_cfg); if (IS_ERR(bdi->battery)) { dev_err(dev, "Can't register battery\n"); ret = PTR_ERR(bdi->battery); diff --git a/include/linux/power/bq24190_charger.h b/include/linux/power/bq24190_charger.h index 8d918cb..02d248b 100644 --- a/include/linux/power/bq24190_charger.h +++ b/include/linux/power/bq24190_charger.h @@ -9,8 +9,12 @@ #ifndef _BQ24190_CHARGER_H_ #define _BQ24190_CHARGER_H_ +#include + struct bq24190_platform_data { bool no_register_reset; + int (*get_ext_bat_property)(enum power_supply_property prop, + union power_supply_propval *val); }; #endif