Commit 556f1b48 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull power supply and reset updates from Sebastian Reichel:
 "Power-supply core:
   - remove unused set_charged infrastructure
   - drop of_node from power_supply struct

  Power-supply drivers:
   - axp717: support devices without thermistors
   - bq27xxx: support max design voltage for bq270x0 and bq27x10
   - pcf50633: drop charger driver
   - max1720x: add battery health support
   - switch all power-supply devices from of_node to fwnode
   - convert regmap users to maple tree register cache
   - convert drivers to devm_kmemdup_array
   - misc cleanups and fixes

  Reset drivers:
   - at91-sama5d2_shdwc: add sama7d65 support

* tag 'for-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (30 commits)
  power: supply: mt6370: Remove redundant 'flush_workqueue()' calls
  Revert "power: supply: bq27xxx: do not report bogus zero values"
  power: supply: max77693: Fix wrong conversion of charge input threshold value
  power: supply: pcf50633: Remove charger
  power: supply: all: switch psy_cfg from of_node to fwnode
  power: supply: core: get rid of of_node
  power: reset: at91-sama5d2_shdwc: Add sama7d65 PMC
  power: supply: smb347: convert to use maple tree register cache
  power: supply: rt9455: convert to use maple tree register cache
  power: supply: max1720x: convert to use maple tree register cache
  power: supply: ltc4162l: convert to use maple tree register cache
  power: supply: bq25980: convert to use maple tree register cache
  power: supply: bq25890: convert to use maple tree register cache
  power: supply: bq2515x: convert to use maple tree register cache
  power: supply: bq24257: convert to use maple tree register cache
  power: supply: bd99954: convert to use maple tree register cache
  power: supply: Remove unused set_charged method
  power: supply: ds2760: Remove unused ds2760_battery_set_charged
  power: supply: core: Remove unused power_supply_set_battery_charged
  power: supply: sc27xx: use devm_kmemdup_array()
  ...
parents 59c35416 0b8d073f

Documentation/devicetree/bindings/power/reset/atmel,sama5d2-shdwc.yaml

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,11 @@ description: | 
properties:

  compatible:

    oneOf:

      - items:

          - enum:

              - microchip,sama7d65-shdwc

          - const: microchip,sama7g5-shdwc

          - const: syscon

      - items:

          - const: microchip,sama7g5-shdwc

          - const: syscon

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

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ properties: 


required:

  - compatible

  - interrupts



additionalProperties: false

Documentation/devicetree/bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml

+17 −3
Original line number Diff line number Diff line
@@ -14,9 +14,6 @@ maintainers: 
  - Chen-Yu Tsai <wens@csie.org>

  - Sebastian Reichel <sre@kernel.org>



allOf:

  - $ref: power-supply.yaml#



properties:

  compatible:

    oneOf:
@@ -35,7 +32,24 @@ properties: 
      this gauge.

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



  x-powers,no-thermistor:

    type: boolean

    description: Indicates that no thermistor is connected to the TS pin



required:

  - compatible



allOf:

  - $ref: power-supply.yaml#

  - if:

      not:

        properties:

          compatible:

            contains:

              enum:

                - x-powers,axp717-battery-power-supply

    then:

      properties:

        x-powers,no-thermistor: false



additionalProperties: false

drivers/power/reset/at91-sama5d2_shdwc.c

+1 −0
Original line number Diff line number Diff line
@@ -327,6 +327,7 @@ static const struct of_device_id at91_pmc_ids[] = { 
	{ .compatible = "microchip,sam9x60-pmc" },

	{ .compatible = "microchip,sama7g5-pmc" },

	{ .compatible = "microchip,sam9x7-pmc" },

	{ .compatible = "microchip,sama7d65-pmc" },

	{ /* Sentinel. */ }

};

drivers/power/supply/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -449,12 +449,6 @@ config CHARGER_88PM860X 
	help

	  Say Y here to enable charger for Marvell 88PM860x chip.



config CHARGER_PCF50633

	tristate "NXP PCF50633 MBC"

	depends on MFD_PCF50633

	help

	  Say Y to include support for NXP PCF50633 Main Battery Charger.



config BATTERY_RX51

	tristate "Nokia RX-51 (N900) battery driver"

	depends on TWL4030_MADC