From patchwork Tue Sep 1 02:10:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Dannenberg X-Patchwork-Id: 7102481 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1FF54BEEC1 for ; Tue, 1 Sep 2015 02:11:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3A6D920696 for ; Tue, 1 Sep 2015 02:11:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 39B652068F for ; Tue, 1 Sep 2015 02:11:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754796AbbIACLu (ORCPT ); Mon, 31 Aug 2015 22:11:50 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:37595 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754790AbbIACLu (ORCPT ); Mon, 31 Aug 2015 22:11:50 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id t812BPhI020060; Mon, 31 Aug 2015 21:11:25 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id t812BPe0011361; Mon, 31 Aug 2015 21:11:25 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.224.2; Mon, 31 Aug 2015 21:11:25 -0500 Received: from beast.tx.rr.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id t812AkYa004175; Mon, 31 Aug 2015 21:11:20 -0500 From: Andreas Dannenberg To: Sebastian Reichel , Dmitry Eremin-Solenikov , David Woodhouse , Laurentiu Palcu , Krzysztof Kozlowski CC: , , Andreas Dannenberg Subject: [PATCH 09/13] power: bq24257: Add charge type setting support Date: Mon, 31 Aug 2015 21:10:31 -0500 Message-ID: <1441073435-12349-10-git-send-email-dannenberg@ti.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1441073435-12349-1-git-send-email-dannenberg@ti.com> References: <1441073435-12349-1-git-send-email-dannenberg@ti.com> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The bq2425x devices support charging with a configurable charge current i_chg or a specific fixed low-current in what's called Low Charge mode. This patch exposes access to the Low Charge mode through a POWER_ SUPPLY_PROP_CHARGE_TYPE sysfs property value of POWER_SUPPLY_CHARGE_ TYPE_TRICKLE. It also allows to completely disable charging if desired by setting the property to POWER_SUPPLY_CHARGE_TYPE_NONE. Normal charging with the configured i_chg current is activated through POWER_SUPPLY_CHARGE_TYPE_FAST (default). Signed-off-by: Andreas Dannenberg --- drivers/power/bq24257_charger.c | 90 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/drivers/power/bq24257_charger.c b/drivers/power/bq24257_charger.c index ad3fd2d..7b66030 100644 --- a/drivers/power/bq24257_charger.c +++ b/drivers/power/bq24257_charger.c @@ -262,6 +262,56 @@ enum bq24257_fault { FAULT_INPUT_LDO_LOW, }; +static int bq24257_get_charge_type(struct bq24257_device *bq, + union power_supply_propval *val) +{ + int ret; + + ret = bq24257_field_read(bq, F_CE); + if (ret < 0) + return ret; + + /* Charge Enable is active-low */ + if (ret) { + val->intval = POWER_SUPPLY_CHARGE_TYPE_NONE; + return 0; + } + + /* Low Charge means a fixed low-current is used instead of i_chg */ + ret = bq24257_field_read(bq, F_LOW_CHG); + if (ret < 0) + return ret; + + val->intval = ret ? POWER_SUPPLY_CHARGE_TYPE_TRICKLE : + POWER_SUPPLY_CHARGE_TYPE_FAST; + + return 0; +} + +static int bq24257_set_charge_type(struct bq24257_device *bq, + const union power_supply_propval *val) +{ + int ret; + + switch (val->intval) { + case POWER_SUPPLY_CHARGE_TYPE_NONE: + return bq24257_field_write(bq, F_CE, 1); + case POWER_SUPPLY_CHARGE_TYPE_TRICKLE: + ret = bq24257_field_write(bq, F_LOW_CHG, 1); + break; + case POWER_SUPPLY_CHARGE_TYPE_FAST: + ret = bq24257_field_write(bq, F_LOW_CHG, 0); + break; + default: + return -EINVAL; + } + + if (ret < 0) + return ret; + + return bq24257_field_write(bq, F_CE, 0); +} + static int bq24257_power_supply_get_property(struct power_supply *psy, enum power_supply_property psp, union power_supply_propval *val) @@ -287,6 +337,10 @@ static int bq24257_power_supply_get_property(struct power_supply *psy, val->intval = POWER_SUPPLY_STATUS_UNKNOWN; break; + case POWER_SUPPLY_PROP_CHARGE_TYPE: + ret = bq24257_get_charge_type(bq, val); + break; + case POWER_SUPPLY_PROP_MANUFACTURER: val->strval = BQ24257_MANUFACTURER; break; @@ -359,6 +413,39 @@ static int bq24257_power_supply_get_property(struct power_supply *psy, return ret; } +static int bq24257_power_supply_set_property(struct power_supply *psy, + enum power_supply_property prop, + const union power_supply_propval *val) +{ + struct bq24257_device *bq = power_supply_get_drvdata(psy); + int ret; + + mutex_lock(&bq->lock); + + switch (prop) { + case POWER_SUPPLY_PROP_CHARGE_TYPE: + ret = bq24257_set_charge_type(bq, val); + break; + default: + ret = -EINVAL; + } + + mutex_unlock(&bq->lock); + + return ret; +} + +static int bq24257_power_supply_property_is_writeable(struct power_supply *psy, + enum power_supply_property psp) +{ + switch (psp) { + case POWER_SUPPLY_PROP_CHARGE_TYPE: + return true; + default: + return false; + } +} + static int bq24257_get_chip_state(struct bq24257_device *bq, struct bq24257_state *state) { @@ -684,6 +771,7 @@ static enum power_supply_property bq24257_power_supply_props[] = { POWER_SUPPLY_PROP_MANUFACTURER, POWER_SUPPLY_PROP_MODEL_NAME, POWER_SUPPLY_PROP_STATUS, + POWER_SUPPLY_PROP_CHARGE_TYPE, POWER_SUPPLY_PROP_ONLINE, POWER_SUPPLY_PROP_HEALTH, POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT, @@ -703,6 +791,8 @@ static const struct power_supply_desc bq24257_power_supply_desc = { .properties = bq24257_power_supply_props, .num_properties = ARRAY_SIZE(bq24257_power_supply_props), .get_property = bq24257_power_supply_get_property, + .set_property = bq24257_power_supply_set_property, + .property_is_writeable = bq24257_power_supply_property_is_writeable }; static ssize_t bq24257_show_ovp_voltage(struct device *dev,