diff options
| author | Sebastian Reichel <sebastian.reichel@collabora.co.uk> | 2017-07-25 15:18:27 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sebastian.reichel@collabora.co.uk> | 2017-07-25 15:18:27 +0200 |
| commit | c8143b72888c551bc4119f52d818343945f969d4 (patch) | |
| tree | 3248876df339288a05fdafa8b5e78d8a3295bb01 /drivers | |
| parent | 17825ff6ec6db23892e61a1496abf7d737afe9e7 (diff) | |
| parent | 55a9db679183bcf85a6e5c44a4f92f158bb6f03d (diff) | |
Merge branch 'psy-w1-for-v4.14-immutable' into for-next
Merge immutable branch moving bq27000 driver from w1 subsystem
into power-supply subsystem.
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/power/supply/Kconfig | 9 | ||||
| -rw-r--r-- | drivers/power/supply/Makefile | 1 | ||||
| -rw-r--r-- | drivers/power/supply/bq27xxx_battery_hdq.c (renamed from drivers/w1/slaves/w1_bq27000.c) | 2 | ||||
| -rw-r--r-- | drivers/w1/slaves/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/w1/slaves/Makefile | 1 |
5 files changed, 10 insertions, 9 deletions
diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig index 6a8bab7ae27b..5ab90c1f3f7c 100644 --- 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 509131673355..621a19058fec 100644 --- 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 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 fb68465908f2..dc4437683956 100644 --- 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 54c63e420302..e59441a5e157 100644 --- 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 |