From patchwork Wed Jan 11 01:44:39 2017 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: 9509067 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 77A8E60710 for ; Wed, 11 Jan 2017 01:47:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A7F32831B for ; Wed, 11 Jan 2017 01:47:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F22628559; Wed, 11 Jan 2017 01:47:45 +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=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 95A4A28460 for ; Wed, 11 Jan 2017 01:47:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935441AbdAKBr1 (ORCPT ); Tue, 10 Jan 2017 20:47:27 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:36446 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932622AbdAKBpB (ORCPT ); Tue, 10 Jan 2017 20:45:01 -0500 Received: by mail-pf0-f196.google.com with SMTP id b22so14942245pfd.3 for ; Tue, 10 Jan 2017 17:45:01 -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=0F2EjqHMHu8mBro3+2qNQMIot5SwC0d32mXgQyMZWqA=; b=YS7f1NY/30KCpi93eCOH1DfiLKLgC9K9KM81/iYIoVW1kiCB46Djht4/fuyuOWKsSL 0m8Xexhgap+dhobPcVvQj4FCwH96hS6BDUqj+zbgR4ABX6mFbmmaDCgzd6jXbm6bMgrA k0arTc4yDjd2UV+YkNwNGkDG94B0w8QL3eVvp+zctS0fKOCfGUiaXYvjwyaik3hxereO IjUf4qQDq9l36R90P2HXPWsw1jr0XNyL4D0RsjTbOWaToUY1GEHPOxcXY8lDLqRgRQIe Zr6srN29PGqn/jkESFFTiK6O/YKDnn70K8UpJGWxtjmAoxSUN75i9gf4vrHGhjw3szmw JfGw== 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=0F2EjqHMHu8mBro3+2qNQMIot5SwC0d32mXgQyMZWqA=; b=RsH+IUoK1LggqkMhlLr4fnbJUIKxbgy9wFvYDW9N6Q1r4D1Yrrd5Y//Pq9fRhrE7WM nmZYf8z3dXmI8Xz2zpJ+NPzY7up+BrRC7GoK4mEkxV3BecfnksDj+Wha/86TvKSWVUXl cyi5GAcKabCyLJ/BQPMSmJWOyhTLMJXVRK/SSB8CYLKZ7R2FtV9pp6arBZ8mIJPy1aL1 3vonCShDz/S+Ka47mZPa5BGmv0Xxo0l+X2lcM/3NXQIdUpLDm5rVJjeD2Wm0uOLN+VHI O1hF++T72vXEcKzekdQgVRSYtQxe4YLGT2Cg6UhFJk6O7sH80buatuJ+yJ7B0ePivfBT 1QgA== X-Gm-Message-State: AIkVDXI33iB82bXQ8CRZzHL9ZvTmTMeLS/FmDgbZ3hhyTPzfM8qxYDncSMvFy4my6AaEIg== X-Received: by 10.98.133.202 with SMTP id m71mr7424030pfk.102.1484099101012; Tue, 10 Jan 2017 17:45:01 -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 q190sm8607011pfb.51.2017.01.10.17.44.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 Jan 2017 17:45:00 -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 v5 02/11] power: supply: bq27xxx: rename BQ27510 allow for deprecation in future. Date: Wed, 11 Jan 2017 12:44:39 +1100 Message-Id: <1484099088-452-3-git-send-email-chris@cpdesign.com.au> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1484099088-452-1-git-send-email-chris@cpdesign.com.au> References: <1482369743-79764-1-git-send-email-chris@lapa.com.au> <1484099088-452-1-git-send-email-chris@cpdesign.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 BQ2751X definition exists only to satisfy backwards compatibility. Signed-off-by: Chris Lapa --- drivers/power/supply/bq27xxx_battery.c | 8 ++++---- drivers/power/supply/bq27xxx_battery_i2c.c | 4 ++-- include/linux/power/bq27xxx_battery.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c index 103ba3b..90a5373 100644 --- a/drivers/power/supply/bq27xxx_battery.c +++ b/drivers/power/supply/bq27xxx_battery.c @@ -164,7 +164,7 @@ static u8 bq27xxx_regs[][BQ27XXX_REG_MAX] = { [BQ27XXX_REG_DCAP] = 0x3c, [BQ27XXX_REG_AP] = INVALID_REG_ADDR, }, - [BQ27510] = { + [BQ2751X] = { [BQ27XXX_REG_CTRL] = 0x00, [BQ27XXX_REG_TEMP] = 0x06, [BQ27XXX_REG_INT_TEMP] = 0x28, @@ -321,7 +321,7 @@ static enum power_supply_property bq2750x_battery_props[] = { POWER_SUPPLY_PROP_MANUFACTURER, }; -static enum power_supply_property bq27510_battery_props[] = { +static enum power_supply_property bq2751x_battery_props[] = { POWER_SUPPLY_PROP_STATUS, POWER_SUPPLY_PROP_PRESENT, POWER_SUPPLY_PROP_VOLTAGE_NOW, @@ -422,7 +422,7 @@ static struct { BQ27XXX_PROP(BQ27000, bq27000_battery_props), BQ27XXX_PROP(BQ27010, bq27010_battery_props), BQ27XXX_PROP(BQ2750X, bq2750x_battery_props), - BQ27XXX_PROP(BQ27510, bq27510_battery_props), + BQ27XXX_PROP(BQ2751X, bq2751x_battery_props), BQ27XXX_PROP(BQ27530, bq27530_battery_props), BQ27XXX_PROP(BQ27541, bq27541_battery_props), BQ27XXX_PROP(BQ27545, bq27545_battery_props), @@ -676,7 +676,7 @@ static bool bq27xxx_battery_overtemp(struct bq27xxx_device_info *di, u16 flags) { switch (di->chip) { case BQ2750X: - case BQ27510: + case BQ2751X: 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 fb1219b..5f64e70 100644 --- a/drivers/power/supply/bq27xxx_battery_i2c.c +++ b/drivers/power/supply/bq27xxx_battery_i2c.c @@ -149,8 +149,8 @@ static const struct i2c_device_id bq27xxx_i2c_id_table[] = { { "bq27200", BQ27000 }, { "bq27210", BQ27010 }, { "bq27500", BQ2750X }, - { "bq27510", BQ27510 }, - { "bq27520", BQ27510 }, + { "bq27510", BQ2751X }, + { "bq27520", BQ2751X }, { "bq27530", BQ27530 }, { "bq27531", BQ27530 }, { "bq27541", BQ27541 }, diff --git a/include/linux/power/bq27xxx_battery.h b/include/linux/power/bq27xxx_battery.h index 4c904d0..651f265 100644 --- a/include/linux/power/bq27xxx_battery.h +++ b/include/linux/power/bq27xxx_battery.h @@ -5,7 +5,7 @@ enum bq27xxx_chip { BQ27000 = 1, /* bq27000, bq27200 */ BQ27010, /* bq27010, bq27210 */ BQ2750X, /* bq27500 deprecated alias */ - BQ27510, /* bq27510, bq27520 */ + BQ2751X, /* bq27510, bq27520 deprecated alias */ BQ27530, /* bq27530, bq27531 */ BQ27541, /* bq27541, bq27542, bq27546, bq27742 */ BQ27545, /* bq27545 */