summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-07-26 23:34:31 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-07-26 23:34:30 -0700
commitcb50168ee3856cc18b4635e3c4d61dcc5d7486af (patch)
treea28b6389942be2a1f4b0059d62cd7bdf22a50d11 /Documentation
parente698c6eeea5b744a650271f06c4779ad5f863c0e (diff)
parentbc356bece8a9b9ce6930ebcc5ed3f4cfe61a73a6 (diff)
Merge "qcom-charger: smb2: configure input from wipower"
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/power/qcom-charger/qpnp-smb2.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/power/qcom-charger/qpnp-smb2.txt b/Documentation/devicetree/bindings/power/qcom-charger/qpnp-smb2.txt
index 58db2c2350e4..368f0b8c9525 100644
--- a/Documentation/devicetree/bindings/power/qcom-charger/qpnp-smb2.txt
+++ b/Documentation/devicetree/bindings/power/qcom-charger/qpnp-smb2.txt
@@ -50,6 +50,12 @@ Charger specific properties:
Value type: <u32>
Definition: Specifies the DC input current limit in micro-amps.
+- qcom,wipower-max-uw
+ Usage: optional
+ Value type: <u32>
+ Definition: Specifies the DC input power limit in micro-watts.
+ If the value is not present, 8W is used as default.
+
=============================================
Second Level Nodes - SMB2 Charger Peripherals
=============================================
@@ -80,9 +86,7 @@ pmicobalt_charger: qcom,qpnp-smb2 {
#address-cells = <1>;
#size-cells = <1>;
- qcom,pmic-revid = <&pmicobalt_revid>;
qcom,suspend-input;
- qcom,disable-charging;
dpdm-supply = <&qusb_phy0>;
qcom,chgr@1000 {