From patchwork Tue Jan 10 05:25:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: chris@lapa.com.au X-Patchwork-Id: 9506345 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 929A460710 for ; Tue, 10 Jan 2017 05:29:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8990628528 for ; Tue, 10 Jan 2017 05:29:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7B6E228173; Tue, 10 Jan 2017 05:29:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D4F8228173 for ; Tue, 10 Jan 2017 05:29:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S940176AbdAJFZ6 (ORCPT ); Tue, 10 Jan 2017 00:25:58 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:34997 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S940100AbdAJFZy (ORCPT ); Tue, 10 Jan 2017 00:25:54 -0500 Received: by mail-pf0-f195.google.com with SMTP id f144so8124024pfa.2 for ; Mon, 09 Jan 2017 21:25:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lapa-com-au.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=v3WwQ9HD+n3L3hWY0IMHO9IzKK/+fr06O37ELNrYWOw=; b=N+Ef/9MLZM+QmQlLgAznW8buNERFglxFHeMaB0oRiKSpAyA7yz9+qvaoVwRm+LIH8c DWpnJYqHdhwURo12qOwuPL7XMOoKNmR4vK8f0uM9YhIj2w4/mKD8i5qC/9Qn6cL8hcn7 /lXMkEg4r1HaUwaY77G8aYbm3TypbEPYWk6lrAIoOiLrRBLvi+AfU6nMbaniTxcOD9x4 8Mb/80XEE6cjln3pp4CNyYhLCpx2VOHP+eDLvubiCTX8dJVDoooCw/437FYJUz9hs4iI ezVpL3a+RJyDNCEWQtbSfFYeFZ6dBm4SDyx9G+G0n/j4xJzkmb0EAAx/z1kmTCOffOjK BJzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=v3WwQ9HD+n3L3hWY0IMHO9IzKK/+fr06O37ELNrYWOw=; b=lqf6K89XIhpuJBt4wOxUdiVmwWGgZ9vvqoby4MkSG6nAZye/YL8LulCjGV900HcRzo w9slFNopUvqpNFjr2+/+OaJCI1JfRQxGB7DuKJBn/F1RfjGbFBWPpIO0dFR1jeIUtsOz uwaQaMnuH2KpClHC+GQ84SlxjPAb9CCpOlnw4lyV+pKfCPflHhXTtO5GPf15HFmNXiZM PJtooINQ9+P31fPcBRoBhVxRbwnq/aPvpLtfWvoxM9eLV3rnQ/8MemyNAj+Sd3U0NrSP KIsc5iXoVieFFuWTxIoX0In6elBpr15chrGZxhnYIT3CIQoZcF9NtQ7gJqUJjXIzZZxm Q2GA== X-Gm-Message-State: AIkVDXLO0xaSnlfKSFgN4Ef8aI/E2mpLvL+C/UfeQ251tV+GwsT+pO3HjlM7gvkoinMVNg== X-Received: by 10.99.126.27 with SMTP id z27mr1774139pgc.177.1484025953625; Mon, 09 Jan 2017 21:25:53 -0800 (PST) Received: from generaldeb-vm.management.cpd (163.164.70.115.static.exetel.com.au. [115.70.164.163]) by smtp.gmail.com with ESMTPSA id n8sm1534962pgc.0.2017.01.09.21.25.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Jan 2017 21:25:53 -0800 (PST) From: Chris Lapa X-Google-Original-From: Chris Lapa To: pali.rohar@gmail.com, afd@ti.com, sre@kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Chris Lapa Subject: [PATCH v4 02/10] power: supplies: bq27xxx: adds specific support for bq27500/1 revision. Date: Tue, 10 Jan 2017 16:25:30 +1100 Message-Id: <1484025938-114133-3-git-send-email-chris@lapa.com.au> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1484025938-114133-1-git-send-email-chris@lapa.com.au> References: <1482369743-79764-1-git-send-email-chris@lapa.com.au> <1484025938-114133-1-git-send-email-chris@lapa.com.au> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Chris Lapa This commit adds the BQ27500 chip definition to specifically match the bq27500/1 functionality as described in the datasheet. tested: no Signed-off-by: Chris Lapa Acked-by: Pali Rohár Reviewed-by: Andrew F. Davis --- drivers/power/supply/bq27xxx_battery.c | 27 ++++++++++++++++----------- drivers/power/supply/bq27xxx_battery_i2c.c | 2 ++ include/linux/power/bq27xxx_battery.h | 1 + 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c index a86417c..bf0dbf5 100644 --- a/drivers/power/supply/bq27xxx_battery.c +++ b/drivers/power/supply/bq27xxx_battery.c @@ -164,24 +164,24 @@ static u8 bq27xxx_regs[][BQ27XXX_REG_MAX] = { [BQ27XXX_REG_DCAP] = 0x3c, [BQ27XXX_REG_AP] = INVALID_REG_ADDR, }, - [BQ27510] = { + [BQ27500] = { [BQ27XXX_REG_CTRL] = 0x00, [BQ27XXX_REG_TEMP] = 0x06, - [BQ27XXX_REG_INT_TEMP] = 0x28, + [BQ27XXX_REG_INT_TEMP] = INVALID_REG_ADDR, [BQ27XXX_REG_VOLT] = 0x08, [BQ27XXX_REG_AI] = 0x14, [BQ27XXX_REG_FLAGS] = 0x0a, [BQ27XXX_REG_TTE] = 0x16, - [BQ27XXX_REG_TTF] = INVALID_REG_ADDR, - [BQ27XXX_REG_TTES] = 0x1a, - [BQ27XXX_REG_TTECP] = INVALID_REG_ADDR, + [BQ27XXX_REG_TTF] = 0x18, + [BQ27XXX_REG_TTES] = 0x1c, + [BQ27XXX_REG_TTECP] = 0x26, [BQ27XXX_REG_NAC] = 0x0c, [BQ27XXX_REG_FCC] = 0x12, - [BQ27XXX_REG_CYCT] = 0x1e, - [BQ27XXX_REG_AE] = INVALID_REG_ADDR, - [BQ27XXX_REG_SOC] = 0x20, - [BQ27XXX_REG_DCAP] = 0x2e, - [BQ27XXX_REG_AP] = INVALID_REG_ADDR, + [BQ27XXX_REG_CYCT] = 0x2a, + [BQ27XXX_REG_AE] = 0x22, + [BQ27XXX_REG_SOC] = 0x2c, + [BQ27XXX_REG_DCAP] = 0x3c, + [BQ27XXX_REG_AP] = 0x24, }, [BQ27530] = { [BQ27XXX_REG_CTRL] = 0x00, @@ -321,7 +321,7 @@ static enum power_supply_property bq275xx_battery_props[] = { POWER_SUPPLY_PROP_MANUFACTURER, }; -static enum power_supply_property bq27510_battery_props[] = { +static enum power_supply_property bq27500_battery_props[] = { POWER_SUPPLY_PROP_STATUS, POWER_SUPPLY_PROP_PRESENT, POWER_SUPPLY_PROP_VOLTAGE_NOW, @@ -330,11 +330,14 @@ static enum power_supply_property bq27510_battery_props[] = { POWER_SUPPLY_PROP_CAPACITY_LEVEL, POWER_SUPPLY_PROP_TEMP, POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW, + POWER_SUPPLY_PROP_TIME_TO_FULL_NOW, POWER_SUPPLY_PROP_TECHNOLOGY, POWER_SUPPLY_PROP_CHARGE_FULL, POWER_SUPPLY_PROP_CHARGE_NOW, POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN, POWER_SUPPLY_PROP_CYCLE_COUNT, + POWER_SUPPLY_PROP_ENERGY_NOW, + POWER_SUPPLY_PROP_POWER_AVG, POWER_SUPPLY_PROP_HEALTH, POWER_SUPPLY_PROP_MANUFACTURER, }; @@ -422,6 +425,7 @@ static struct { BQ27XXX_PROP(BQ27000, bq27000_battery_props), BQ27XXX_PROP(BQ27010, bq27010_battery_props), BQ27XXX_PROP(BQ275XX, bq275xx_battery_props), + BQ27XXX_PROP(BQ27500, bq27500_battery_props), BQ27XXX_PROP(BQ27530, bq27530_battery_props), BQ27XXX_PROP(BQ27541, bq27541_battery_props), BQ27XXX_PROP(BQ27545, bq27545_battery_props), @@ -675,6 +679,7 @@ static bool bq27xxx_battery_overtemp(struct bq27xxx_device_info *di, u16 flags) { switch (di->chip) { case BQ275XX: + case BQ27500: case BQ27541: case BQ27545: return flags & (BQ27XXX_FLAG_OTC | BQ27XXX_FLAG_OTD); diff --git a/drivers/power/supply/bq27xxx_battery_i2c.c b/drivers/power/supply/bq27xxx_battery_i2c.c index 762d96e..a01b35d 100644 --- a/drivers/power/supply/bq27xxx_battery_i2c.c +++ b/drivers/power/supply/bq27xxx_battery_i2c.c @@ -151,6 +151,7 @@ static const struct i2c_device_id bq27xxx_i2c_id_table[] = { { "bq27500", BQ275XX }, { "bq27510", BQ275XX }, { "bq27520", BQ275XX }, + { "bq27500-1", BQ27500 }, { "bq27530", BQ27530 }, { "bq27531", BQ27530 }, { "bq27541", BQ27541 }, @@ -173,6 +174,7 @@ static const struct of_device_id bq27xxx_battery_i2c_of_match_table[] = { { .compatible = "ti,bq27500" }, { .compatible = "ti,bq27510" }, { .compatible = "ti,bq27520" }, + { .compatible = "ti,bq27500-1" }, { .compatible = "ti,bq27530" }, { .compatible = "ti,bq27531" }, { .compatible = "ti,bq27541" }, diff --git a/include/linux/power/bq27xxx_battery.h b/include/linux/power/bq27xxx_battery.h index c452b94..7d2a415 100644 --- a/include/linux/power/bq27xxx_battery.h +++ b/include/linux/power/bq27xxx_battery.h @@ -5,6 +5,7 @@ enum bq27xxx_chip { BQ27000 = 1, /* bq27000, bq27200 */ BQ27010, /* bq27010, bq27210 */ BQ275XX, /* bq27500, bq27510, bq27520 deprecated alias */ + BQ27500, /* bq27500/1 */ BQ27530, /* bq27530, bq27531 */ BQ27541, /* bq27541, bq27542, bq27546, bq27742 */ BQ27545, /* bq27545 */