From patchwork Thu Mar 16 16:05:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 9628827 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 3A9A360244 for ; Thu, 16 Mar 2017 16:10:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C21727FBC for ; Thu, 16 Mar 2017 16:10:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2100C28658; Thu, 16 Mar 2017 16:10:37 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI 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 C4E9C27FBC for ; Thu, 16 Mar 2017 16:10:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754940AbdCPQKe (ORCPT ); Thu, 16 Mar 2017 12:10:34 -0400 Received: from lelnx194.ext.ti.com ([198.47.27.80]:52020 "EHLO lelnx194.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754936AbdCPQKc (ORCPT ); Thu, 16 Mar 2017 12:10:32 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by lelnx194.ext.ti.com (8.15.1/8.15.1) with ESMTP id v2GG5VEP019177; Thu, 16 Mar 2017 11:05:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1489680331; bh=Sywxpkb1iwce3hvUNES+AYZeyh0ji3a4eaHCxbXcajg=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=TGGjKaY2k1YJeVBOTFh0zYX98NyEw5urmfZGuVx52G6b6skLthBNVKvHxvj1QH6+S mqoOob1OIZZxv1KseqrXLAmUBTDshlHZtK35gjiyPps8exeC85mVR6rylfdCE08uAF FSUpbUiEvq6ZF7kiasie6YVj9q8JBEZOw7y7YUwg= Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id v2GG5VWW025945; Thu, 16 Mar 2017 11:05:31 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.294.0; Thu, 16 Mar 2017 11:05:30 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id v2GG5V0v005781; Thu, 16 Mar 2017 11:05:31 -0500 Received: from localhost (uda0226330.am.dhcp.ti.com [128.247.83.153]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id v2GG5U305943; Thu, 16 Mar 2017 11:05:30 -0500 (CDT) From: "Andrew F. Davis" To: =?UTF-8?q?Pali=20Roh=C3=A1r?= , Sebastian Reichel , Evgeniy Polyakov CC: , , "Andrew F . Davis" Subject: [PATCH 1/2] power: supply: move HDQ interface for bq27xxx from w1 to power/supply Date: Thu, 16 Mar 2017 11:05:29 -0500 Message-ID: <20170316160530.14956-2-afd@ti.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170316160530.14956-1-afd@ti.com> References: <20170316160530.14956-1-afd@ti.com> 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 The HDQ interface driver should be in this folder just like the I2C interface driver. Move this driver out of drivers/w1/slave and into drivers/power/supply. Signed-off-by: Andrew F. Davis --- drivers/power/supply/Kconfig | 9 +++++++++ drivers/power/supply/Makefile | 1 + .../slaves/w1_bq27000.c => power/supply/bq27xxx_battery_hdq.c} | 2 -- drivers/w1/slaves/Kconfig | 6 ------ drivers/w1/slaves/Makefile | 1 - 5 files changed, 10 insertions(+), 9 deletions(-) rename drivers/{w1/slaves/w1_bq27000.c => power/supply/bq27xxx_battery_hdq.c} (98%) diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig index da54ac88f068..51fffe67b571 100644 --- a/drivers/power/supply/Kconfig +++ b/drivers/power/supply/Kconfig @@ -184,6 +184,15 @@ config BATTERY_BQ27XXX_I2C Say Y here to enable support for batteries with BQ27xxx chips connected over an I2C bus. +config BATTERY_BQ27XXX_HDQ + tristate "BQ27xxx HDQ support" + depends on BATTERY_BQ27XXX + depends on W1 + default y + help + Say Y here to enable support for batteries with BQ27xxx chips + connected over an HDQ bus. + config BATTERY_DA9030 tristate "DA9030 battery driver" depends on PMIC_DA903X diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile index 3789a2c06fdf..48ce539f16a2 100644 --- a/drivers/power/supply/Makefile +++ b/drivers/power/supply/Makefile @@ -35,6 +35,7 @@ obj-$(CONFIG_BATTERY_SBS) += sbs-battery.o obj-$(CONFIG_CHARGER_SBS) += sbs-charger.o obj-$(CONFIG_BATTERY_BQ27XXX) += bq27xxx_battery.o obj-$(CONFIG_BATTERY_BQ27XXX_I2C) += bq27xxx_battery_i2c.o +obj-$(CONFIG_BATTERY_BQ27XXX_HDQ) += bq27xxx_battery_hdq.o obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o obj-$(CONFIG_BATTERY_DA9052) += da9052-battery.o obj-$(CONFIG_CHARGER_DA9150) += da9150-charger.o diff --git a/drivers/w1/slaves/w1_bq27000.c b/drivers/power/supply/bq27xxx_battery_hdq.c similarity index 98% rename from drivers/w1/slaves/w1_bq27000.c rename to drivers/power/supply/bq27xxx_battery_hdq.c index 8046ac45381a..f4df67eb9d2c 100644 --- a/drivers/w1/slaves/w1_bq27000.c +++ b/drivers/power/supply/bq27xxx_battery_hdq.c @@ -1,6 +1,4 @@ /* - * drivers/w1/slaves/w1_bq27000.c - * * Copyright (C) 2007 Texas Instruments, Inc. * * This file is licensed under the terms of the GNU General Public License diff --git a/drivers/w1/slaves/Kconfig b/drivers/w1/slaves/Kconfig index 0ef9f2663dbd..8488a4eb04bd 100644 --- a/drivers/w1/slaves/Kconfig +++ b/drivers/w1/slaves/Kconfig @@ -134,10 +134,4 @@ config W1_SLAVE_DS28E04 If you are unsure, say N. -config W1_SLAVE_BQ27000 - tristate "BQ27000 slave support" - help - Say Y here if you want to use a hdq - bq27000 slave support. - endmenu diff --git a/drivers/w1/slaves/Makefile b/drivers/w1/slaves/Makefile index b4a358955ef9..e6b0c403ea77 100644 --- a/drivers/w1/slaves/Makefile +++ b/drivers/w1/slaves/Makefile @@ -14,5 +14,4 @@ obj-$(CONFIG_W1_SLAVE_DS2433) += w1_ds2433.o obj-$(CONFIG_W1_SLAVE_DS2760) += w1_ds2760.o obj-$(CONFIG_W1_SLAVE_DS2780) += w1_ds2780.o obj-$(CONFIG_W1_SLAVE_DS2781) += w1_ds2781.o -obj-$(CONFIG_W1_SLAVE_BQ27000) += w1_bq27000.o obj-$(CONFIG_W1_SLAVE_DS28E04) += w1_ds28e04.o