mirror of
https://github.com/torvalds/linux
synced 2024-10-15 15:59:15 +00:00
power supply changes for the v6.3 series (part 2)
- Fix DT binding for Richtek RT9467 - Fix a NULL pointer check in the power-supply core - Document meaning of absent "present" property -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEE72YNB0Y/i3JqeVQT2O7X88g7+poFAmQCjCEACgkQ2O7X88g7 +pq+WA/+MQe1ft5IUsQEtgnvf3SGiNZa3NMeSiD07wLWAilVKzD4nvNJB824Q85u f/2J35ri93Sb1NxApHspCKXGHwaDJ6LMrxBuBkyHPT5PFv8wwAXZzXAJpSw5phKm zbto72CLvG4CyFMtkV1OR10p/OtldQsy6RC6HF1tuecD44VCgU9KO00wlw5ckSzH 8GRKVFr6f12ehS9CYvM5HBZJ75M32L2FfJZ+cj4RjOYe/RFI7QNz46Q9HxXm2YMW p5R4NoyO31I1d0uSII7GtzhRvrb2Ryct7YmgeCwURMEhZZLqFU/P93+E/FD1rNmd CNJjoB2iYTBTAHTeLzy1QcCHn5JNuk2YIfCrSHVvbeYbuEkRVKBwMKzl6248fkRW B393r1n52V9eDGh9ZNawcx6CRbGEQNgAg9mg7W8MAl9qtlm3cgeRZm4NL6MMMMdB /PRokeYeW1tutdN0CSv/vNS0UC0fS7QYZNP3rLsmh14VrmkJSc5RN1m3Ryq2A+Vd VU7KZEp/48R4fqpAs/MfQdn6Hr+ovZNav+Ud8mM5VcAycpVUrCkiZ3w7g/8E4kVt OoCEO0u5kpqxSCtxKlvXrvQeQgmdakJWTyvWDQP8g6ajtH4QQVZ4vGFguMW744lR 3CZO5OuNM2XPjw0tM/bs4NlfEoZHMkVlCprW+fGtU4pL9vy4EeA= =2K3C -----END PGP SIGNATURE----- Merge tag 'for-v6.3-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply Pull more power supply updates from Sebastian Reichel: - Fix DT binding for Richtek RT9467 - Fix a NULL pointer check in the power-supply core - Document meaning of absent "present" property * tag 'for-v6.3-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: dt-bindings: power: supply: Revise Richtek RT9467 compatible name ABI: testing: sysfs-class-power: Document absence of "present" property power: supply: fix null pointer check order in __power_supply_register
This commit is contained in:
commit
0988a0ea79
|
@ -437,7 +437,8 @@ What: /sys/class/power_supply/<supply_name>/present
|
||||||
Date: May 2007
|
Date: May 2007
|
||||||
Contact: linux-pm@vger.kernel.org
|
Contact: linux-pm@vger.kernel.org
|
||||||
Description:
|
Description:
|
||||||
Reports whether a battery is present or not in the system.
|
Reports whether a battery is present or not in the system. If the
|
||||||
|
property does not exist, the battery is considered to be present.
|
||||||
|
|
||||||
Access: Read
|
Access: Read
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
|
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
|
||||||
%YAML 1.2
|
%YAML 1.2
|
||||||
---
|
---
|
||||||
$id: http://devicetree.org/schemas/power/supply/richtek,rt9467-charger.yaml#
|
$id: http://devicetree.org/schemas/power/supply/richtek,rt9467.yaml#
|
||||||
$schema: http://devicetree.org/meta-schemas/core.yaml#
|
$schema: http://devicetree.org/meta-schemas/core.yaml#
|
||||||
|
|
||||||
title: Richtek RT9467 Switching Battery Charger with Power Path Management
|
title: Richtek RT9467 Switching Battery Charger with Power Path Management
|
||||||
|
@ -25,7 +25,7 @@ description: |
|
||||||
|
|
||||||
properties:
|
properties:
|
||||||
compatible:
|
compatible:
|
||||||
const: richtek,rt9467-charger
|
const: richtek,rt9467
|
||||||
|
|
||||||
reg:
|
reg:
|
||||||
maxItems: 1
|
maxItems: 1
|
||||||
|
@ -65,7 +65,7 @@ examples:
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
|
|
||||||
charger@5b {
|
charger@5b {
|
||||||
compatible = "richtek,rt9467-charger";
|
compatible = "richtek,rt9467";
|
||||||
reg = <0x5b>;
|
reg = <0x5b>;
|
||||||
wakeup-source;
|
wakeup-source;
|
||||||
interrupts-extended = <&gpio_intc 32 IRQ_TYPE_LEVEL_LOW>;
|
interrupts-extended = <&gpio_intc 32 IRQ_TYPE_LEVEL_LOW>;
|
|
@ -1207,13 +1207,13 @@ __power_supply_register(struct device *parent,
|
||||||
struct power_supply *psy;
|
struct power_supply *psy;
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
|
if (!desc || !desc->name || !desc->properties || !desc->num_properties)
|
||||||
|
return ERR_PTR(-EINVAL);
|
||||||
|
|
||||||
if (!parent)
|
if (!parent)
|
||||||
pr_warn("%s: Expected proper parent device for '%s'\n",
|
pr_warn("%s: Expected proper parent device for '%s'\n",
|
||||||
__func__, desc->name);
|
__func__, desc->name);
|
||||||
|
|
||||||
if (!desc || !desc->name || !desc->properties || !desc->num_properties)
|
|
||||||
return ERR_PTR(-EINVAL);
|
|
||||||
|
|
||||||
if (psy_has_property(desc, POWER_SUPPLY_PROP_USB_TYPE) &&
|
if (psy_has_property(desc, POWER_SUPPLY_PROP_USB_TYPE) &&
|
||||||
(!desc->usb_types || !desc->num_usb_types))
|
(!desc->usb_types || !desc->num_usb_types))
|
||||||
return ERR_PTR(-EINVAL);
|
return ERR_PTR(-EINVAL);
|
||||||
|
|
Loading…
Reference in a new issue