From patchwork Tue Jan 9 09:33:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 123829 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp3803966qgn; Tue, 9 Jan 2018 01:37:25 -0800 (PST) X-Google-Smtp-Source: ACJfBotyxOklmFoaP9f6G12QtEZeKKkgJQGnlrRUK6SwfcDJi1IEidDp7cM6zWpauVjLAJbLvZHF X-Received: by 10.101.93.71 with SMTP id e7mr11931870pgt.342.1515490645061; Tue, 09 Jan 2018 01:37:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515490645; cv=none; d=google.com; s=arc-20160816; b=kW88Yj+JR4QlBglmNrIQUz+lSuFR3WVy9zdy09kUnuMlK/MQl10d8QGQI+5U761Kme lO/2m9ji6AI3lgNBGIoBTo8SlyMZCj+cDhSGXAIsgS2BpdddHHEWob6BOaC39tCW6Xq8 6Gl3FLwEDOqFBcDiq16OE6b8HQ1j8HmPIQybaq7NzRhV4Gi++tCITqZ5Bksa2Min5RXa TS49EGt6G752xvExgvj469ok+T9PrchZ2sHZCmwDx/vxnaHLDREZSTIjC5IN2UUBjhoB 6xUqP4t99XQJscdJvr88jxIOzOIJ8c9C1o5rzIYlMNoCG+Y6N6/FdnQJvFQKHQqOAKCZ xYCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=n6RGrh130yVCgtGXOLSBlb/8Nk1rs6kdlNB3hp5EUZg=; b=DVmElsIcr3GcEvqLJ/2O/clyTJr/LmWSZfeqFCuaGvqT49ICvyN2kpPALMmUU/SuoJ Tnc0pWrMKdcfE07yp5bhmYaXwK252BkZQXWhxRPHcPL7tjHBCkJiP6Q1cy5PNhyRn7bW To74AuaW2lBLXl4xOD5cxILW/bytUnMsUAZZOa/JeSpS5oJE78c+tpUg9HwY7pDkX7ie fzv95PbR3D2+wSx/AvQEmy8q16ChtAKxStiGfYtS2qTud/4c6xQva+poeoypg5PrIb/w NP9H8U8uZ7LRmANENXiI8bEAC68yRFisEXn52pEsLlXpP6pBzx2mfFyLVjRRM4OPKYGS 0yrg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 20si2792849pgd.240.2018.01.09.01.37.24; Tue, 09 Jan 2018 01:37:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752953AbeAIJf0 (ORCPT + 28 others); Tue, 9 Jan 2018 04:35:26 -0500 Received: from mail.free-electrons.com ([62.4.15.54]:45828 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752771AbeAIJfN (ORCPT ); Tue, 9 Jan 2018 04:35:13 -0500 Received: by mail.free-electrons.com (Postfix, from userid 110) id 8846F20A07; Tue, 9 Jan 2018 10:35:10 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0 Received: from localhost.localdomain (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id A0BA82092C; Tue, 9 Jan 2018 10:34:53 +0100 (CET) From: Quentin Schulz To: jic23@kernel.org, knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net, robh+dt@kernel.org, mark.rutland@arm.com, wens@csie.org, sre@kernel.org, linux@armlinux.org.uk, maxime.ripard@free-electrons.com, lee.jones@linaro.org Cc: linux-iio@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, thomas.petazzoni@free-electrons.com, linux-sunxi@googlegroups.com, Quentin Schulz Subject: [PATCH v2 13/16] power: supply: axp20x_battery: add support for AXP813 Date: Tue, 9 Jan 2018 10:33:44 +0100 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The X-Powers AXP813 PMIC has got some slight differences from AXP20X/AXP22X PMICs: - the maximum voltage supplied by the PMIC is 4.35 instead of 4.36/4.24 for AXP20X/AXP22X, - the constant charge current formula is different, It also has a bit to tell whether the battery percentage returned by the PMIC is valid. Signed-off-by: Quentin Schulz --- drivers/power/supply/axp20x_battery.c | 42 ++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+) -- git-series 0.9.1 diff --git a/drivers/power/supply/axp20x_battery.c b/drivers/power/supply/axp20x_battery.c index d73c78f..dad72a5 100644 --- a/drivers/power/supply/axp20x_battery.c +++ b/drivers/power/supply/axp20x_battery.c @@ -46,6 +46,8 @@ #define AXP20X_CHRG_CTRL1_TGT_4_2V (2 << 5) #define AXP20X_CHRG_CTRL1_TGT_4_36V (3 << 5) +#define AXP813_CHRG_CTRL1_TGT_4_35V (3 << 5) + #define AXP22X_CHRG_CTRL1_TGT_4_22V (1 << 5) #define AXP22X_CHRG_CTRL1_TGT_4_24V (3 << 5) @@ -133,6 +135,35 @@ static int axp22x_battery_get_max_voltage(struct axp20x_batt_ps *axp20x_batt, return 0; } +static int axp813_battery_get_max_voltage(struct axp20x_batt_ps *axp20x_batt, + int *val) +{ + int ret, reg; + + ret = regmap_read(axp20x_batt->regmap, AXP20X_CHRG_CTRL1, ®); + if (ret) + return ret; + + switch (reg & AXP20X_CHRG_CTRL1_TGT_VOLT) { + case AXP20X_CHRG_CTRL1_TGT_4_1V: + *val = 4100000; + break; + case AXP20X_CHRG_CTRL1_TGT_4_15V: + *val = 4150000; + break; + case AXP20X_CHRG_CTRL1_TGT_4_2V: + *val = 4200000; + break; + case AXP813_CHRG_CTRL1_TGT_4_35V: + *val = 4350000; + break; + default: + return -EINVAL; + } + + return 0; +} + static int axp20x_get_constant_charge_current(struct axp20x_batt_ps *axp, int *val) { @@ -491,6 +522,14 @@ struct axp_data axp221_data = { .set_max_voltage = axp22x_battery_set_max_voltage, }; +struct axp_data axp813_data = { + .ccc_scale = 200000, + .ccc_offset = 200000, + .has_fg_valid = true, + .get_max_voltage = axp813_battery_get_max_voltage, + .set_max_voltage = axp20x_battery_set_max_voltage, +}; + static const struct of_device_id axp20x_battery_ps_id[] = { { .compatible = "x-powers,axp209-battery-power-supply", @@ -498,6 +537,9 @@ static const struct of_device_id axp20x_battery_ps_id[] = { }, { .compatible = "x-powers,axp221-battery-power-supply", .data = (void *)&axp221_data, + }, { + .compatible = "x-powers,axp813-battery-power-supply", + .data = (void *)&axp813_data, }, { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, axp20x_battery_ps_id);