Skip to content

Commit 3af4906

Browse files
torvaldstorvalds
committed
Merge tag 'mfd-next-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD updates from Lee Jones: "New Drivers: - Add support for Renesas RZ/G2L MTU3 New Device Support: - Add support for Lenovo Yoga Book X90F to Intel CHT WC - Add support for MAX5970 and MAX5978 to Simple MFD (I2C) - Add support for Meteor Lake PCH-S LPSS PCI to Intel LPSS PCI - Add support for AXP15060 PMIC to X-Powers PMIC collection Remove Device Support: - Remove support for Samsung 5M8751 and S5M8763 PMIC devices New Functionality: - Convert deprecated QCOM IRQ Chip to config registers - Add support for 32-bit address spaces to Renesas SMUs Fix-ups: - Make use of APIs / MACROs designed to simplify and demystify - Add / improve Device Tree bindings - Memory saving struct layout optimisations - Remove old / deprecated functionality - Factor out unassigned register addresses from ranges - Trivial: Spelling fixes, renames and coding style fixes - Rid 'defined but not used' warnings - Remove ineffective casts and pointer stubs Bug Fixes: - Fix incorrectly non-inverted mask/unmask IRQs on QCOM platforms - Remove MODULE_*() helpers from non-tristate drivers - Do not attempt to use out-of-range memory addresses associated with io_base - Provide missing export helpers - Fix remap bulk read optimisation fallout - Fix memory leak issues in error paths" * tag 'mfd-next-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (88 commits) dt-bindings: mfd: ti,j721e-system-controller: Add SoC chip ID leds: bd2606mvv: Driver for the Rohm 6 Channel i2c LED driver dt-bindings: mfd: qcom,spmi-pmic: Document flash LED controller dt-bindings: mfd: x-powers,axp152: Document the AXP15060 variant mfd: axp20x: Add support for AXP15060 PMIC dt-bindings: mfd: x-powers,axp152: Document the AXP313a variant counter: rz-mtu3-cnt: Unlock on error in rz_mtu3_count_ceiling_write() dt-bindings: mfd: dlg,da9063: Document voltage monitoring dt-bindings: mfd: stm32: Remove unnecessary blank lines dt-bindings: mfd: qcom,spmi-pmic: Use generic ADC node name in examples dt-bindings: mfd: syscon: Add nuvoton,ma35d1-sys compatible MAINTAINERS: Add entries for Renesas RZ/G2L MTU3a counter driver counter: Add Renesas RZ/G2L MTU3a counter driver Documentation: ABI: sysfs-bus-counter: add cascade_counts_enable and external_input_phase_clock_select mfd: Add Renesas RZ/G2L MTU3a core driver dt-bindings: timer: Document RZ/G2L MTU3a bindings mfd: rsmu_i2c: Convert to i2c's .probe_new() again mfd: intel-lpss: Add Intel Meteor Lake PCH-S LPSS PCI IDs mfd: dln2: Fix memory leak in dln2_probe() mfd: axp20x: Fix axp288 writable-ranges ...
2 parents c5eb8bf + 9e9ff39 commit 3af4906

91 files changed

Lines changed: 3519 additions & 845 deletions

Some content is hidden

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

‎Documentation/ABI/testing/sysfs-bus-counter‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,33 @@
1+
What: /sys/bus/counter/devices/counterX/cascade_counts_enable
2+
KernelVersion: 6.4
3+
Contact: linux-iio@vger.kernel.org
4+
Description:
5+
Indicates the cascading of Counts on Counter X.
6+
7+
Valid attribute values are boolean.
8+
9+
What: /sys/bus/counter/devices/counterX/external_input_phase_clock_select
10+
KernelVersion: 6.4
11+
Contact: linux-iio@vger.kernel.org
12+
Description:
13+
Selects the external clock pin for phase counting mode of
14+
Counter X.
15+
16+
MTCLKA-MTCLKB:
17+
MTCLKA and MTCLKB pins are selected for the external
18+
phase clock.
19+
20+
MTCLKC-MTCLKD:
21+
MTCLKC and MTCLKD pins are selected for the external
22+
phase clock.
23+
24+
What: /sys/bus/counter/devices/counterX/external_input_phase_clock_select_available
25+
KernelVersion: 6.4
26+
Contact: linux-iio@vger.kernel.org
27+
Description:
28+
Discrete set of available values for the respective device
29+
configuration are listed in this file.
30+
131
What: /sys/bus/counter/devices/counterX/countY/count
232
KernelVersion: 5.2
333
Contact: linux-iio@vger.kernel.org
@@ -215,6 +245,8 @@ Contact: linux-iio@vger.kernel.org
215245
Description:
216246
This attribute indicates the number of overflows of count Y.
217247

248+
What: /sys/bus/counter/devices/counterX/cascade_counts_enable_component_id
249+
What: /sys/bus/counter/devices/counterX/external_input_phase_clock_select_component_id
218250
What: /sys/bus/counter/devices/counterX/countY/capture_component_id
219251
What: /sys/bus/counter/devices/counterX/countY/ceiling_component_id
220252
What: /sys/bus/counter/devices/counterX/countY/floor_component_id

‎Documentation/devicetree/bindings/mfd/canaan,k210-sysctl.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ properties:
3636
clock-controller:
3737
# Child node
3838
type: object
39-
$ref: "../clock/canaan,k210-clk.yaml"
39+
$ref: ../clock/canaan,k210-clk.yaml
4040
description:
4141
Clock controller for the SoC clocks. This child node definition
4242
should follow the bindings specified in
@@ -45,7 +45,7 @@ properties:
4545
reset-controller:
4646
# Child node
4747
type: object
48-
$ref: "../reset/canaan,k210-rst.yaml"
48+
$ref: ../reset/canaan,k210-rst.yaml
4949
description:
5050
Reset controller for the SoC. This child node definition
5151
should follow the bindings specified in
@@ -54,7 +54,7 @@ properties:
5454
syscon-reboot:
5555
# Child node
5656
type: object
57-
$ref: "../power/reset/syscon-reboot.yaml"
57+
$ref: ../power/reset/syscon-reboot.yaml
5858
description:
5959
Reboot method for the SoC. This child node definition
6060
should follow the bindings specified in

‎Documentation/devicetree/bindings/mfd/google,cros-ec.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ properties:
6565
ARM Cortex M4 Co-processor. Contains the name of the rpmsg
6666
device. Used to match the subnode to the rpmsg device announced by
6767
the SCP.
68-
$ref: "/schemas/types.yaml#/definitions/string"
68+
$ref: /schemas/types.yaml#/definitions/string
6969

7070
spi-max-frequency: true
7171

@@ -94,23 +94,23 @@ properties:
9494
const: 0
9595

9696
typec:
97-
$ref: "/schemas/chrome/google,cros-ec-typec.yaml#"
97+
$ref: /schemas/chrome/google,cros-ec-typec.yaml#
9898

9999
ec-pwm:
100-
$ref: "/schemas/pwm/google,cros-ec-pwm.yaml#"
100+
$ref: /schemas/pwm/google,cros-ec-pwm.yaml#
101101
deprecated: true
102102

103103
pwm:
104-
$ref: "/schemas/pwm/google,cros-ec-pwm.yaml#"
104+
$ref: /schemas/pwm/google,cros-ec-pwm.yaml#
105105

106106
kbd-led-backlight:
107-
$ref: "/schemas/chrome/google,cros-kbd-led-backlight.yaml#"
107+
$ref: /schemas/chrome/google,cros-kbd-led-backlight.yaml#
108108

109109
keyboard-controller:
110-
$ref: "/schemas/input/google,cros-ec-keyb.yaml#"
110+
$ref: /schemas/input/google,cros-ec-keyb.yaml#
111111

112112
proximity:
113-
$ref: "/schemas/iio/proximity/google,cros-ec-mkbp-proximity.yaml#"
113+
$ref: /schemas/iio/proximity/google,cros-ec-mkbp-proximity.yaml#
114114

115115
codecs:
116116
type: object
@@ -126,7 +126,7 @@ properties:
126126
patternProperties:
127127
"^ec-codec@[a-f0-9]+$":
128128
type: object
129-
$ref: "/schemas/sound/google,cros-ec-codec.yaml#"
129+
$ref: /schemas/sound/google,cros-ec-codec.yaml#
130130

131131
required:
132132
- "#address-cells"
@@ -151,15 +151,15 @@ properties:
151151
patternProperties:
152152
"^i2c-tunnel[0-9]*$":
153153
type: object
154-
$ref: "/schemas/i2c/google,cros-ec-i2c-tunnel.yaml#"
154+
$ref: /schemas/i2c/google,cros-ec-i2c-tunnel.yaml#
155155

156156
"^regulator@[0-9]+$":
157157
type: object
158-
$ref: "/schemas/regulator/google,cros-ec-regulator.yaml#"
158+
$ref: /schemas/regulator/google,cros-ec-regulator.yaml#
159159

160160
"^extcon[0-9]*$":
161161
type: object
162-
$ref: "/schemas/extcon/extcon-usbc-cros-ec.yaml#"
162+
$ref: /schemas/extcon/extcon-usbc-cros-ec.yaml#
163163

164164
required:
165165
- compatible

‎Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ properties:
5353
'^ldo[0-9]+$':
5454
type: object
5555

56-
$ref: "/schemas/regulator/regulator.yaml#"
56+
$ref: /schemas/regulator/regulator.yaml#
5757

5858
unevaluatedProperties: false
5959

‎Documentation/devicetree/bindings/mfd/maxim,max5970.yaml‎

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mfd/maxim,max5970.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Regulator for MAX5970 Smart Switch from Maxim Integrated
8+
9+
maintainers:
10+
- Patrick Rudolph <patrick.rudolph@9elements.com>
11+
12+
description: |
13+
The smart switch provides no output regulation, but independent fault protection
14+
and voltage and current sensing.
15+
Programming is done through I2C bus.
16+
17+
Datasheets:
18+
https://datasheets.maximintegrated.com/en/ds/MAX5970.pdf
19+
https://datasheets.maximintegrated.com/en/ds/MAX5978.pdf
20+
21+
properties:
22+
compatible:
23+
enum:
24+
- maxim,max5970
25+
- maxim,max5978
26+
27+
reg:
28+
maxItems: 1
29+
30+
interrupts:
31+
maxItems: 1
32+
33+
leds:
34+
type: object
35+
description:
36+
Properties for four LEDS.
37+
38+
properties:
39+
"#address-cells":
40+
const: 1
41+
42+
"#size-cells":
43+
const: 0
44+
45+
patternProperties:
46+
"^led@[0-3]$":
47+
$ref: /schemas/leds/common.yaml#
48+
type: object
49+
50+
additionalProperties: false
51+
52+
vss1-supply:
53+
description: Supply of the first channel.
54+
55+
vss2-supply:
56+
description: Supply of the second channel.
57+
58+
regulators:
59+
type: object
60+
description:
61+
Properties for both hot swap control/switch.
62+
63+
patternProperties:
64+
"^sw[0-1]$":
65+
$ref: /schemas/regulator/regulator.yaml#
66+
type: object
67+
properties:
68+
shunt-resistor-micro-ohms:
69+
description: |
70+
The value of current sense resistor in microohms.
71+
72+
required:
73+
- shunt-resistor-micro-ohms
74+
75+
unevaluatedProperties: false
76+
77+
additionalProperties: false
78+
79+
required:
80+
- compatible
81+
- reg
82+
- regulators
83+
- vss1-supply
84+
85+
allOf:
86+
- if:
87+
properties:
88+
compatible:
89+
enum:
90+
- maxim,max5970
91+
then:
92+
required:
93+
- vss2-supply
94+
95+
additionalProperties: false
96+
97+
examples:
98+
- |
99+
i2c {
100+
#address-cells = <1>;
101+
#size-cells = <0>;
102+
regulator@3a {
103+
compatible = "maxim,max5978";
104+
reg = <0x3a>;
105+
vss1-supply = <&p3v3>;
106+
107+
regulators {
108+
sw0_ref_0: sw0 {
109+
shunt-resistor-micro-ohms = <12000>;
110+
};
111+
};
112+
113+
leds {
114+
#address-cells = <1>;
115+
#size-cells = <0>;
116+
led@0 {
117+
reg = <0>;
118+
label = "led0";
119+
default-state = "on";
120+
};
121+
led@1 {
122+
reg = <1>;
123+
label = "led1";
124+
default-state = "on";
125+
};
126+
};
127+
};
128+
};
129+
130+
- |
131+
i2c {
132+
#address-cells = <1>;
133+
#size-cells = <0>;
134+
135+
regulator@3a {
136+
compatible = "maxim,max5970";
137+
reg = <0x3a>;
138+
vss1-supply = <&p3v3>;
139+
vss2-supply = <&p5v>;
140+
141+
regulators {
142+
sw0_ref_1: sw0 {
143+
shunt-resistor-micro-ohms = <12000>;
144+
};
145+
sw1_ref_1: sw1 {
146+
shunt-resistor-micro-ohms = <10000>;
147+
};
148+
};
149+
};
150+
};
151+
...

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ properties:
3333
compatible:
3434
items:
3535
- enum:
36+
- qcom,pm2250
3637
- qcom,pm6125
3738
- qcom,pm6150
3839
- qcom,pm6150l
@@ -78,6 +79,7 @@ properties:
7879
- qcom,pmk8350
7980
- qcom,pmk8550
8081
- qcom,pmm8155au
82+
- qcom,pmm8654au
8183
- qcom,pmp8074
8284
- qcom,pmr735a
8385
- qcom,pmr735b
@@ -115,6 +117,7 @@ patternProperties:
115117
type: object
116118
oneOf:
117119
- $ref: /schemas/iio/adc/qcom,spmi-iadc.yaml#
120+
- $ref: /schemas/iio/adc/qcom,spmi-rradc.yaml#
118121
- $ref: /schemas/iio/adc/qcom,spmi-vadc.yaml#
119122

120123
"^adc-tm@[0-9a-f]+$":
@@ -135,6 +138,14 @@ patternProperties:
135138
type: object
136139
$ref: /schemas/pinctrl/qcom,pmic-gpio.yaml#
137140

141+
"^led-controller@[0-9a-f]+$":
142+
type: object
143+
$ref: /schemas/leds/qcom,spmi-flash-led.yaml#
144+
145+
"^nvram@[0-9a-f]+$":
146+
type: object
147+
$ref: /schemas/nvmem/qcom,spmi-sdam.yaml#
148+
138149
"pon@[0-9a-f]+$":
139150
type: object
140151
$ref: /schemas/power/reset/qcom,pon.yaml#
@@ -276,12 +287,12 @@ examples:
276287
#size-cells = <0>;
277288
#io-channel-cells = <1>;
278289
279-
adc-chan@6 {
290+
channel@6 {
280291
reg = <ADC5_DIE_TEMP>;
281292
label = "die_temp";
282293
};
283294
284-
adc-chan@4f {
295+
channel@4f {
285296
reg = <ADC5_AMUX_THM3_100K_PU>;
286297
qcom,ratiometric;
287298
qcom,hw-settle-time = <200>;

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,16 @@ properties:
2525
- qcom,sc8280xp-tcsr
2626
- qcom,sdm630-tcsr
2727
- qcom,sdm845-tcsr
28+
- qcom,sdx55-tcsr
29+
- qcom,sdx65-tcsr
2830
- qcom,sm8150-tcsr
31+
- qcom,sm8450-tcsr
2932
- qcom,tcsr-apq8064
3033
- qcom,tcsr-apq8084
3134
- qcom,tcsr-ipq5332
3235
- qcom,tcsr-ipq6018
3336
- qcom,tcsr-ipq8064
37+
- qcom,tcsr-ipq9574
3438
- qcom,tcsr-mdm9615
3539
- qcom,tcsr-msm8226
3640
- qcom,tcsr-msm8660

‎Documentation/devicetree/bindings/mfd/qcom-pm8xxx.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ patternProperties:
4949

5050
"rtc@[0-9a-f]+$":
5151
type: object
52-
$ref: "../rtc/qcom-pm8xxx-rtc.yaml"
52+
$ref: ../rtc/qcom-pm8xxx-rtc.yaml
5353

5454
required:
5555
- compatible

‎Documentation/devicetree/bindings/mfd/rohm,bd71815-pmic.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ properties:
4646

4747
rohm,clkout-open-drain:
4848
description: clk32kout mode. Set to 1 for "open-drain" or 0 for "cmos".
49-
$ref: "/schemas/types.yaml#/definitions/uint32"
49+
$ref: /schemas/types.yaml#/definitions/uint32
5050
minimum: 0
5151
maximum: 1
5252

‎Documentation/devicetree/bindings/mfd/rohm,bd71828-pmic.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ properties:
4646

4747
rohm,clkout-open-drain:
4848
description: clk32kout mode. Set to 1 for "open-drain" or 0 for "cmos".
49-
$ref: "/schemas/types.yaml#/definitions/uint32"
49+
$ref: /schemas/types.yaml#/definitions/uint32
5050
minimum: 0
5151
maximum: 1
5252

0 commit comments

Comments
 (0)