Skip to content

Commit bc622f1

Browse files
committed
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
2 parents 403688e + c7f5bd9 commit bc622f1

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ properties:
3131
charger:
3232
$ref: /schemas/power/supply/maxim,max77693.yaml
3333

34-
connector:
35-
$ref: /schemas/connector/usb-connector.yaml#
36-
unevaluatedProperties: false
37-
3834
led:
3935
$ref: /schemas/leds/maxim,max77693.yaml
4036

drivers/mfd/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ config MFD_CS42L43
241241
tristate
242242
select MFD_CORE
243243
select REGMAP
244+
select REGMAP_IRQ
244245

245246
config MFD_CS42L43_I2C
246247
tristate "Cirrus Logic CS42L43 (I2C)"

0 commit comments

Comments
 (0)