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

Pull battery updates from Dmitry Eremin-Solenikov:
 "I'm picking up power supply maintainership from Anton Vorontov.  Could
  you please pull battery-2.6 git tree changes prepared for the v3.14
  release.

  Highlights:

   - Power supply notifier

   - Several drivers gained DT support

   - Added Maxim 14577 driver

   - Change of maintainer"

* tag 'for-v3.14' of git://git.infradead.org/battery-2.6:
  MAINTAINERS: Pick up power supply maintainership
  max17042_battery: Add IRQF_ONESHOT flag to use default irq handler
  gpio-charger: Support wakeup events
  power_supply: Add charger support for Maxim 14577
  dt: Binding documentation for isp1704 charger
  isp1704_charger: Add DT support
  charger-manager: of_cm_parse_desc() should be static
  bq2415x_charger: Add DT support
  power_supply: Add power_supply_get_by_phandle
  bq2415x_charger: Use power_supply notifier for automode
  power: reset: Add as3722 power-off driver
  mfd: AS3722: Add dt node properties for system power controller
  charger-manager: Support deivce tree in charger manager driver
  charger-manager: Modify the way of checking battery's temperature
  power_supply: Add power_supply notifier

20 files changed, 1043 insertions, 132 deletions

diff --git a/Documentation/devicetree/bindings/mfd/as3722.txt b/Documentation/devicetree/bindings/mfd/as3722.txt
index fc2191ecfd6b..8edcb9bd873b 100644
--- a/Documentation/devicetree/bindings/mfd/as3722.txt
+++ b/Documentation/devicetree/bindings/mfd/as3722.txt
@@ -112,6 +112,15 @@ Following are properties of regulator subnode.
                 ams,enable-tracking: Enable tracking with SD1, only supported
                         by LDO3.
 
+Power-off:
+=========
+AS3722 supports the system power off by turning off all its rail. This
+is provided through pm_power_off.
+The device node should have the following properties to enable this
+functionality
+ams,system-power-controller: Boolean, to enable the power off functionality
+        through this device.
+
 Example:
 --------
 #include <dt-bindings/mfd/as3722.h>
@@ -120,6 +129,8 @@ ams3722 {
         compatible = "ams,as3722";
         reg = <0x48>;
 
+        ams,system-power-controller;
+
         interrupt-parent = <&intc>;
         interrupt-controller;
         #interrupt-cells = <2>;
diff --git a/Documentation/devicetree/bindings/power/isp1704.txt b/Documentation/devicetree/bindings/power/isp1704.txt
new file mode 100644
index 000000000000..fa3596907967
--- /dev/null
+++ b/Documentation/devicetree/bindings/power/isp1704.txt
@@ -0,0 +1,17 @@
+Binding for NXP ISP1704 USB Charger Detection
+
+Required properties:
+- compatible: Should contain one of the following:
+ * "nxp,isp1704"
+- nxp,enable-gpio: Should contain a phandle + gpio-specifier
+  to the GPIO pin connected to the chip's enable pin.
+- usb-phy: Should contain a phandle to the USB PHY
+  the ISP1704 is connected to.
+
+Example:
+
+isp1704 {
+        compatible = "nxp,isp1704";
+        nxp,enable-gpio = <&gpio3 3 GPIO_ACTIVE_LOW>;
+        usb-phy = <&usb2_phy>;
+};
diff --git a/Documentation/devicetree/bindings/power_supply/charger-manager.txt b/Documentation/devicetree/bindings/power_supply/charger-manager.txt
new file mode 100644
index 000000000000..2b33750e3db2
--- /dev/null
+++ b/Documentation/devicetree/bindings/power_supply/charger-manager.txt
@@ -0,0 +1,81 @@
+charger-manager bindings
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+Required properties :
+ - compatible : "charger-manager"
+ - <>-supply : for regulator consumer
+ - cm-num-chargers : number of chargers
+ - cm-chargers : name of chargers
+ - cm-fuel-gauge : name of battery fuel gauge
+ - subnode <regulator> :
+        - cm-regulator-name : name of charger regulator
+        - subnode <cable> :
+                - cm-cable-name : name of charger cable
+                - cm-cable-extcon : name of extcon dev
+(optional)      - cm-cable-min : minimum current of cable
+(optional)      - cm-cable-max : maximum current of cable
+
+Optional properties :
+ - cm-name : charger manager's name (default : "battery")
+ - cm-poll-mode : polling mode (enum polling_modes)
+ - cm-poll-interval : polling interval
+ - cm-battery-stat : battery status (enum data_source)
+ - cm-fullbatt-* : data for full battery checking
+ - cm-thermal-zone : name of external thermometer's thermal zone
+ - cm-battery-* : threshold battery temperature for charging
+        -cold : critical cold temperature of battery for charging
+        -cold-in-minus : flag that cold temerature is in minus degree
+        -hot : critical hot temperature of battery for charging
+        -temp-diff : temperature difference to allow recharging
+ - cm-dis/charging-max = limits of charging duration
+
+Example :
+        charger-manager@0 {
+                compatible = "charger-manager";
+                chg-reg-supply = <&charger_regulator>;
+
+                cm-name = "battery";
+                /* Always polling ON : 30s */
+                cm-poll-mode = <1>;
+                cm-poll-interval = <30000>;
+
+                cm-fullbatt-vchkdrop-ms = <30000>;
+                cm-fullbatt-vchkdrop-volt = <150000>;
+                cm-fullbatt-soc = <100>;
+
+                cm-battery-stat = <3>;
+
+                cm-num-chargers = <3>;
+                cm-chargers = "charger0", "charger1", "charger2";
+
+                cm-fuel-gauge = "fuelgauge0";
+
+                cm-thermal-zone = "thermal_zone.1"
+                /* in deci centigrade */
+                cm-battery-cold = <50>;
+                cm-battery-cold-in-minus;
+                cm-battery-hot = <800>;
+                cm-battery-temp-diff = <100>;
+
+                /* Allow charging for 5hr */
+                cm-charging-max = <18000000>;
+                /* Allow discharging for 2hr */
+                cm-discharging-max = <7200000>;
+
+                regulator@0 {
+                        cm-regulator-name = "chg-reg";
+                        cable@0 {
+                                cm-cable-name = "USB";
+                                cm-cable-extcon = "extcon-dev.0";
+                                cm-cable-min = <475000>;
+                                cm-cable-max = <500000>;
+                        };
+                        cable@1 {
+                                cm-cable-name = "TA";
+                                cm-cable-extcon = "extcon-dev.0";
+                                cm-cable-min = <650000>;
+                                cm-cable-max = <675000>;
+                        };
+                };
+
+        };
diff --git a/MAINTAINERS b/MAINTAINERS
index 5c214024f60a..1088b70fbad7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6712,7 +6712,7 @@ F:	include/linux/timer*
 F:      kernel/*timer*
 
 POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
-M:      Anton Vorontsov <anton@enomsg.org>
+M:      Dmitry Eremin-Solenikov <dbaryshkov@gmail</