From patchwork Mon Dec 4 14:12:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 120546 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp4487123qgn; Mon, 4 Dec 2017 06:15:22 -0800 (PST) X-Google-Smtp-Source: AGs4zMaxgPki+Pc3xXjmjtyTRiEHIGI1gpTFbYEBDlXe5YnVi8f3uRNPdxWfBNh+L/9/LesyYrda X-Received: by 10.84.246.196 with SMTP id j4mr2143838plt.87.1512396922908; Mon, 04 Dec 2017 06:15:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512396922; cv=none; d=google.com; s=arc-20160816; b=ruxZqIOsi/5j55ZaHf3fXoZF79TdfokruPP4K+TydaBTjidMec7OHidgahpfIh0wrh yquVFjFhx6nzPj1tTjgJFT4V3w9MlklbWzyS2jzx0iHMgvsjzZeJKzdb5cbxFoIgHuc9 97JHs1wN9jzlomeb/IjLbMtHI6Mh+47DK/0c0pSrDLdyn8BzMBCzgxYKkJdG2Pue7edq sy5I6o6+9xYK2luX5k5ki3l+AIPf/GmM4wD1sponrG9Jw3ZMlj0DvCpdUB31mtcmfRu8 TnnsC0nCKVz4KWRZv9lZ6d5ksTwbpWBhrxzYW0UEHS6l4+WmczvLRFndzkZ5Ev+Iiv1b I8JQ== 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=2XmhMbT+i5szK0vKUgPeWDIUl/R/kLyUBP6pa8bxIVs=; b=UGSMbpyRzMkkwGEYUXVdoMSdBd/huJjuASV0GwW34JLR8t68eAQKKFWXuBveymaPle +iLDFvvEafbrZz6i9lG8fzq1eZoRgb7Qe6hLPJ/H2DjOUTOLgmM9kiBIi1rahtllKoZM J8g+qZOqNvn8lyuoaM3FCq4isltcacn8Zp/q0D+P/BRIhnFq7tHriAicKsTr2T3m3NaG 5+PS4i5/CE/frOg2sSGLwaMx3akvK76x6UoAOTV5uLOSW3QaZcUCg9gozaNXeJwl3tSx Y6vE+Cfb7fkn+gK0dNLL7AsYh55hq5525i5YTegdlsiXkggDKGG3ixBhmu8DnW6Yovk8 K4hQ== 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 h9si9420955pgp.365.2017.12.04.06.15.21; Mon, 04 Dec 2017 06:15:22 -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 S1754463AbdLDOPU (ORCPT + 28 others); Mon, 4 Dec 2017 09:15:20 -0500 Received: from mail.free-electrons.com ([62.4.15.54]:54178 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754322AbdLDOPI (ORCPT ); Mon, 4 Dec 2017 09:15:08 -0500 Received: by mail.free-electrons.com (Postfix, from userid 110) id 3FE6520986; Mon, 4 Dec 2017 15:15:06 +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 D82D520999; Mon, 4 Dec 2017 15:14:51 +0100 (CET) From: Quentin Schulz To: sre@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, wens@csie.org, linux@armlinux.org.uk, maxime.ripard@free-electrons.com, jic23@kernel.org, lee.jones@linaro.org Cc: knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-iio@vger.kernel.org, icenowy@aosc.io, linux-sunxi@googlegroups.com, thomas.petazzoni@free-electrons.com, Quentin Schulz Subject: [PATCH 5/8] power: supply: axp20x_battery: add support for AXP813 Date: Mon, 4 Dec 2017 15:12:51 +0100 Message-Id: <545d3aa6339c9e33060d651c42d652d0b848c06b.1512396054.git-series.quentin.schulz@free-electrons.com> 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 | 44 +++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) -- git-series 0.9.1 diff --git a/drivers/power/supply/axp20x_battery.c b/drivers/power/supply/axp20x_battery.c index 7494f0f..cb30302 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) @@ -123,10 +125,41 @@ 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 void raw_to_constant_charge_current(struct axp20x_batt_ps *axp, int *val) { if (axp->axp_id == AXP209_ID) *val = *val * 100000 + 300000; + else if (axp->axp_id == AXP813_ID) + *val = *val * 200000 + 200000; else *val = *val * 150000 + 300000; } @@ -135,6 +168,8 @@ static void constant_charge_current_to_raw(struct axp20x_batt_ps *axp, int *val) { if (axp->axp_id == AXP209_ID) *val = (*val - 300000) / 100000; + else if (axp->axp_id == AXP813_ID) + *val = (*val - 200000) / 200000; else *val = (*val - 300000) / 150000; } @@ -269,7 +304,8 @@ static int axp20x_battery_get_prop(struct power_supply *psy, if (ret) return ret; - if (axp20x_batt->axp_id == AXP221_ID && + if ((axp20x_batt->axp_id == AXP221_ID || + axp20x_batt->axp_id == AXP813_ID) && !(reg & AXP22X_FG_VALID)) return -EINVAL; @@ -284,6 +320,9 @@ static int axp20x_battery_get_prop(struct power_supply *psy, if (axp20x_batt->axp_id == AXP209_ID) return axp20x_battery_get_max_voltage(axp20x_batt, &val->intval); + else if (axp20x_batt->axp_id == AXP813_ID) + return axp813_battery_get_max_voltage(axp20x_batt, + &val->intval); return axp22x_battery_get_max_voltage(axp20x_batt, &val->intval); @@ -467,6 +506,9 @@ static const struct of_device_id axp20x_battery_ps_id[] = { }, { .compatible = "x-powers,axp221-battery-power-supply", .data = (void *)AXP221_ID, + }, { + .compatible = "x-powers,axp813-battery-power-supply", + .data = (void *)AXP813_ID, }, { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, axp20x_battery_ps_id);