Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8143b72 authored by Sebastian Reichel's avatar Sebastian Reichel
Browse files

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: default avatarSebastian Reichel <sebastian.reichel@collabora.co.uk>
parents 17825ff6 55a9db67

drivers/power/supply/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -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

drivers/power/supply/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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

drivers/w1/slaves/w1_bq27000.c→drivers/power/supply/bq27xxx_battery_hdq.c

+0 −2
Original line number Diff line number Diff line 
/*

 * 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

drivers/w1/slaves/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -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

drivers/w1/slaves/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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