Commit ab1e2d0f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-v6.8-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply 

Pull power supply and reset updates from Sebastian Reichel:
 "New features:
   - bq24190: Add support for BQ24296 charger

  Cleanups:
   - all reset drivers: Stop using module_platform_driver_probe()
   - gpio-restart: use devm_register_sys_off_handler
   - pwr-mlxbf: support graceful reboot
   - cw2015: correct time_to_empty units
   - qcom-battmgr: Fix driver initialization sequence
   - bq27xxx: Start/Stop delayed work in suspend/resume
   - minor cleanups and fixes"

* tag 'for-v6.8-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (33 commits)
  power: supply: bq24190_charger: Fix "initializer element is not constant" error
  power: supply: bq24190_charger: Add support for BQ24296
  dt-bindings: power: supply: bq24190: Add BQ24296 compatible
  dt-bindings: power: reset: xilinx: Rename node names in examples
  power: supply: qcom_battmgr: Register the power supplies after PDR is up
  dt-bindings: power: reset: qcom-pon: fix inconsistent example
  power: supply: Fix null pointer dereference in smb2_probe
  power: reset: at91: Drop '__init' from at91_wakeup_status()
  power: supply: Use multiple MODULE_AUTHOR statements
  power: supply: Fix indentation and some other warnings
  power: reset: gpio-restart: Use devm_register_sys_off_handler()
  power: supply: bq256xx: fix some problem in bq256xx_hw_init
  power: supply: cw2015: correct time_to_empty units in sysfs
  power: reset: at91-sama5d2_shdwc: Convert to platform remove callback returning void
  power: reset: at91-reset: Convert to platform remove callback returning void
  power: reset: tps65086-restart: Convert to platform remove callback returning void
  power: reset: syscon-poweroff: Convert to platform remove callback returning void
  power: reset: rmobile-reset: Convert to platform remove callback returning void
  power: reset: restart-poweroff: Convert to platform remove callback returning void
  power: reset: regulator-poweroff: Convert to platform remove callback returning void
  ...
parents 237c31cb 17d49b7e

Documentation/devicetree/bindings/power/reset/nvmem-reboot-mode.yaml

+3 −5
Original line number Diff line number Diff line
@@ -28,17 +28,15 @@ properties: 
    items:

      - const: reboot-mode



patternProperties:

  "^mode-.+":

    $ref: /schemas/types.yaml#/definitions/uint32

    description: Vendor-specific mode value written to the mode register

allOf:

  - $ref: reboot-mode.yaml#



required:

  - compatible

  - nvmem-cells

  - nvmem-cell-names



additionalProperties: false

unevaluatedProperties: false



examples:

  - |

Documentation/devicetree/bindings/power/reset/qcom,pon.yaml

+8 −5
Original line number Diff line number Diff line
@@ -111,17 +111,20 @@ examples: 
   #include <dt-bindings/interrupt-controller/irq.h>

   #include <dt-bindings/input/linux-event-codes.h>

   #include <dt-bindings/spmi/spmi.h>

   spmi_bus: spmi@c440000 {



   spmi@c440000 {

     reg = <0x0c440000 0x1100>;

     #address-cells = <2>;

     #size-cells = <0>;

     pmk8350: pmic@0 {



     pmic@0 {

       reg = <0x0 SPMI_USID>;

       #address-cells = <1>;

       #size-cells = <0>;

       pmk8350_pon: pon_hlos@1300 {

         reg = <0x1300>;



       pon@800 {

         compatible = "qcom,pm8998-pon";

         reg = <0x800>;



         pwrkey {

            compatible = "qcom,pm8941-pwrkey";

Documentation/devicetree/bindings/power/reset/syscon-reboot-mode.yaml

+3 −5
Original line number Diff line number Diff line
@@ -29,12 +29,10 @@ properties: 
    $ref: /schemas/types.yaml#/definitions/uint32

    description: Offset in the register map for the mode register (in bytes)



patternProperties:

  "^mode-.+":

    $ref: /schemas/types.yaml#/definitions/uint32

    description: Vendor-specific mode value written to the mode register

allOf:

  - $ref: reboot-mode.yaml#



additionalProperties: false

unevaluatedProperties: false



required:

  - compatible

Documentation/devicetree/bindings/power/reset/xlnx,zynqmp-power.yaml

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ examples: 


    firmware {

      zynqmp-firmware {

        zynqmp-power {

        power-management {

          compatible = "xlnx,zynqmp-power";

          interrupts = <0 35 4>;

        };
@@ -70,7 +70,7 @@ examples: 


    firmware {

      zynqmp-firmware {

        zynqmp-power {

        power-management {

          compatible = "xlnx,zynqmp-power";

          interrupt-parent = <&gic>;

          interrupts = <0 35 4>;

Documentation/devicetree/bindings/power/supply/bq24190.yaml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ properties: 
      - ti,bq24192

      - ti,bq24192i

      - ti,bq24196

      - ti,bq24296



  reg:

    maxItems: 1