Skip to content

Commit 980190a

Browse files
committed
Merge tag 'mfd-next-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD updates from Lee Jones: "Updates: - Add Core, Regulator, Onkey and Battery Charger support for the NXP PF1550 Power Management IC (PMIC) - Introduce __SMC_KEY macro to fix GCC 15.2.1 errors in macsmc - Add board definitions for TQMxCU1-HPCM and TQMxCU2-HPCM to the tqmx86 driver - Add support for Broadcom BCM2712 SoC to the bcm2835-pm driver - Hook up the qnap-mcu-eeprom sub-device to qnap-mcu Fixes: - Enable compile testing for the Altera SOCFPGA System Manager driver - Fix device reference leak in altr_sysmgr_regmap_lookup_by_phandle() - Reserve the unused second I2C address for DA9063 to prevent userspace interference - Fix resource leak in da9055_device_init() by calling regmap_del_irq_chip() in the error path - Fix potential IRQ chip conflict when probing multiple MAX77620 devices by using devm_kmemdup for regmap_irq_chip - Return -EPROBE_DEFER when a syscon devuice is not found to allow deferred probing - Update email address for the PF1550 PMIC driver in MAINTAINERS - Correct file entry for PF1550 MFD driver in MAINTAINERS from pfd1550.h to pf1550.h - Calculate checksum on the actual number of received bytes in qnap-mcu for error messages - Use -EPROTO instead of -EIO for checksum errors in qnap-mcu - Add proper error handling for command errors (e.g., "@8", "@9") in qnap-mcu - Fix missing irq_domain_remove() in error path of mt63{58,97}_irq_init() Cleanups: - Mark SMC write buffer arguments as const in apple_smc_write(), apple_smc_rw(), and apple_smc_write_atomic() - Simplify the error handling path in da9055_device_init() by removing a redundant mfd_remove_devices() call - Use regmap_reg_range() and a real one-element array for pmic_status_range in rohm-bd718x7 for cleaner initialization - Remove select I2C_K1 from MFD_SPACEMIT_P1 to avoid build failures when I2C_K1's dependencies are disabled - Remove unneeded semicolon from ls2k_bmc_recover_pci_data() - Drop OF dependency for MFD_MAX5970 in Kconfig to allow wider compile testing and non-OF systems - Make OF ID table style consistent in simple-mfd-i2c driver - Update header inclusions in simple-mfd-i2c to follow IWYU (Include What You Use) principle - Move checksum verification logic to a separate function in qnap-mcu - Use chained IRQs for S2MPG10 in the Samsung SEC driver to simplify interrupt handling - Drop a stray semicolon from sec-irq.c Removals: - Remove the unused TI WL1273 FM radio core driver - Remove the unused wl1273-core.h header and tidy up its reference in documentation Device tree bindings: - Add Device Tree binding for the NXP PF1550 PMIC - Add missing GPIO pins and supply properties to the Silergy SY7636A PMIC binding - Add interrupt-controller property to the Maxim MAX77705 binding for sub-device interrupt source determination - Add Device Tree binding for the Renesas R2A11302FT PMIC - Allow the wakeup-source property in the Dialog DA9063 binding - Make interrupt-related properties optional in the TI TPS65910 PMIC binding - Document the Qualcomm PMIV0104 PMIC compatible string - Document the Qualcomm PM7550 PMIC compatible string - Enable power button subnode for TWL603x in the TI TWL binding - Convert the Dialog DA9052/53 I2C binding from .txt to .yaml format, including compatible string fallback and interrupt properties - Document control-scb and sysreg-scb syscons on pic64gx with fallback compatibles - Document sama7g5-sfrbu and sama7d65-sfrbu syscons with fallback to atmel,sama5d2-sfrbu - Fix LEDs node schema in fsl,mc13xxx binding by adding led@ child nodes and missing properties - Add mt7981-topmisc compatible string to the syscon binding" * tag 'mfd-next-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (42 commits) mfd: sec: Drop a stray semicolon mfd: qnap-mcu: Hook up the EEPROM sub-device dt-bindings: mfd: syscon: Add mt7981-topmisc dt-bindings: mfd: fsl,mc13xxx: Fix LEDs node schema mfd: mt6358-irq: Fix missing irq_domain_remove() in error path mfd: mt6397-irq: Fix missing irq_domain_remove() in error path dt-bindings: mfd: Document syscons falling back to atmel,sama5d2-sfrbu dt-bindings: mfd: Document control-scb and sysreg-scb on pic64gx dt-bindings: mfd: Convert dlg,da9052-i2c.txt to yaml format mfd: sec: Use chained IRQs for s2mpg10 mfd: qnap-mcu: Add proper error handling for command errors mfd: qnap-mcu: Move checksum verification to its own function mfd: qnap-mcu: Use EPROTO in stead of EIO on checksum errors mfd: qnap-mcu: Calculate the checksum on the actual number of bytes received mfd: simple-mfd-i2c: Don't use "proxy" headers mfd: simple-mfd-i2c: Make ID table style consistent mfd: Kconfig: Drop OF dependency on MFD_MAX5970 mfd: ls2kbmc: Remove unneeded semicolon from ls2k_bmc_recover_pci_data() dt-bindings: mfd: twl: Enable power button also for TWL603X MAINTAINERS: Adjust file entry in NXP PF1550 PMIC MFD DRIVER ...
2 parents aa833fc + 44c603f commit 980190a

36 files changed

Lines changed: 584 additions & 822 deletions

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -696,6 +696,7 @@ Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>
696696
Sam Protsenko <semen.protsenko@linaro.org>
697697
Sam Protsenko <semen.protsenko@linaro.org> <semen.protsenko@globallogic.com>
698698
Sam Ravnborg <sam@mars.ravnborg.org>
699+
Samuel Kayode <samkay014@gmail.com> <samuel.kayode@savoirfairelinux.com>
699700
Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>
700701
Santosh Shilimkar <santosh.shilimkar@oracle.org>
701702
Santosh Shilimkar <ssantosh@kernel.org>

Documentation/admin-guide/media/radio-cardlist.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ radio-terratec TerraTec ActiveRadio ISA Standalone
3030
radio-timb Enable the Timberdale radio driver
3131
radio-trust Trust FM radio card
3232
radio-typhoon Typhoon Radio (a.k.a. EcoRadio)
33-
radio-wl1273 Texas Instruments WL1273 I2C FM Radio
3433
fm_drv ISA radio devices
3534
fm_drv ISA radio devices
3635
radio-zoltrix Zoltrix Radio

Documentation/devicetree/bindings/mfd/da9052-i2c.txt

Lines changed: 0 additions & 67 deletions
This file was deleted.
Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mfd/dlg,da9052.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Dialog DA9052/53 Power Management Integrated Circuit (PMIC)
8+
9+
maintainers:
10+
- Frank Li <Frank.Li@nxp.com>
11+
12+
properties:
13+
compatible:
14+
oneOf:
15+
- enum:
16+
- dlg,da9053-aa
17+
- dlg,da9053-ab
18+
- dlg,da9053-bb
19+
- dlg,da9053-bc
20+
- dlg,da9052
21+
22+
reg:
23+
maxItems: 1
24+
25+
interrupts:
26+
maxItems: 1
27+
28+
dlg,tsi-as-adc:
29+
type: boolean
30+
description:
31+
if set the X+, X-, Y+, Y- touchscreen input lines are used as general
32+
purpose analogue input.
33+
34+
tsiref-supply:
35+
description: The reference voltage for the TSIREF pin.
36+
37+
regulators:
38+
type: object
39+
additionalProperties: false
40+
41+
patternProperties:
42+
"^(ldo([1-9]|10)|buck[1-4])$":
43+
type: object
44+
$ref: /schemas/regulator/regulator.yaml#
45+
unevaluatedProperties: false
46+
47+
required:
48+
- compatible
49+
- reg
50+
- regulators
51+
52+
allOf:
53+
- $ref: /schemas/spi/spi-peripheral-props.yaml#
54+
55+
unevaluatedProperties: false
56+
57+
examples:
58+
- |
59+
i2c {
60+
#address-cells = <1>;
61+
#size-cells = <0>;
62+
63+
pmic@48 {
64+
compatible = "dlg,da9053-aa";
65+
reg = <0x48>;
66+
67+
regulators {
68+
buck1 {
69+
regulator-min-microvolt = <500000>;
70+
regulator-max-microvolt = <2075000>;
71+
};
72+
73+
buck2 {
74+
regulator-min-microvolt = <500000>;
75+
regulator-max-microvolt = <2075000>;
76+
};
77+
78+
buck3 {
79+
regulator-min-microvolt = <925000>;
80+
regulator-max-microvolt = <2500000>;
81+
};
82+
83+
buck4 {
84+
regulator-min-microvolt = <925000>;
85+
regulator-max-microvolt = <2500000>;
86+
};
87+
};
88+
};
89+
};

Documentation/devicetree/bindings/mfd/dlg,da9063.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ properties:
8181
watchdog:
8282
$ref: /schemas/watchdog/dlg,da9062-watchdog.yaml
8383

84+
wakeup-source: true
85+
8486
patternProperties:
8587
"^(.+-hog(-[0-9]+)?)$":
8688
type: object

Documentation/devicetree/bindings/mfd/fsl,mc13xxx.yaml

Lines changed: 43 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -93,45 +93,57 @@ properties:
9393

9494
leds:
9595
type: object
96-
$ref: /schemas/leds/common.yaml#
96+
additionalProperties: false
9797

9898
properties:
99-
reg:
100-
description: |
101-
One of
102-
MC13783 LED IDs
103-
0: Main display
104-
1: AUX display
105-
2: Keypad
106-
3: Red 1
107-
4: Green 1
108-
5: Blue 1
109-
6: Red 2
110-
7: Green 2
111-
8: Blue 2
112-
9: Red 3
113-
10: Green 3
114-
11: Blue 3
115-
116-
MC13892 LED IDs
117-
0: Main display
118-
1: AUX display
119-
2: Keypad
120-
3: Red
121-
4: Green
122-
5: Blue
123-
124-
MC34708 LED IDs
125-
0: Charger Red
126-
1: Charger Green
127-
maxItems: 1
99+
'#address-cells':
100+
const: 1
101+
102+
'#size-cells':
103+
const: 0
128104

129105
led-control:
130106
$ref: /schemas/types.yaml#/definitions/uint32-array
131107
description: |
132108
Setting for LED-Control register array length depends on model,
133109
mc13783: 6, mc13892: 4, mc34708: 1
134110
111+
patternProperties:
112+
'^led@[0-9a-b]$':
113+
$ref: /schemas/leds/common.yaml#
114+
unevaluatedProperties: false
115+
116+
properties:
117+
reg:
118+
description: |
119+
One of
120+
MC13783 LED IDs
121+
0: Main display
122+
1: AUX display
123+
2: Keypad
124+
3: Red 1
125+
4: Green 1
126+
5: Blue 1
127+
6: Red 2
128+
7: Green 2
129+
8: Blue 2
130+
9: Red 3
131+
10: Green 3
132+
11: Blue 3
133+
134+
MC13892 LED IDs
135+
0: Main display
136+
1: AUX display
137+
2: Keypad
138+
3: Red
139+
4: Green
140+
5: Blue
141+
142+
MC34708 LED IDs
143+
0: Charger Red
144+
1: Charger Green
145+
maxItems: 1
146+
135147
regulators:
136148
type: object
137149

@@ -262,7 +274,7 @@ examples:
262274
#size-cells = <0>;
263275
led-control = <0x000 0x000 0x0e0 0x000>;
264276
265-
sysled@3 {
277+
led@3 {
266278
reg = <3>;
267279
label = "system:red:live";
268280
linux,default-trigger = "heartbeat";

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,18 @@ properties:
2626
interrupts:
2727
maxItems: 1
2828

29+
interrupt-controller:
30+
description:
31+
The driver implements an interrupt controller for the sub devices.
32+
The interrupt number mapping is as follows
33+
0 - charger
34+
1 - topsys
35+
2 - fuelgauge
36+
3 - usb type-c management block.
37+
38+
'#interrupt-cells':
39+
const: 1
40+
2941
haptic:
3042
type: object
3143
additionalProperties: false
@@ -118,8 +130,10 @@ examples:
118130
pmic@66 {
119131
compatible = "maxim,max77705";
120132
reg = <0x66>;
133+
#interrupt-cells = <1>;
121134
interrupt-parent = <&pm8998_gpios>;
122135
interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
136+
interrupt-controller;
123137
pinctrl-0 = <&chg_int_default>;
124138
pinctrl-names = "default";
125139

Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ properties:
4343
- qcom,pm7250b
4444
- qcom,pm7550ba
4545
- qcom,pm7325
46+
- qcom,pm7550
4647
- qcom,pm8004
4748
- qcom,pm8005
4849
- qcom,pm8009
@@ -84,6 +85,7 @@ properties:
8485
- qcom,pmi8994
8586
- qcom,pmi8998
8687
- qcom,pmih0108
88+
- qcom,pmiv0104
8789
- qcom,pmk8002
8890
- qcom,pmk8350
8991
- qcom,pmk8550
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mfd/renesas,r2a11302ft.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Renesas R2A11302FT Power Supply ICs for R-Car
8+
9+
maintainers:
10+
- Wolfram Sang <wsa+renesas@sang-engineering.com>
11+
12+
description: |
13+
The Renesas R2A11302FT PMIC is used with Renesas R-Car Gen1/Gen2
14+
based SoCs.
15+
16+
FIXME: The binding is incomplete and resembles the information gathered
17+
so far.
18+
19+
properties:
20+
compatible:
21+
const: renesas,r2a11302ft
22+
23+
reg:
24+
maxItems: 1
25+
26+
spi-max-frequency:
27+
maximum: 6000000
28+
29+
spi-cpol: true
30+
31+
spi-cpha: true
32+
33+
required:
34+
- compatible
35+
- reg
36+
- spi-cpol
37+
- spi-cpha
38+
39+
allOf:
40+
- $ref: /schemas/spi/spi-peripheral-props.yaml#
41+
42+
unevaluatedProperties: false
43+
44+
examples:
45+
- |
46+
spi {
47+
#address-cells = <1>;
48+
#size-cells = <0>;
49+
50+
pmic@0 {
51+
compatible = "renesas,r2a11302ft";
52+
reg = <0>;
53+
spi-max-frequency = <6000000>;
54+
spi-cpol;
55+
spi-cpha;
56+
};
57+
};
58+
...

0 commit comments

Comments
 (0)