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

Merge tag 'mfd-fixes-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd 

Pull MFD fixes from Lee Jones:
 "A couple of small fixes:

   - Potential build failure in CS42L43

   - Device Tree bindings clean-up for a superseded patch"

* tag 'mfd-fixes-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
  dt-bindings: mfd: Revert "dt-bindings: mfd: maxim,max77693: Add USB connector"
  mfd: cs42l43: Fix MFD_CS42L43 dependency on REGMAP_IRQ
parents 403688e0 c7f5bd9f

Documentation/devicetree/bindings/mfd/maxim,max77693.yaml

+0 −4
Original line number Diff line number Diff line
@@ -31,10 +31,6 @@ properties: 
  charger:

    $ref: /schemas/power/supply/maxim,max77693.yaml



  connector:

    $ref: /schemas/connector/usb-connector.yaml#

    unevaluatedProperties: false



  led:

    $ref: /schemas/leds/maxim,max77693.yaml

drivers/mfd/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ config MFD_CS42L43 
	tristate

	select MFD_CORE

	select REGMAP

	select REGMAP_IRQ



config MFD_CS42L43_I2C

	tristate "Cirrus Logic CS42L43 (I2C)"