Commit bc622f16 authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -31,10 +31,6 @@ properties: ...@@ -31,10 +31,6 @@ properties:
charger: charger:
$ref: /schemas/power/supply/maxim,max77693.yaml $ref: /schemas/power/supply/maxim,max77693.yaml
connector:
$ref: /schemas/connector/usb-connector.yaml#
unevaluatedProperties: false
led: led:
$ref: /schemas/leds/maxim,max77693.yaml $ref: /schemas/leds/maxim,max77693.yaml
......
...@@ -241,6 +241,7 @@ config MFD_CS42L43 ...@@ -241,6 +241,7 @@ config MFD_CS42L43
tristate tristate
select MFD_CORE select MFD_CORE
select REGMAP select REGMAP
select REGMAP_IRQ
config MFD_CS42L43_I2C config MFD_CS42L43_I2C
tristate "Cirrus Logic CS42L43 (I2C)" tristate "Cirrus Logic CS42L43 (I2C)"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment