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

Commit 7d3107d2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-v3.11' of git://git.infradead.org/battery-2.6 

Pull battery subsystem update from Anton Vorontsov:
 "Nothing exciting this time, just assorted fixes and cleanups"

* tag 'for-v3.11' of git://git.infradead.org/battery-2.6: (25 commits)
  charger-manager: Fix regulator_get() return check
  charger-manager: Fix a bug when it unregisters notifier block of extcon
  tps65090-charger: Add dt node to power_supply
  sbs-battery: Add dt to power_supply struct
  power_supply: Add of_node_put to fix refcount
  power_supply: Move of_node out of the #ifdef CONFIG_OF
  power/reset: Make the vexpress driver optional on arm and arm64
  charger-manager: Add missing newlines, fix a couple of typos, add pr_fmt
  tps65090-charger: Fix AC detect
  MAINTAINERS: Update email address for Anton Vorontsov
  charger-manager: Ensure event is not used as format string
  power_supply: Replace strict_strtoul() with kstrtoul()
  generic-adc-battery: Fix checking if none of the channels are supported
  power: Use platform_{get,set}_drvdata()
  pm2301_charger: Return error if create_singlethread_workqueue fails
  pm2301_charger: Fix NULL pointer dereference
  lp8727_charger: Support the device tree feature
  twl4030_charger: Remove unnecessary platform_set_drvdata()
  rx51_battery: Remove unnecessary platform_set_drvdata()
  jz4740-battery: Remove unnecessary platform_set_drvdata()
  ...
parents 3aa78e0c 5a6c2208

Documentation/devicetree/bindings/power_supply/lp8727_charger.txt

0 → 100644
+44 −0
Original line number Original line Diff line number Diff line 
Binding for TI/National Semiconductor LP8727 Charger



Required properties:

- compatible: "ti,lp8727"

- reg: I2C slave address 27h



Optional properties:

- interrupt-parent: interrupt controller node (see interrupt binding[0])

- interrupts: interrupt specifier (see interrupt binding[0])

- debounce-ms: interrupt debounce time. (u32)



AC and USB charging parameters

- charger-type: "ac" or "usb" (string)

- eoc-level: value of 'enum lp8727_eoc_level' (u8)

- charging-current: value of 'enum lp8727_ichg' (u8)



[0]: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt



Example)



lp8727@27 {

	compatible = "ti,lp8727";

	reg = <0x27>;



	/* GPIO 134 is used for LP8728 interrupt pin */

	interrupt-parent = <&gpio5>; 	/* base = 128 */

	interrupts = <6 0x2>;		/* offset = 6, falling edge type */



	debounce-ms = <300>;



	/* AC charger: 5% EOC and 500mA charging current */

	ac {

		charger-type = "ac";

		eoc-level = /bits/ 8 <0>;

		charging-current = /bits/ 8 <4>;

	};



	/* USB charger: 10% EOC and 400mA charging current */

	usb {

		charger-type = "usb";

		eoc-level = /bits/ 8 <1>;

		charging-current = /bits/ 8 <2>;

	};

};

MAINTAINERS

+4 −4
Original line number Original line Diff line number Diff line
@@ -752,7 +752,7 @@ S: Maintained 
F:	arch/arm/mach-highbank/

F:	arch/arm/mach-highbank/





ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT

ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT

M:	Anton Vorontsov <avorontsov@mvista.com>

M:	Anton Vorontsov <anton@enomsg.org>

S:	Maintained

S:	Maintained

F:	arch/arm/mach-cns3xxx/

F:	arch/arm/mach-cns3xxx/

T:	git git://git.infradead.org/users/cbou/linux-cns3xxx.git

T:	git git://git.infradead.org/users/cbou/linux-cns3xxx.git
@@ -6406,7 +6406,7 @@ F: include/linux/timer* 
F:	kernel/*timer*

F:	kernel/*timer*





POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS

POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS

M:	Anton Vorontsov <cbou@mail.ru>

M:	Anton Vorontsov <anton@enomsg.org>

M:	David Woodhouse <dwmw2@infradead.org>

M:	David Woodhouse <dwmw2@infradead.org>

T:	git git://git.infradead.org/battery-2.6.git

T:	git git://git.infradead.org/battery-2.6.git

S:	Maintained

S:	Maintained
@@ -6516,7 +6516,7 @@ S: Maintained 
F:	drivers/block/ps3vram.c

F:	drivers/block/ps3vram.c





PSTORE FILESYSTEM

PSTORE FILESYSTEM

M:	Anton Vorontsov <cbouatmailru@gmail.com>

M:	Anton Vorontsov <anton@enomsg.org>

M:	Colin Cross <ccross@android.com>

M:	Colin Cross <ccross@android.com>

M:	Kees Cook <keescook@chromium.org>

M:	Kees Cook <keescook@chromium.org>

M:	Tony Luck <tony.luck@intel.com>

M:	Tony Luck <tony.luck@intel.com>
@@ -7214,7 +7214,7 @@ F: drivers/mmc/host/sdhci.* 
F:	drivers/mmc/host/sdhci-pltfm.[ch]

F:	drivers/mmc/host/sdhci-pltfm.[ch]





SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)

SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)

M:	Anton Vorontsov <avorontsov@ru.mvista.com>

M:	Anton Vorontsov <anton@enomsg.org>

L:	linuxppc-dev@lists.ozlabs.org

L:	linuxppc-dev@lists.ozlabs.org

L:	linux-mmc@vger.kernel.org

L:	linux-mmc@vger.kernel.org

S:	Maintained

S:	Maintained

drivers/power/88pm860x_battery.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -992,7 +992,6 @@ static int pm860x_battery_remove(struct platform_device *pdev) 
	free_irq(info->irq_batt, info);

	free_irq(info->irq_batt, info);

	free_irq(info->irq_cc, info);

	free_irq(info->irq_cc, info);

	power_supply_unregister(&info->battery);

	power_supply_unregister(&info->battery);

	platform_set_drvdata(pdev, NULL);

	return 0;

	return 0;

}

}

drivers/power/88pm860x_charger.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -722,7 +722,6 @@ static int pm860x_charger_remove(struct platform_device *pdev) 
	struct pm860x_charger_info *info = platform_get_drvdata(pdev);

	struct pm860x_charger_info *info = platform_get_drvdata(pdev);

	int i;

	int i;





	platform_set_drvdata(pdev, NULL);

	power_supply_unregister(&info->usb);

	power_supply_unregister(&info->usb);

	free_irq(info->irq[0], info);

	free_irq(info->irq[0], info);

	for (i = 0; i < info->irq_nums; i++)

	for (i = 0; i < info->irq_nums; i++)

drivers/power/ab8500_btemp.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -1045,7 +1045,6 @@ static int ab8500_btemp_remove(struct platform_device *pdev) 




	flush_scheduled_work();

	flush_scheduled_work();

	power_supply_unregister(&di->btemp_psy);

	power_supply_unregister(&di->btemp_psy);

	platform_set_drvdata(pdev, NULL);





	return 0;

	return 0;

}

}