power: supply: move HDQ interface for bq27xxx from w1 to power/supply

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 <afd@ti.com>
Acked-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>

diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
index 969f5005669cad5749ad031850b9d77d02747389..af6397224a82ba02e6e3aa414dcc9e2bfa6e222c 100644 (file)
--- a/drivers/power/supply/Kconfig
+++ b/drivers/power/supply/Kconfig
@@ -198,6 +198,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_BQ27XXX_DT_UPDATES_NVM
        bool "BQ27xxx support for update of NVM/flash data memory"
        depends on BATTERY_BQ27XXX_I2C

diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile
index a41f40957847fe971037e1cb01356473268b09ce..946a5e6be860871388715c921f33cdd82ea53d8f 100644 (file)
--- a/drivers/power/supply/Makefile
+++ b/drivers/power/supply/Makefile
@@ -38,6 +38,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 8046ac45381a7c241f77610621b6a314c204eb0d..f4df67eb9d2cc661b8c18ba95463bc125a1c0f29 100644 (file)
--- 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 fb68465908f21371a31f0656d101996d568cb26c..dc443768395680bca0b59593b56bcb9bc824e79a 100644 (file)
--- a/drivers/w1/slaves/Kconfig
+++ b/drivers/w1/slaves/Kconfig
@@ -140,10 +140,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 54c63e4203024d2dcc34dd69f31665f19f01aa9e..e59441a5e1577ee8ae7e77585bdeb76723f3ff5a 100644 (file)
--- a/drivers/w1/slaves/Makefile
+++ b/drivers/w1/slaves/Makefile
@@ -15,5 +15,4 @@ obj-$(CONFIG_W1_SLAVE_DS2438) += w1_ds2438.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