Skip to content

Commit dcab75a

Browse files
committed
Merge tag 'mfd-next-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD updates from Lee Jones: "Maxim MAX77705: - Added core MFD driver. - Added charger driver. - Added devicetree bindings for the charger and MFD core. - Added Haptic controller support via the input subsystem. - Added LED support. - Added support to simple-mfd-i2c for fuel gauge and hwmon. Samsung S2MPU05 (Exynos7870 PMIC): - Added core MFD support. - Added Regulator support for 21 LDOs and 5 BUCKs. - Added devicetree bindings for regulators and the PMIC core. TI TPS65215 & TPS65214: - Added support to the existing TPS65219 driver. - Added devicetree bindings. STMicroelectronics STM32MP25: - Added support to the stm32-timers MFD driver. - Added devicetree bindings. Congatec Board Controller (CGBC): - Added HWMON support for internal sensors. - Added support for the conga-SA8 module. Microchip LAN969X: - Enabled the at91-usart MFD driver for this architecture. MediaTek MT6359: - Added mfd_cell for mt6359-accdet to allow its driver to probe. Other misc driver updates: - AXP20X (AXP717): Added AXP717_TS_PIN_CFG register to writeable regs for temperature sensor configuration. - SM501: Switched to using BIT() macro to mitigate potential integer overflows in GPIO functions. - ENE KB3930: Added a NULL pointer check for off_gpios during probe to prevent potential dereference. - SYSCON: Added a check for invalid resource size to prevent issues from DT misconfiguration. - CGBC: Corrected signedness issues in cgbc_session_request - intel_soc_pmic_chtdc_ti / intel_soc_pmic_crc: Removed unneeded explicit assignment to REGCACHE_NONE. - ipaq-micro / tps65010: Switched to using str_enable_disable() helpers for clarity and potential size reduction. - upboard-fpga: Removed unnecessary ACPI_PTR() annotation. - max8997: Removed unused max8997_irq_exit() function, using devm_* helpers instead. - lp3943: Dropped unused #include <linux/pwm.h> from the header file. - db8500-prcmu: Removed needless return statements in void APIs. - qnap-mcu: Replaced commas with semicolons between expressions for correctness. - STA2X11: Removed the core MFD driver as the underlying platform support was removed. - EZX-PCAP: Removed the unused pcap_adc_sync function. - PCF50633 (OpenMoko PMIC): Removed the entire driver (core, adc, gpio, irq) as the underlying s3c24xx platform support was removed. Devicetree updates: - Converted fsl,mcu-mpc8349emitx binding to YAML - Added qcom,msm8937-tcsr compatible - Added microchip,sama7d65-flexcom compatible - Added rockchip,rk3528-qos syscon compatible - Added airoha,en7581-pbus-csr syscon compatible - Added microchip,sama7d65-ddr3phy syscon compatible - Added microchip,sama7d65-sfrbu syscon compatible" * tag 'mfd-next-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (49 commits) mfd: cgbc-core: Add support for conga-SA8 dt-bindings: mfd: syscon: Add microchip,sama7d65-sfrbu dt-bindings: mfd: syscon: Add microchip,sama7d65-ddr3phy mfd: cgbc: Add support for HWMON dt-bindings: mfd: syscon: Add the pbus-csr node for Airoha EN7581 SoC mfd: cgbc-core: Cleanup signedness in cgbc_session_request() mfd: pcf50633: Remove remaining PCF50633 support mfd: pcf50633: Remove unused platform IRQ code mfd: pcF50633-gpio: Remove unused driver mfd: pcf50633-adc: Remove unused driver mfd: qnap-mcu: Convert commas to semicolons in qnap_mcu_exec() mfd: mt6397-core: Add mfd_cell for mt6359-accdet dt-bindings: mfd: syscon: Add rk3528 QoS register compatible dt-bindings: mfd: atmel,sama5d2-flexcom: Add microchip,sama7d65-flexcom mfd: ezx-pcap: Remove unused pcap_adc_sync mfd: db8500-prcmu: Remove needless return in three void APIs mfd: Remove STA2x11 core driver mfd: max77620: Allow building as a module mfd: ene-kb3930: Fix a potential NULL pointer dereference dt-bindings: mfd: qcom,tcsr: Add compatible for MSM8937 ...
2 parents 054b747 + a8d1376 commit dcab75a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+2722
-2599
lines changed

Documentation/devicetree/bindings/mfd/atmel,sama5d2-flexcom.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@ properties:
1919
oneOf:
2020
- const: atmel,sama5d2-flexcom
2121
- items:
22-
- const: microchip,sam9x7-flexcom
22+
- enum:
23+
- microchip,sam9x7-flexcom
24+
- microchip,sama7d65-flexcom
25+
- microchip,sama7g5-flexcom
2326
- const: atmel,sama5d2-flexcom
24-
- items:
25-
- const: microchip,sama7g5-flexcom
26-
- const: atmel,sama5d2-flexcom
27-
2827

2928
reg:
3029
maxItems: 1
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mfd/fsl,mcu-mpc8349emitx.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Freescale MPC8349E-mITX-compatible Power Management Micro Controller Unit (MCU)
8+
9+
maintainers:
10+
- J. Neuschäfer <j.ne@posteo.net>
11+
12+
properties:
13+
compatible:
14+
oneOf:
15+
- items:
16+
- enum:
17+
- fsl,mc9s08qg8-mpc8315erdb
18+
- fsl,mc9s08qg8-mpc8349emitx
19+
- fsl,mc9s08qg8-mpc8377erdb
20+
- fsl,mc9s08qg8-mpc8378erdb
21+
- fsl,mc9s08qg8-mpc8379erdb
22+
- const: fsl,mcu-mpc8349emitx
23+
24+
reg:
25+
maxItems: 1
26+
27+
"#gpio-cells":
28+
const: 2
29+
30+
gpio-controller: true
31+
32+
required:
33+
- compatible
34+
- reg
35+
- "#gpio-cells"
36+
- gpio-controller
37+
38+
additionalProperties: false
39+
40+
examples:
41+
- |
42+
i2c {
43+
#address-cells = <1>;
44+
#size-cells = <0>;
45+
46+
mcu@a {
47+
#gpio-cells = <2>;
48+
compatible = "fsl,mc9s08qg8-mpc8349emitx",
49+
"fsl,mcu-mpc8349emitx";
50+
reg = <0x0a>;
51+
gpio-controller;
52+
};
53+
};
Lines changed: 158 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,158 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mfd/maxim,max77705.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Maxim MAX77705 Companion Power Management and USB Type-C interface
8+
9+
maintainers:
10+
- Dzmitry Sankouski <dsankouski@gmail.com>
11+
12+
description: |
13+
This is a part of device tree bindings for Maxim MAX77705.
14+
15+
Maxim MAX77705 is a Companion Power Management and Type-C
16+
interface IC which includes charger, fuelgauge, LED, haptic motor driver and
17+
Type-C management.
18+
19+
properties:
20+
compatible:
21+
const: maxim,max77705
22+
23+
reg:
24+
maxItems: 1
25+
26+
interrupts:
27+
maxItems: 1
28+
29+
haptic:
30+
type: object
31+
additionalProperties: false
32+
33+
properties:
34+
compatible:
35+
const: maxim,max77705-haptic
36+
37+
haptic-supply: true
38+
39+
pwms:
40+
maxItems: 1
41+
42+
required:
43+
- compatible
44+
- haptic-supply
45+
- pwms
46+
47+
leds:
48+
type: object
49+
additionalProperties: false
50+
description:
51+
Up to 4 LED channels supported.
52+
53+
properties:
54+
compatible:
55+
const: maxim,max77705-rgb
56+
57+
"#address-cells":
58+
const: 1
59+
60+
"#size-cells":
61+
const: 0
62+
63+
multi-led:
64+
type: object
65+
$ref: /schemas/leds/leds-class-multicolor.yaml#
66+
unevaluatedProperties: false
67+
68+
properties:
69+
"#address-cells":
70+
const: 1
71+
72+
"#size-cells":
73+
const: 0
74+
75+
patternProperties:
76+
"^led@[0-3]$":
77+
type: object
78+
$ref: /schemas/leds/common.yaml#
79+
unevaluatedProperties: false
80+
81+
properties:
82+
reg:
83+
maxItems: 1
84+
85+
required:
86+
- reg
87+
88+
patternProperties:
89+
"^led@[0-3]$":
90+
type: object
91+
$ref: /schemas/leds/common.yaml#
92+
unevaluatedProperties: false
93+
94+
properties:
95+
reg:
96+
maxItems: 1
97+
98+
required:
99+
- reg
100+
101+
required:
102+
- compatible
103+
104+
required:
105+
- compatible
106+
107+
additionalProperties: false
108+
109+
examples:
110+
- |
111+
#include <dt-bindings/interrupt-controller/irq.h>
112+
#include <dt-bindings/leds/common.h>
113+
114+
i2c {
115+
#address-cells = <1>;
116+
#size-cells = <0>;
117+
118+
pmic@66 {
119+
compatible = "maxim,max77705";
120+
reg = <0x66>;
121+
interrupt-parent = <&pm8998_gpios>;
122+
interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
123+
pinctrl-0 = <&chg_int_default>;
124+
pinctrl-names = "default";
125+
126+
leds {
127+
compatible = "maxim,max77705-rgb";
128+
129+
multi-led {
130+
color = <LED_COLOR_ID_RGB>;
131+
function = LED_FUNCTION_STATUS;
132+
#address-cells = <1>;
133+
#size-cells = <0>;
134+
135+
led@1 {
136+
reg = <1>;
137+
color = <LED_COLOR_ID_RED>;
138+
};
139+
140+
led@2 {
141+
reg = <2>;
142+
color = <LED_COLOR_ID_GREEN>;
143+
};
144+
145+
led@3 {
146+
reg = <3>;
147+
color = <LED_COLOR_ID_BLUE>;
148+
};
149+
};
150+
};
151+
152+
haptic {
153+
compatible = "maxim,max77705-haptic";
154+
haptic-supply = <&vib_regulator>;
155+
pwms = <&vib_pwm 0 50000>;
156+
};
157+
};
158+
};

Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ properties:
5252
- qcom,tcsr-msm8660
5353
- qcom,tcsr-msm8916
5454
- qcom,tcsr-msm8917
55+
- qcom,tcsr-msm8937
5556
- qcom,tcsr-msm8953
5657
- qcom,tcsr-msm8960
5758
- qcom,tcsr-msm8974

Documentation/devicetree/bindings/mfd/samsung,s2mps11.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ properties:
2525
- samsung,s2mps14-pmic
2626
- samsung,s2mps15-pmic
2727
- samsung,s2mpu02-pmic
28+
- samsung,s2mpu05-pmic
2829

2930
clocks:
3031
$ref: /schemas/clock/samsung,s2mps11.yaml
@@ -125,6 +126,18 @@ allOf:
125126
samsung,s2mps11-acokb-ground: false
126127
samsung,s2mps11-wrstbi-ground: false
127128

129+
- if:
130+
properties:
131+
compatible:
132+
contains:
133+
const: samsung,s2mpu05-pmic
134+
then:
135+
properties:
136+
regulators:
137+
$ref: /schemas/regulator/samsung,s2mpu05.yaml
138+
samsung,s2mps11-acokb-ground: false
139+
samsung,s2mps11-wrstbi-ground: false
140+
128141
examples:
129142
- |
130143
#include <dt-bindings/interrupt-controller/irq.h>

Documentation/devicetree/bindings/mfd/st,stm32-timers.yaml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ maintainers:
2121

2222
properties:
2323
compatible:
24-
const: st,stm32-timers
24+
enum:
25+
- st,stm32-timers
26+
- st,stm32mp25-timers
2527

2628
reg:
2729
maxItems: 1
@@ -36,6 +38,9 @@ properties:
3638
resets:
3739
maxItems: 1
3840

41+
power-domains:
42+
maxItems: 1
43+
3944
dmas:
4045
minItems: 1
4146
maxItems: 7
@@ -77,7 +82,9 @@ properties:
7782

7883
properties:
7984
compatible:
80-
const: st,stm32-pwm
85+
enum:
86+
- st,stm32-pwm
87+
- st,stm32mp25-pwm
8188

8289
"#pwm-cells":
8390
const: 3
@@ -113,7 +120,9 @@ properties:
113120

114121
properties:
115122
compatible:
116-
const: st,stm32-timer-counter
123+
enum:
124+
- st,stm32-timer-counter
125+
- st,stm32mp25-timer-counter
117126

118127
required:
119128
- compatible
@@ -128,12 +137,13 @@ patternProperties:
128137
enum:
129138
- st,stm32-timer-trigger
130139
- st,stm32h7-timer-trigger
140+
- st,stm32mp25-timer-trigger
131141

132142
reg:
133143
description: Identify trigger hardware block.
134144
items:
135145
minimum: 0
136-
maximum: 16
146+
maximum: 19
137147

138148
required:
139149
- compatible

Documentation/devicetree/bindings/mfd/syscon.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ select:
2727
compatible:
2828
contains:
2929
enum:
30+
- airoha,en7581-pbus-csr
3031
- al,alpine-sysfabric-service
3132
- allwinner,sun8i-a83t-system-controller
3233
- allwinner,sun8i-h3-system-controller
@@ -90,6 +91,8 @@ select:
9091
- microchip,lan966x-cpu-syscon
9192
- microchip,mpfs-sysreg-scb
9293
- microchip,sam9x60-sfr
94+
- microchip,sama7d65-ddr3phy
95+
- microchip,sama7d65-sfrbu
9396
- microchip,sama7g5-ddr3phy
9497
- mscc,ocelot-cpu-syscon
9598
- mstar,msc313-pmsleep
@@ -127,6 +130,7 @@ properties:
127130
compatible:
128131
items:
129132
- enum:
133+
- airoha,en7581-pbus-csr
130134
- al,alpine-sysfabric-service
131135
- allwinner,sun8i-a83t-system-controller
132136
- allwinner,sun8i-h3-system-controller
@@ -190,6 +194,8 @@ properties:
190194
- microchip,lan966x-cpu-syscon
191195
- microchip,mpfs-sysreg-scb
192196
- microchip,sam9x60-sfr
197+
- microchip,sama7d65-ddr3phy
198+
- microchip,sama7d65-sfrbu
193199
- microchip,sama7g5-ddr3phy
194200
- mscc,ocelot-cpu-syscon
195201
- mstar,msc313-pmsleep

0 commit comments

Comments
 (0)