From patchwork Thu Aug 11 16:59:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joshua Clayton X-Patchwork-Id: 9275657 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 8B4E660231 for ; Thu, 11 Aug 2016 16:59:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D6852874B for ; Thu, 11 Aug 2016 16:59:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 71A672874F; Thu, 11 Aug 2016 16:59:39 +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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI,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 22DCB2874B for ; Thu, 11 Aug 2016 16:59:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932712AbcHKQ7V (ORCPT ); Thu, 11 Aug 2016 12:59:21 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:36367 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932489AbcHKQ7U (ORCPT ); Thu, 11 Aug 2016 12:59:20 -0400 Received: by mail-pf0-f194.google.com with SMTP id y134so62785pfg.3; Thu, 11 Aug 2016 09:59:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=/NsWvRCkF4dCPlP0pO2PzaZTqCWeLVdFNwGXBJOyKT8=; b=jIut75/N0yV2LPq7NXDwYtb7DrOFHK1xNC/w9yPtlbp1CPO3C4zoe5TGKOQh2yowtB hbGL6/rVpo6b9ln2zep50wkcacYue3Um011R51KZY+dXZLq9MgB2v5yblKhtl83kDOUG J5Sss7eMZvs6OL9zSN/vyt1lFeM1gEXTJWeA+7ZzqZD6gbXEhWRIPonWK1/Z5eBrd5ls CpWTBD543M7vAQGVU3bcjgRfDuRl1j+/STYlzyVrWCSwGQRZ0VuUzQagx4/FcyMpF3sc AVmLaWv1TL+ztXNjbMdlGhG6sX3ENaxNRhQZCUqiC3CZY2Oa7ijDm0+0jGd4h3+n8Ij/ QkEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=/NsWvRCkF4dCPlP0pO2PzaZTqCWeLVdFNwGXBJOyKT8=; b=ImSG8Wo8IeKL+zWeeUTWeLrwk80X/4sz0U0SBIcvsM0DtiP5RMf+AaGjvrx/L9Tz5l KyIS9P+P2DFrmQw93JTWy9Tl1BqmAo2hMdv43bw2hTXJK/S2g6LxN+Qnf/5GZHVUG1BL MkL8WUmsnLybwCLlXZn5x50XxBX1KFD95uLQGza/xf8iRFXnR5Gl0yU9BXCX6KMTTp77 1XMTozF5RUgm2It3NgxvEpzOyHOAYYU/6u9setSb5scR0hdPg1QhbDBa/rrezemdMGO+ QtIA+awxBRSEKyaZqOyU+TeIQmhqC8/CVV6TCULmkPJTcZu/3CtJ+UWk4xSdM3ynJK97 KC2Q== X-Gm-Message-State: AEkooushz9lofuKqribN0/rJdepWrq4V46MZlvc52+1BOnNWI7n3dUtxZ8fi0eGBMtBlSA== X-Received: by 10.98.80.220 with SMTP id g89mr18979709pfj.12.1470934759828; Thu, 11 Aug 2016 09:59:19 -0700 (PDT) Received: from jclayton-pc.columbia.uniwest.com (68-185-59-186.static.knwc.wa.charter.com. [68.185.59.186]) by smtp.gmail.com with ESMTPSA id g21sm6631944pfj.88.2016.08.11.09.59.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 Aug 2016 09:59:18 -0700 (PDT) From: Joshua Clayton To: Sebastian Reichel , Dmitry Eremin-Solenikov , David Woodhouse Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Joshua Clayton Subject: [PATCH 1/1] sbs-battery: add ability to get battery capacity Date: Thu, 11 Aug 2016 09:59:12 -0700 Message-Id: <1470934752-22719-1-git-send-email-stillcompiling@gmail.com> X-Mailer: git-send-email 2.7.4 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 Battery capacity level is a standard feature of sbs battery That can be used to tell what the remainig battery capacity is, and can tell if the battery has not been calibrated/initialized, which makes the capacity and charging/discharging percentages invalid. Signed-off-by: Joshua Clayton --- drivers/power/sbs-battery.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/power/sbs-battery.c b/drivers/power/sbs-battery.c index 768b9fc..4f913b6 100644 --- a/drivers/power/sbs-battery.c +++ b/drivers/power/sbs-battery.c @@ -41,6 +41,7 @@ enum { REG_TIME_TO_EMPTY, REG_TIME_TO_FULL, REG_STATUS, + REG_CAPACITY_LEVEL, REG_CYCLE_COUNT, REG_SERIAL_NUMBER, REG_REMAINING_CAPACITY, @@ -68,6 +69,7 @@ enum sbs_battery_mode { #define MANUFACTURER_ACCESS_SLEEP 0x0011 /* battery status value bits */ +#define BATTERY_INITIALIZED 0x80 #define BATTERY_DISCHARGING 0x40 #define BATTERY_FULL_CHARGED 0x20 #define BATTERY_FULL_DISCHARGED 0x10 @@ -110,6 +112,8 @@ static const struct chip_data { SBS_DATA(POWER_SUPPLY_PROP_TIME_TO_FULL_AVG, 0x13, 0, 65535), [REG_STATUS] = SBS_DATA(POWER_SUPPLY_PROP_STATUS, 0x16, 0, 65535), + [REG_CAPACITY_LEVEL] = + SBS_DATA(POWER_SUPPLY_PROP_CAPACITY_LEVEL, 0x16, 0, 65535), [REG_CYCLE_COUNT] = SBS_DATA(POWER_SUPPLY_PROP_CYCLE_COUNT, 0x17, 0, 65535), [REG_DESIGN_CAPACITY] = @@ -131,6 +135,7 @@ static const struct chip_data { static enum power_supply_property sbs_properties[] = { POWER_SUPPLY_PROP_STATUS, + POWER_SUPPLY_PROP_CAPACITY_LEVEL, POWER_SUPPLY_PROP_HEALTH, POWER_SUPPLY_PROP_PRESENT, POWER_SUPPLY_PROP_TECHNOLOGY, @@ -377,8 +382,23 @@ static int sbs_get_battery_property(struct i2c_client *client, if (ret >= sbs_data[reg_offset].min_value && ret <= sbs_data[reg_offset].max_value) { val->intval = ret; - if (psp != POWER_SUPPLY_PROP_STATUS) + if (psp == POWER_SUPPLY_PROP_CAPACITY_LEVEL) { + if (!(ret & BATTERY_INITIALIZED)) + val->intval = + POWER_SUPPLY_CAPACITY_LEVEL_UNKNOWN; + else if (ret & BATTERY_FULL_CHARGED) + val->intval = + POWER_SUPPLY_CAPACITY_LEVEL_FULL; + else if (ret & BATTERY_FULL_DISCHARGED) + val->intval = + POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL; + else + val->intval = + POWER_SUPPLY_CAPACITY_LEVEL_NORMAL; return 0; + } else if (psp != POWER_SUPPLY_PROP_STATUS) { + return 0; + } if (ret & BATTERY_FULL_CHARGED) val->intval = POWER_SUPPLY_STATUS_FULL; @@ -590,6 +610,7 @@ static int sbs_get_property(struct power_supply *psy, break; case POWER_SUPPLY_PROP_STATUS: + case POWER_SUPPLY_PROP_CAPACITY_LEVEL: case POWER_SUPPLY_PROP_CYCLE_COUNT: case POWER_SUPPLY_PROP_VOLTAGE_NOW: case POWER_SUPPLY_PROP_CURRENT_NOW: