Commit 0988a0ea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 3162745a 13af134b

Documentation/ABI/testing/sysfs-class-power

+2 −1
Original line number Diff line number Diff line
@@ -437,7 +437,8 @@ What: /sys/class/power_supply/<supply_name>/present 
Date:		May 2007

Contact:	linux-pm@vger.kernel.org

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

Documentation/devicetree/bindings/power/supply/richtek,rt9467-charger.yaml→Documentation/devicetree/bindings/power/supply/richtek,rt9467.yaml

+3 −3
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%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#



title: Richtek RT9467 Switching Battery Charger with Power Path Management
@@ -25,7 +25,7 @@ description: | 


properties:

  compatible:

    const: richtek,rt9467-charger

    const: richtek,rt9467



  reg:

    maxItems: 1
@@ -65,7 +65,7 @@ examples: 
      #size-cells = <0>;



      charger@5b {

        compatible = "richtek,rt9467-charger";

        compatible = "richtek,rt9467";

        reg = <0x5b>;

        wakeup-source;

        interrupts-extended = <&gpio_intc 32 IRQ_TYPE_LEVEL_LOW>;

drivers/power/supply/power_supply_core.c

+3 −3
Original line number Diff line number Diff line
@@ -1207,13 +1207,13 @@ __power_supply_register(struct device *parent, 
	struct power_supply *psy;

	int rc;



	if (!desc || !desc->name || !desc->properties || !desc->num_properties)

		return ERR_PTR(-EINVAL);



	if (!parent)

		pr_warn("%s: Expected proper parent device for '%s'\n",

			__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) &&

	    (!desc->usb_types || !desc->num_usb_types))

		return ERR_PTR(-EINVAL);