diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-13 18:21:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-13 18:21:34 -0400 |
| commit | a21c1ea65615f5323575d84508637a9481ca79c6 (patch) | |
| tree | 669d5bf3171cc42e82cc8396c61f56a48634313c | |
| parent | d700b0567132e894971325fbb452a8db9e781c13 (diff) | |
| parent | 5939d9dfe4406a49d8688eb827d88abcaf233c42 (diff) | |
Merge tag 'for-v4.1' of git://git.infradead.org/battery-2.6
Pull power supply and reset changes from Sebastian Reichel:
- new API for safe access of power supply function attrs
- devres support for power supply (un)registration
- new drivers / chips:
- generic syscon based poweroff driver
- iio & charger driver for da9150
- fuel gauge driver for axp288
- bq27x00: add support for bq27510
- bq2415x: add support for bq24157s
- twl4030-madc-battery: convert to iio consumer
- misc fixes
* tag 'for-v4.1' of git://git.infradead.org/battery-2.6: (66 commits)
power: twl4030_madc_battery: Add missing MODULE_ALIAS
power: twl4030-madc-battery: Convert to iio consumer.
dt: power: Add docs for generic SYSCON poweroff driver.
power: reset: Add generic SYSCON register mapped poweroff.
power: max17042_battery: add missed blank
power: max17042_battery: Use reg type instead of chip type
power/reset: at91: big endian fixes for atsama5d3x
power_supply: charger-manager: Fix dereferencing of ERR_PTR
HID: input: Fix NULL pointer dereference when power_supply_register fails
power: constify of_device_id array
power/reset/rmobile-reset.c: Fix !HAS_IOMEM build
power_supply: 88pm860x_charger: Fix possible NULL pointer dereference and use of initialized variable
arm: mach-pxa: Decrement the power supply's device reference counter
mfd: ab8500: Decrement the power supply's device reference counter
power_supply: bq2415x_charger: Decrement the power supply's device reference counter
power_supply: 88pm860x_charger: Decrement the power supply's device reference counter
x86/olpc/xo15/sci: Use newly added power_supply_put API
x86/olpc/xo1/sci: Use newly added power_supply_put API
power_supply: charger-manager: Decrement the power supply's device reference counter
power_supply: Increment power supply use counter when obtaining references
...
106 files changed, 5435 insertions, 2104 deletions
diff --git a/Documentation/devicetree/bindings/iio/adc/da9150-gpadc.txt b/Documentation/devicetree/bindings/iio/adc/da9150-gpadc.txt new file mode 100644 index 000000000000..c07228da92ac --- /dev/null +++ b/Documentation/devicetree/bindings/iio/adc/da9150-gpadc.txt | |||
| @@ -0,0 +1,16 @@ | |||
| 1 | Dialog Semiconductor DA9150 IIO GPADC bindings | ||
| 2 | |||
| 3 | Required properties: | ||
| 4 | - compatible: "dlg,da9150-gpadc" for DA9150 IIO GPADC | ||
| 5 | - #io-channel-cells: Should be set to <1> | ||
| 6 | (See Documentation/devicetree/bindings/iio/iio-bindings.txt for further info) | ||
| 7 | |||
| 8 | For further information on GPADC channels, see device datasheet. | ||
| 9 | |||
| 10 | |||
| 11 | Example: | ||
| 12 | |||
| 13 | gpadc: da9150-gpadc { | ||
| 14 | compatible = "dlg,da9150-gpadc"; | ||
| 15 | #io-channel-cells = <1>; | ||
| 16 | }; | ||
diff --git a/Documentation/devicetree/bindings/power/da9150-charger.txt b/Documentation/devicetree/bindings/power/da9150-charger.txt new file mode 100644 index 000000000000..f3906663c454 --- /dev/null +++ b/Documentation/devicetree/bindings/power/da9150-charger.txt | |||
| @@ -0,0 +1,26 @@ | |||
| 1 | Dialog Semiconductor DA9150 Charger Power Supply bindings | ||
| 2 | |||
| 3 | Required properties: | ||
| 4 | - compatible: "dlg,da9150-charger" for DA9150 Charger Power Supply | ||
| 5 | |||
| 6 | Optional properties: | ||
| 7 | - io-channels: List of phandle and IIO specifier pairs | ||
| 8 | - io-channel-names: List of channel names used by charger | ||
| 9 | ["CHAN_IBUS", "CHAN_VBUS", "CHAN_TJUNC", "CHAN_VBAT"] | ||
| 10 | (See Documentation/devicetree/bindings/iio/iio-bindings.txt for further info) | ||
