diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-18 05:31:22 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-18 05:31:21 -0800 |
| commit | 14bfad67bb14db79ae9a8e36f63b00fc840fe23b (patch) | |
| tree | b17f259824eeaf7eb0a190c5eef2b628c083b8b0 /Documentation | |
| parent | 3c52c85809056b939488700a8fe0a54b3beaae8c (diff) | |
| parent | bafe291f17e9706637e612a8ebc8d777c6067849 (diff) | |
Merge "power_supply: add power supply property to support debug battery"
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/qcom/qpnp-fg-gen3.txt (renamed from Documentation/devicetree/bindings/power/qcom-charger/qpnp-fg-gen3.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/qcom/qpnp-fg.txt (renamed from Documentation/devicetree/bindings/power/qcom-charger/qpnp-fg.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/qcom/qpnp-qnovo.txt (renamed from Documentation/devicetree/bindings/power/qcom-charger/qpnp-qnovo.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/qcom/qpnp-smb2.txt (renamed from Documentation/devicetree/bindings/power/qcom-charger/qpnp-smb2.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/qcom/qpnp-smbcharger.txt (renamed from Documentation/devicetree/bindings/power/qcom-charger/qpnp-smbcharger.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/qcom/smb1351-charger.txt (renamed from Documentation/devicetree/bindings/power/qcom-charger/smb1351-charger.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/qcom/smb135x-charger.txt (renamed from Documentation/devicetree/bindings/power/qcom-charger/smb135x-charger.txt) | 0 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/qcom/smb138x-charger.txt (renamed from Documentation/devicetree/bindings/power/qcom-charger/smb138x-charger.txt) | 0 |
8 files changed, 0 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/power/qcom-charger/qpnp-fg-gen3.txt b/Documentation/devicetree/bindings/power/supply/qcom/qpnp-fg-gen3.txt index 35d8d0d7d50b..35d8d0d7d50b 100644 --- a/Documentation/devicetree/bindings/power/qcom-charger/qpnp-fg-gen3.txt +++ b/Documentation/devicetree/bindings/power/supply/qcom/qpnp-fg-gen3.txt diff --git a/Documentation/devicetree/bindings/power/qcom-charger/qpnp-fg.txt b/Documentation/devicetree/bindings/power/supply/qcom/qpnp-fg.txt index f6a7a1ba3005..f6a7a1ba3005 100644 --- a/Documentation/devicetree/bindings/power/qcom-charger/qpnp-fg.txt +++ b/Documentation/devicetree/bindings/power/supply/qcom/qpnp-fg.txt diff --git a/Documentation/devicetree/bindings/power/qcom-charger/qpnp-qnovo.txt b/Documentation/devicetree/bindings/power/supply/qcom/qpnp-qnovo.txt index 96b7dd517231..96b7dd517231 100644 --- a/Documentation/devicetree/bindings/power/qcom-charger/qpnp-qnovo.txt +++ b/Documentation/devicetree/bindings/power/supply/qcom/qpnp-qnovo.txt diff --git a/Documentation/devicetree/bindings/power/qcom-charger/qpnp-smb2.txt b/Documentation/devicetree/bindings/power/supply/qcom/qpnp-smb2.txt index eabdc6a75fbe..eabdc6a75fbe 100644 --- a/Documentation/devicetree/bindings/power/qcom-charger/qpnp-smb2.txt +++ b/Documentation/devicetree/bindings/power/supply/qcom/qpnp-smb2.txt diff --git a/Documentation/devicetree/bindings/power/qcom-charger/qpnp-smbcharger.txt b/Documentation/devicetree/bindings/power/supply/qcom/qpnp-smbcharger.txt index efd64cd90878..efd64cd90878 100644 --- a/Documentation/devicetree/bindings/power/qcom-charger/qpnp-smbcharger.txt +++ b/Documentation/devicetree/bindings/power/supply/qcom/qpnp-smbcharger.txt diff --git a/Documentation/devicetree/bindings/power/qcom-charger/smb1351-charger.txt b/Documentation/devicetree/bindings/power/supply/qcom/smb1351-charger.txt index ab0ac32e444e..ab0ac32e444e 100644 --- a/Documentation/devicetree/bindings/power/qcom-charger/smb1351-charger.txt +++ b/Documentation/devicetree/bindings/power/supply/qcom/smb1351-charger.txt diff --git a/Documentation/devicetree/bindings/power/qcom-charger/smb135x-charger.txt b/Documentation/devicetree/bindings/power/supply/qcom/smb135x-charger.txt index 3eff91a1d112..3eff91a1d112 100644 --- a/Documentation/devicetree/bindings/power/qcom-charger/smb135x-charger.txt +++ b/Documentation/devicetree/bindings/power/supply/qcom/smb135x-charger.txt diff --git a/Documentation/devicetree/bindings/power/qcom-charger/smb138x-charger.txt b/Documentation/devicetree/bindings/power/supply/qcom/smb138x-charger.txt index 0244f910017a..0244f910017a 100644 --- a/Documentation/devicetree/bindings/power/qcom-charger/smb138x-charger.txt +++ b/Documentation/devicetree/bindings/power/supply/qcom/smb138x-charger.txt |