From patchwork Fri Dec 23 00:04:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chris@lapa.com.au X-Patchwork-Id: 9486963 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 7CA1562AAC for ; Fri, 23 Dec 2016 00:05:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D6ED281DB for ; Fri, 23 Dec 2016 00:05:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 60EE828325; Fri, 23 Dec 2016 00:05:26 +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 EF8B8282E2 for ; Fri, 23 Dec 2016 00:05:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760243AbcLWAFS (ORCPT ); Thu, 22 Dec 2016 19:05:18 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:35033 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757812AbcLWAFR (ORCPT ); Thu, 22 Dec 2016 19:05:17 -0500 Received: by mail-pg0-f65.google.com with SMTP id i5so12094432pgh.2 for ; Thu, 22 Dec 2016 16:05:16 -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; bh=1+zxaFZOFlUJMz7Y7D6zqpSw89rw79ssdCsJFq1aSnc=; b=It2MPB1WYbvZeRJdmj2w7MATuDCiznRfb8tr8Rn2mwRX+0rIc9UHEhM+Ol8bcURhP2 CWxBCqgmWgc0AMoRVB1PdOpvxV8dobVulNEFlTAB7qsargsRwVtKINKY6WlPSxtEiWaD gtM8LGG4l/GBqwSVSvAyD1Uu8CRkFCFobGlFWSnK5Q0FQa1dPCV4zWOqRN1z8lLuYNf5 A6G0dgdyMbFCKzQAkIRQ/2Q3yN5Xj9emZHii8W/QXQSMIvEY2KIfvRZRpHLByCHSV0FN XQyvMqLPjTTuYyZgkyyawO6PGl4mTgm9S6JCuu+lPcfvIjP3+yCmp4DrXiuZS8d2h6IN SeXg== 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=1+zxaFZOFlUJMz7Y7D6zqpSw89rw79ssdCsJFq1aSnc=; b=Vawk85081xqYBZVRtXJM0pUN63plXkWmj16m507XKz1nKLksih/6D9en93w1Q4ZUQg dUaocnuIFIgFYeqVYh3mjevy9K8p6tpkLY0bRg2xa5W3xUfiCrZpN1p8JRu/Pcgr26Wi 9dADIWdRuhcUJf6xlN9JB6SGgm7Uqc41YfEI7pJjFyAQepL9s1wEu4ESHRx3cjuJIjLK mww+BU4I0XXuq8kJZk66ta+APOswRlFDvwkzGobgeL2f6f+RgTyXGi9qgOh4PvRcGd0c n2jlOuAiwezoU+PD9adSOmJA6ySZOkrVb0Fju7+GTsTPpnOVAdy1EbE3vwrm0PQuPofu YKsQ== X-Gm-Message-State: AIkVDXJ13YRYuNtj2RlWAFi79DAwPnXpwY5zirGAjq9BggmIWVwFI9zGzhndXKF805beGw== X-Received: by 10.84.133.69 with SMTP id 63mr24291331plf.15.1482451516446; Thu, 22 Dec 2016 16:05:16 -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 y6sm57688866pge.16.2016.12.22.16.05.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Dec 2016 16:05:16 -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 v2 01/11] power: supplies: bq275xx: rename BQ27500 allow for deprecation in future. Date: Fri, 23 Dec 2016 11:04:57 +1100 Message-Id: <1482451507-37676-2-git-send-email-chris@lapa.com.au> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1482451507-37676-1-git-send-email-chris@lapa.com.au> References: <1482369743-79764-1-git-send-email-chris@lapa.com.au> <1482451507-37676-1-git-send-email-chris@lapa.com.au> 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 The BQ275XX definition exists only to satisfy backwards compatibility. tested: yes Signed-off-by: Chris Lapa --- drivers/power/supply/bq27xxx_battery.c | 8 ++++---- drivers/power/supply/bq27xxx_battery_i2c.c | 6 +++--- include/linux/power/bq27xxx_battery.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c index 3b0dbc6..312f668 100644 --- a/drivers/power/supply/bq27xxx_battery.c +++ b/drivers/power/supply/bq27xxx_battery.c @@ -145,7 +145,7 @@ static u8 bq27xxx_regs[][BQ27XXX_REG_MAX] = { [BQ27XXX_REG_DCAP] = 0x76, [BQ27XXX_REG_AP] = INVALID_REG_ADDR, }, - [BQ27500] = { + [BQ275XX] = { [BQ27XXX_REG_CTRL] = 0x00, [BQ27XXX_REG_TEMP] = 0x06, [BQ27XXX_REG_INT_TEMP] = 0x28, @@ -284,7 +284,7 @@ static enum power_supply_property bq27010_battery_props[] = { POWER_SUPPLY_PROP_MANUFACTURER, }; -static enum power_supply_property bq27500_battery_props[] = { +static enum power_supply_property bq275xx_battery_props[] = { POWER_SUPPLY_PROP_STATUS, POWER_SUPPLY_PROP_PRESENT, POWER_SUPPLY_PROP_VOLTAGE_NOW, @@ -384,7 +384,7 @@ static struct { } bq27xxx_battery_props[] = { BQ27XXX_PROP(BQ27000, bq27000_battery_props), BQ27XXX_PROP(BQ27010, bq27010_battery_props), - BQ27XXX_PROP(BQ27500, bq27500_battery_props), + BQ27XXX_PROP(BQ275XX, bq275xx_battery_props), BQ27XXX_PROP(BQ27530, bq27530_battery_props), BQ27XXX_PROP(BQ27541, bq27541_battery_props), BQ27XXX_PROP(BQ27545, bq27545_battery_props), @@ -635,7 +635,7 @@ static int bq27xxx_battery_read_pwr_avg(struct bq27xxx_device_info *di) */ static bool bq27xxx_battery_overtemp(struct bq27xxx_device_info *di, u16 flags) { - if (di->chip == BQ27500 || di->chip == BQ27541 || di->chip == BQ27545) + if (di->chip == BQ275XX || di->chip == BQ27541 || di->chip == BQ27545) return flags & (BQ27XXX_FLAG_OTC | BQ27XXX_FLAG_OTD); if (di->chip == BQ27530 || di->chip == BQ27421) return flags & BQ27XXX_FLAG_OT; diff --git a/drivers/power/supply/bq27xxx_battery_i2c.c b/drivers/power/supply/bq27xxx_battery_i2c.c index 85d4ea2..762d96e 100644 --- a/drivers/power/supply/bq27xxx_battery_i2c.c +++ b/drivers/power/supply/bq27xxx_battery_i2c.c @@ -148,9 +148,9 @@ static int bq27xxx_battery_i2c_remove(struct i2c_client *client) static const struct i2c_device_id bq27xxx_i2c_id_table[] = { { "bq27200", BQ27000 }, { "bq27210", BQ27010 }, - { "bq27500", BQ27500 }, - { "bq27510", BQ27500 }, - { "bq27520", BQ27500 }, + { "bq27500", BQ275XX }, + { "bq27510", BQ275XX }, + { "bq27520", BQ275XX }, { "bq27530", BQ27530 }, { "bq27531", BQ27530 }, { "bq27541", BQ27541 }, diff --git a/include/linux/power/bq27xxx_battery.h b/include/linux/power/bq27xxx_battery.h index e30deb0..c452b94 100644 --- a/include/linux/power/bq27xxx_battery.h +++ b/include/linux/power/bq27xxx_battery.h @@ -4,7 +4,7 @@ enum bq27xxx_chip { BQ27000 = 1, /* bq27000, bq27200 */ BQ27010, /* bq27010, bq27210 */ - BQ27500, /* bq27500, bq27510, bq27520 */ + BQ275XX, /* bq27500, bq27510, bq27520 deprecated alias */ BQ27530, /* bq27530, bq27531 */ BQ27541, /* bq27541, bq27542, bq27546, bq27742 */ BQ27545, /* bq27545 */