From patchwork Wed Sep 9 00:12:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Dannenberg X-Patchwork-Id: 7143861 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 14A7B9F1BF for ; Wed, 9 Sep 2015 00:13:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2B5DF20772 for ; Wed, 9 Sep 2015 00:13:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D1BE520763 for ; Wed, 9 Sep 2015 00:13:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754168AbbIIANw (ORCPT ); Tue, 8 Sep 2015 20:13:52 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:59821 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753945AbbIIANv (ORCPT ); Tue, 8 Sep 2015 20:13:51 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id t890DO3S028108; Tue, 8 Sep 2015 19:13:25 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id t890DOu4021863; Tue, 8 Sep 2015 19:13:24 -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; Tue, 8 Sep 2015 19:13:17 -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 t890D0S5019642; Tue, 8 Sep 2015 19:13:19 -0500 From: Andreas Dannenberg To: Sebastian Reichel , Dmitry Eremin-Solenikov , David Woodhouse , Laurentiu Palcu , Krzysztof Kozlowski CC: , , Andreas Dannenberg Subject: [PATCH v2 06/13] power: bq24257: Add input DPM voltage threshold setting support Date: Tue, 8 Sep 2015 19:12:30 -0500 Message-ID: <1441757557-7266-7-git-send-email-dannenberg@ti.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1441757557-7266-1-git-send-email-dannenberg@ti.com> References: <1441757557-7266-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 A new optional device property called "ti,in-dpm-voltage" is introduced to allow configuring the input voltage threshold for the devices' dynamic power path management (DPM) feature. In short, it can be used to prevent the input voltage from dropping below a certain value as current is drawn to charge the battery or supply the system. Signed-off-by: Andreas Dannenberg Reviewed-by: Laurentiu Palcu --- drivers/power/bq24257_charger.c | 42 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/drivers/power/bq24257_charger.c b/drivers/power/bq24257_charger.c index 917609b..c160fde 100644 --- a/drivers/power/bq24257_charger.c +++ b/drivers/power/bq24257_charger.c @@ -76,6 +76,7 @@ struct bq24257_init_data { u8 iterm; /* termination current */ u8 in_ilimit; /* input current limit */ u8 vovp; /* over voltage protection voltage */ + u8 vindpm; /* VDMP input threshold voltage */ }; struct bq24257_state { @@ -206,6 +207,13 @@ static const u32 bq24257_vovp_map[] = { #define BQ24257_VOVP_MAP_SIZE ARRAY_SIZE(bq24257_vovp_map) +static const u32 bq24257_vindpm_map[] = { + 4200000, 4280000, 4360000, 4440000, 4520000, 4600000, 4680000, + 4760000 +}; + +#define BQ24257_VINDPM_MAP_SIZE ARRAY_SIZE(bq24257_vindpm_map) + static int bq24257_field_read(struct bq24257_device *bq, enum bq24257_fields field_id) { @@ -432,6 +440,17 @@ enum bq24257_vovp { VOVP_10500 }; +enum bq24257_vindpm { + VINDPM_4200, + VINDPM_4280, + VINDPM_4360, + VINDPM_4440, + VINDPM_4520, + VINDPM_4600, + VINDPM_4680, + VINDPM_4760 +}; + enum bq24257_port_type { PORT_TYPE_DCP, /* Dedicated Charging Port */ PORT_TYPE_CDP, /* Charging Downstream Port */ @@ -615,6 +634,7 @@ static int bq24257_hw_init(struct bq24257_device *bq) {F_VBAT, bq->init_data.vbat}, {F_ITERM, bq->init_data.iterm}, {F_VOVP, bq->init_data.vovp}, + {F_VINDPM, bq->init_data.vindpm}, }; /* @@ -648,6 +668,7 @@ static int bq24257_hw_init(struct bq24257_device *bq) /* program fixed input current limit */ ret = bq24257_field_write(bq, F_IILIMIT, bq->init_data.in_ilimit); + if (ret < 0) return ret; } else if (!state.power_good) @@ -695,10 +716,23 @@ static ssize_t bq24257_show_ovp_voltage(struct device *dev, bq24257_vovp_map[bq->init_data.vovp]); } +static ssize_t bq24257_show_in_dpm_voltage(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct power_supply *psy = dev_get_drvdata(dev); + struct bq24257_device *bq = power_supply_get_drvdata(psy); + + return scnprintf(buf, PAGE_SIZE, "%d\n", + bq24257_vindpm_map[bq->init_data.vindpm]); +} + static DEVICE_ATTR(ovp_voltage, S_IRUGO, bq24257_show_ovp_voltage, NULL); +static DEVICE_ATTR(in_dpm_voltage, S_IRUGO, bq24257_show_in_dpm_voltage, NULL); static struct attribute *bq24257_charger_attr[] = { &dev_attr_ovp_voltage.attr, + &dev_attr_in_dpm_voltage.attr, NULL, }; @@ -798,6 +832,14 @@ static int bq24257_fw_probe(struct bq24257_device *bq) bq->init_data.vovp = bq24257_find_idx(property, bq24257_vovp_map, BQ24257_VOVP_MAP_SIZE); + ret = device_property_read_u32(bq->dev, "ti,in-dpm-voltage", + &property); + if (ret < 0) + bq->init_data.vindpm = VINDPM_4360; + else + bq->init_data.vindpm = bq24257_find_idx(property, + bq24257_vindpm_map, BQ24257_VINDPM_MAP_SIZE); + return 0; }