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

Commit 1ebe3839 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-v4.5-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply 

Pull power supply fixes from Sebastian Reichel:
 "Add a regression fix for changed sysfs path of bq27xxx_battery and
  update MAINTAINERS file"

* tag 'for-v4.5-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
  power: bq27xxx_battery: Restore device name
  MAINTAINERS: update bq27xxx driver
parents 6dc390ad 9aafabc7

MAINTAINERS

+8 −2
Original line number Diff line number Diff line
@@ -7686,13 +7686,13 @@ S: Maintained 
F:	arch/nios2/



NOKIA N900 POWER SUPPLY DRIVERS

M:	Pali Rohár <pali.rohar@gmail.com>

S:	Maintained

R:	Pali Rohár <pali.rohar@gmail.com>

F:	include/linux/power/bq2415x_charger.h

F:	include/linux/power/bq27xxx_battery.h

F:	include/linux/power/isp1704_charger.h

F:	drivers/power/bq2415x_charger.c

F:	drivers/power/bq27xxx_battery.c

F:	drivers/power/bq27xxx_battery_i2c.c

F:	drivers/power/isp1704_charger.c

F:	drivers/power/rx51_battery.c
@@ -9558,6 +9558,12 @@ M: Andreas Noever <andreas.noever@gmail.com> 
S:	Maintained

F:	drivers/thunderbolt/



TI BQ27XXX POWER SUPPLY DRIVER

R:	Andrew F. Davis <afd@ti.com>

F:	include/linux/power/bq27xxx_battery.h

F:	drivers/power/bq27xxx_battery.c

F:	drivers/power/bq27xxx_battery_i2c.c



TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER

M:	John Stultz <john.stultz@linaro.org>

M:	Thomas Gleixner <tglx@linutronix.de>

drivers/power/bq27xxx_battery_i2c.c

+34 −3
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ 


#include <linux/power/bq27xxx_battery.h>



static DEFINE_IDR(battery_id);

static DEFINE_MUTEX(battery_mutex);



static irqreturn_t bq27xxx_battery_irq_handler_thread(int irq, void *data)

{

	struct bq27xxx_device_info *di = data;
@@ -70,19 +73,33 @@ static int bq27xxx_battery_i2c_probe(struct i2c_client *client, 
{

	struct bq27xxx_device_info *di;

	int ret;

	char *name;

	int num;



	/* Get new ID for the new battery device */

	mutex_lock(&battery_mutex);

	num = idr_alloc(&battery_id, client, 0, 0, GFP_KERNEL);

	mutex_unlock(&battery_mutex);

	if (num < 0)

		return num;



	name = devm_kasprintf(&client->dev, GFP_KERNEL, "%s-%d", id->name, num);

	if (!name)

		goto err_mem;



	di = devm_kzalloc(&client->dev, sizeof(*di), GFP_KERNEL);

	if (!di)

		return -ENOMEM;

		goto err_mem;



	di->id = num;

	di->dev = &client->dev;

	di->chip = id->driver_data;

	di->name = id->name;

	di->name = name;

	di->bus.read = bq27xxx_battery_i2c_read;



	ret = bq27xxx_battery_setup(di);

	if (ret)

		return ret;

		goto err_failed;



	/* Schedule a polling after about 1 min */

	schedule_delayed_work(&di->work, 60 * HZ);
@@ -103,6 +120,16 @@ static int bq27xxx_battery_i2c_probe(struct i2c_client *client, 
	}



	return 0;



err_mem:

	ret = -ENOMEM;



err_failed:

	mutex_lock(&battery_mutex);

	idr_remove(&battery_id, num);

	mutex_unlock(&battery_mutex);



	return ret;

}



static int bq27xxx_battery_i2c_remove(struct i2c_client *client)
@@ -111,6 +138,10 @@ static int bq27xxx_battery_i2c_remove(struct i2c_client *client) 


	bq27xxx_battery_teardown(di);



	mutex_lock(&battery_mutex);

	idr_remove(&battery_id, di->id);

	mutex_unlock(&battery_mutex);



	return 0;

}

include/linux/power/bq27xxx_battery.h

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ struct bq27xxx_reg_cache { 


struct bq27xxx_device_info {

	struct device *dev;

	int id;

	enum bq27xxx_chip chip;

	const char *name;

	struct bq27xxx_access_methods bus;