From patchwork Sun Jan 22 07:14:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Ranostay X-Patchwork-Id: 9530795 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 5178A6049F for ; Sun, 22 Jan 2017 07:14:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4297428339 for ; Sun, 22 Jan 2017 07:14:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 376CF2836D; Sun, 22 Jan 2017 07:14:17 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham 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 C883028339 for ; Sun, 22 Jan 2017 07:14:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751292AbdAVHOO (ORCPT ); Sun, 22 Jan 2017 02:14:14 -0500 Received: from mail-pf0-f178.google.com ([209.85.192.178]:35255 "EHLO mail-pf0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750964AbdAVHOJ (ORCPT ); Sun, 22 Jan 2017 02:14:09 -0500 Received: by mail-pf0-f178.google.com with SMTP id f144so32922196pfa.2 for ; Sat, 21 Jan 2017 23:14:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ranostay-consulting.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Sj8awgx+Z3o/eSHbB7aIk73kgiygcFDyxAVZxjmICCU=; b=WAuEQw6+55pV7dyrOR72OKEx5kRTTwbrgTiE2IE2zRyWs3xF7hDXRvF2Ku/ocPSiVM ehgwhmzL58FxZynygYUPFe5xCMINy/YnTfq2gBf6zSeeWPtOY8W7XwYcz3wM5snC2Obu dj5oNOEMl5tHzjPJKDmicozZa82A5kQE5aLMW1i6HET1wgJSwD7WBG+u4vrgFAV74lSX rXLOIfe6onQfaAVOfQvV7+RKI5/jtUinPNO/J9VkFFgi5apFZkC7kYppBgLY0EcV9Xuc O3Pqhjd4nJdUq4fmm2FUvOqg+mJZkVWHKC9EI8rs/MdLSNS9w686anbgCz0RpZiWeaN/ B4Cg== 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; bh=Sj8awgx+Z3o/eSHbB7aIk73kgiygcFDyxAVZxjmICCU=; b=b3mIQf2JiZ1tRqmQzIVQEWZ4ySkWV1BjrZTLDPo7DzLlprs3IBSngXyBFDV+ijAlf6 H4phziQbmeb0Q19LHG4PX3/39lnnah4A68BGQZARe8iJtZiWElGUCGBZeJ9OMUFrsL7I r3/CKT4PlbzASzU4PS1aQ8btEfCjTeGiMyGvcTrZe0AQLwy+Nnc+a6pbW1ajVYMZj2rk 0ypPSsCuOjlFb4LRzwxbrDa0+DBGNjTZJcPjIsFhLLsCNTXaAApegB3uSvzNwdmIef/l m2D5vdEoCj2Ikgng34UfSx0NWF+tnmAadccDOY0urcYz17uTWlAbdugFQ7tfKlW79zpS f2Aw== X-Gm-Message-State: AIkVDXJztd70lO1C92njHN16bdL1BiGuHKMtB1dhc0rw5m1UtbUEOzqyoix029HfNm9lDQ== X-Received: by 10.84.217.202 with SMTP id d10mr33889197plj.53.1485069249145; Sat, 21 Jan 2017 23:14:09 -0800 (PST) Received: from niteshade.hsd1.or.comcast.net (c-73-25-156-150.hsd1.or.comcast.net. [73.25.156.150]) by smtp.gmail.com with ESMTPSA id d128sm27854187pfg.56.2017.01.21.23.14.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Jan 2017 23:14:08 -0800 (PST) From: Matt Ranostay To: linux-pm@vger.kernel.org, devicetree@vger.kernel.org Cc: sre@kernel.org, tony@atomide.com, Matt Ranostay Subject: [PATCH v4 5/8] power: bq27xxx_battery: add BQ27425 chip id Date: Sat, 21 Jan 2017 23:14:01 -0800 Message-Id: <20170122071404.9654-6-matt@ranostay.consulting> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170122071404.9654-1-matt@ranostay.consulting> References: <20170122071404.9654-1-matt@ranostay.consulting> 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 Signed-off-by: Matt Ranostay --- drivers/power/supply/bq27xxx_battery.c | 23 ++++++++++++++++++++++- drivers/power/supply/bq27xxx_battery_i2c.c | 2 +- include/linux/power/bq27xxx_battery.h | 3 ++- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c index 398801a21b86..12ecea308186 100644 --- a/drivers/power/supply/bq27xxx_battery.c +++ b/drivers/power/supply/bq27xxx_battery.c @@ -417,6 +417,25 @@ static u8 bq27xxx_regs[][BQ27XXX_REG_MAX] = { [BQ27XXX_REG_DCAP] = 0x3c, [BQ27XXX_REG_AP] = 0x18, }, + [BQ27425] = { + [BQ27XXX_REG_CTRL] = 0x00, + [BQ27XXX_REG_TEMP] = 0x02, + [BQ27XXX_REG_INT_TEMP] = 0x1e, + [BQ27XXX_REG_VOLT] = 0x04, + [BQ27XXX_REG_AI] = 0x10, + [BQ27XXX_REG_FLAGS] = 0x06, + [BQ27XXX_REG_TTE] = INVALID_REG_ADDR, + [BQ27XXX_REG_TTF] = INVALID_REG_ADDR, + [BQ27XXX_REG_TTES] = INVALID_REG_ADDR, + [BQ27XXX_REG_TTECP] = INVALID_REG_ADDR, + [BQ27XXX_REG_NAC] = 0x08, + [BQ27XXX_REG_FCC] = 0x0e, + [BQ27XXX_REG_CYCT] = INVALID_REG_ADDR, + [BQ27XXX_REG_AE] = INVALID_REG_ADDR, + [BQ27XXX_REG_SOC] = 0x1c, + [BQ27XXX_REG_DCAP] = 0x3c, + [BQ27XXX_REG_AP] = 0x18, + }, }; static enum power_supply_property bq27000_battery_props[] = { @@ -752,6 +771,7 @@ static struct { BQ27XXX_PROP(BQ27541, bq27541_battery_props), BQ27XXX_PROP(BQ27545, bq27545_battery_props), BQ27XXX_PROP(BQ27421, bq27421_battery_props), + BQ27XXX_PROP(BQ27425, bq27421_battery_props), }; static DEFINE_MUTEX(bq27xxx_list_lock); @@ -1015,6 +1035,7 @@ static bool bq27xxx_battery_overtemp(struct bq27xxx_device_info *di, u16 flags) return flags & (BQ27XXX_FLAG_OTC | BQ27XXX_FLAG_OTD); case BQ27530: case BQ27421: + case BQ27425: return flags & BQ27XXX_FLAG_OT; default: return false; @@ -1026,7 +1047,7 @@ static bool bq27xxx_battery_overtemp(struct bq27xxx_device_info *di, u16 flags) */ static bool bq27xxx_battery_undertemp(struct bq27xxx_device_info *di, u16 flags) { - if (di->chip == BQ27530 || di->chip == BQ27421) + if (di->chip == BQ27530 || di->chip == BQ27421 || di->chip == BQ27425) return flags & BQ27XXX_FLAG_UT; return false; diff --git a/drivers/power/supply/bq27xxx_battery_i2c.c b/drivers/power/supply/bq27xxx_battery_i2c.c index c68fbc3fe50a..2ea2d0b06948 100644 --- a/drivers/power/supply/bq27xxx_battery_i2c.c +++ b/drivers/power/supply/bq27xxx_battery_i2c.c @@ -167,9 +167,9 @@ static const struct i2c_device_id bq27xxx_i2c_id_table[] = { { "bq27742", BQ27541 }, { "bq27545", BQ27545 }, { "bq27421", BQ27421 }, - { "bq27425", BQ27421 }, { "bq27441", BQ27421 }, { "bq27621", BQ27421 }, + { "bq27425", BQ27425 }, {}, }; MODULE_DEVICE_TABLE(i2c, bq27xxx_i2c_id_table); diff --git a/include/linux/power/bq27xxx_battery.h b/include/linux/power/bq27xxx_battery.h index b312bcef53da..3f265dbf11af 100644 --- a/include/linux/power/bq27xxx_battery.h +++ b/include/linux/power/bq27xxx_battery.h @@ -17,7 +17,8 @@ enum bq27xxx_chip { BQ27530, /* bq27530, bq27531 */ BQ27541, /* bq27541, bq27542, bq27546, bq27742 */ BQ27545, /* bq27545 */ - BQ27421, /* bq27421, bq27425, bq27441, bq27621 */ + BQ27421, /* bq27421, bq27441, bq27621 */ + BQ27425, /* bq27425 */ }; /**