diff options
| author |   Sebastian Reichel <sre@kernel.org> | 2019-04-18 22:04:22 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2019-04-18 22:04:22 +0200 |
| commit | 231a13d93d5169600f161601de8a25c7bd31af44 (patch) | |
| tree | 64fec82ebacdbd206b567980db2b29ba619459f7 /Documentation/devicetree/bindings/power | |
| parent | power: supply: add Ingenic JZ47xx battery driver. (diff) | |
| parent | power: supply: olpc_battery: Have the framework register sysfs files for us (diff) | |
| download | linux-dev-231a13d93d5169600f161601de8a25c7bd31af44.tar.xz linux-dev-231a13d93d5169600f161601de8a25c7bd31af44.zip | |
Merge tag 'psy-olpc-1.75-battery-signed' into psy-next
This immutable branch contains the changes required for OLPC
1.75 battery, which touches x86 and power-supply and is based
on v5.1-rc1.
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'Documentation/devicetree/bindings/power')
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/olpc_battery.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/power/supply/olpc_battery.txt b/Documentation/devicetree/bindings/power/supply/olpc_battery.txt index c8901b3992d9..8d87d6b35a98 100644 --- a/Documentation/devicetree/bindings/power/supply/olpc_battery.txt +++ b/Documentation/devicetree/bindings/power/supply/olpc_battery.txt @@ -2,4 +2,4 @@ OLPC battery ~~~~~~~~~~~~ Required properties: - - compatible : "olpc,xo1-battery" + - compatible : "olpc,xo1-battery" or "olpc,xo1.5-battery" |