Commit 151173e8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull battery updates from Anton Vorontsov:
 "Highlights:

   - OpenFirmware/DeviceTree support for the Power Supply core: the core
     now automatically populates supplied_from hierarchy from the device
     tree.  With these patches chargers and batteries can now lookup
     each other without the board files support shim.  Rhyland Klein at
     NVIDIA did the work

   - New ST-Ericsson ABX500 hwmon driver.  The driver is heavily using
     the AB85xx core and depends on some recent changes to it, so that
     is why the driver comes through the battery tree.  It has an
     appropriate ack from the hwmon maintainer (i.e.  Guenter Roeck).
     Martin Persson at ST-Ericsson and Hongbo Zhang at Linaro authored
     the driver

   - Final bits to sync AB85xx ST-Ericsson changes into mainline.  The
     changes touch mfd parts, but these were acked by the appropriate
     MFD maintainer (ie Samuel Ortiz).  Lee Jones at Linaro did most of
     the work and lead the submission process.

  Minor changes, but still worth mentioning:

   - Battery temperature reporting fix for Nokia N900 phones
   - Versatile Express poweroff driver moved into drivers/power/reset/
   - Tree-wide: use devm_kzalloc() where appropriate
   - Tree-wide: dev_pm_ops cleanups/fixes"

* tag 'for-v3.10' of git://git.infradead.org/battery-2.6: (112 commits)
  pm2301-charger: Fix suspend/resume
  charger-manager: Use kmemdup instead of kzalloc + memcpy
  power_supply: Populate supplied_from hierarchy from the device tree
  power_supply: Add core support for supplied_from
  power_supply: Define Binding for power-supplies
  rx51_battery: Fix reporting temperature
  hwmon: Add ST-Ericsson ABX500 hwmon driver
  ab8500_bmdata: Export abx500_res_to_temp tables for hwmon
  ab8500_{bmdata,fg}: Add const attributes to some data arrays
  ab8500_bmdata: Eliminate CamelCase warning of some variables
  ab8500_btemp: Make ab8500_btemp_get* interfaces public
  goldfish_battery: Use resource_size()
  lp8788-charger: Use PAGE_SIZE for the sysfs read operation
  max8925_power: Use devm_kzalloc()
  da9030_battery: Use devm_kzalloc()
  da9052-battery: Use devm_kzalloc()
  ds2760_battery: Use devm_kzalloc()
  ds2780_battery: Use devm_kzalloc()
  gpio-charger: Use devm_kzalloc()
  isp1704_charger: Use devm_kzalloc()
  ...
parents 30945669 6b170807

Documentation/devicetree/bindings/power_supply/power_supply.txt

0 → 100644
+23 −0
Original line number Diff line number Diff line 
Power Supply Core Support



Optional Properties:

 - power-supplies : This property is added to a supply in order to list the

   devices which supply it power, referenced by their phandles.



Example:



	usb-charger: power@e {

		compatible = "some,usb-charger";

		...

	};



	ac-charger: power@c {

		compatible = "some,ac-charger";

		...

	};



	battery@b {

		compatible = "some,battery";

		...

		power-supplies = <&usb-charger>, <&ac-charger>;

	};

Documentation/devicetree/bindings/power_supply/tps65090.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
TPS65090 Frontend PMU with Switchmode Charger



Required Properties:

-compatible: "ti,tps65090-charger"



Optional Properties:

-ti,enable-low-current-chrg: Enables charging when a low current is detected

 while the default logic is to stop charging.



This node is a subnode of the tps65090 PMIC.



Example:



	tps65090-charger {

		compatible = "ti,tps65090-charger";

		ti,enable-low-current-chrg;

	};

Documentation/hwmon/ab8500

0 → 100644
+22 −0
Original line number Diff line number Diff line 
Kernel driver ab8500

====================



Supported chips:

  * ST-Ericsson AB8500

    Prefix: 'ab8500'

    Addresses scanned: -

    Datasheet: http://www.stericsson.com/developers/documentation.jsp



Authors:

        Martin Persson <martin.persson@stericsson.com>

        Hongbo Zhang <hongbo.zhang@linaro.org>



Description

-----------



See also Documentation/hwmon/abx500. This is the ST-Ericsson AB8500 specific

driver.



Currently only the AB8500 internal sensor and one external sensor for battery

temperature are monitored. Other GPADC channels can also be monitored if needed

in future.

Documentation/hwmon/abx500

0 → 100644
+28 −0
Original line number Diff line number Diff line 
Kernel driver abx500

====================



Supported chips:

  * ST-Ericsson ABx500 series

    Prefix: 'abx500'

    Addresses scanned: -

    Datasheet: http://www.stericsson.com/developers/documentation.jsp



Authors:

        Martin Persson <martin.persson@stericsson.com>

        Hongbo Zhang <hongbo.zhang@linaro.org>



Description

-----------



Every ST-Ericsson Ux500 SOC consists of both ABx500 and DBx500 physically,

this is kernel hwmon driver for ABx500.



There are some GPADCs inside ABx500 which are designed for connecting to

thermal sensors, and there is also a thermal sensor inside ABx500 too, which

raises interrupt when critical temperature reached.



This abx500 is a common layer which can monitor all of the sensors, every

specific abx500 chip has its special configurations in its own file, e.g. some

sensors can be configured invisible if they are not available on that chip, and

the corresponding gpadc_addr should be set to 0, thus this sensor won't be

polled.

arch/arm/mach-vexpress/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ config ARCH_VEXPRESS 
	select NO_IOPORT

	select PLAT_VERSATILE

	select PLAT_VERSATILE_CLCD

	select POWER_RESET

	select POWER_RESET_VEXPRESS

	select POWER_SUPPLY

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	select VEXPRESS_CONFIG

	help

CRA Git | Maintained and supported by SUSTech CRA and CCSE