Skip to content

Commit d872306

Browse files
torvaldstorvalds
committed
Merge tag 'mfd-next-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull NFD updates from Lee Jones: "New Drivers: - Add support for the Cirrus Logic CS42L43 Audio CODEC Fix-ups: - Make use of specific printk() format tags for various optimisations - Kconfig / module modifications / tweaking - Simplify obtaining resources (memory, device data) using unified API helpers - Bunch of Device Tree additions, conversions and adaptions - Convert a bunch of Regmap configurations to use the Maple Tree cache - Ensure correct includes are present and remove some that are not required - Remove superfluous code - Reduce amount of cycles spent in critical sections - Omit the use of redundant casts and if relevant replace with better ones - Swap out raw_spin_{un}lock_irq{save,restore}() for spin_{un}lock_irq{save,restore}() Bug Fixes: - Repair theoretical deadlock situation - Fix some link-time dependencies - Use more appropriate datatype when casting" * tag 'mfd-next-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (70 commits) mfd: mc13xxx: Simplify device data fetching in probe() mfd: rz-mtu3: Replace raw_spin_lock->spin_lock() mfd: rz-mtu3: Reduce critical sections mfd: mxs-lradc: Fix Wvoid-pointer-to-enum-cast warning mfd: wm31x: Fix Wvoid-pointer-to-enum-cast warning mfd: wm8994: Fix Wvoid-pointer-to-enum-cast warning mfd: tc3589: Fix Wvoid-pointer-to-enum-cast warning mfd: lp87565: Fix Wvoid-pointer-to-enum-cast warning mfd: hi6421-pmic: Fix Wvoid-pointer-to-enum-cast warning mfd: max77541: Fix Wvoid-pointer-to-enum-cast warning mfd: max14577: Fix Wvoid-pointer-to-enum-cast warning mfd: stmpe: Fix Wvoid-pointer-to-enum-cast warning mfd: rn5t618: Remove redundant of_match_ptr() mfd: lochnagar-i2c: Remove redundant of_match_ptr() mfd: stpmic1: Remove redundant of_match_ptr() mfd: act8945a: Remove redundant of_match_ptr() mfd: rsmu_spi: Remove redundant of_match_ptr() mfd: altera-a10sr: Remove redundant of_match_ptr() mfd: rsmu_i2c: Remove redundant of_match_ptr() mfd: tc3589x: Remove redundant of_match_ptr() ...
2 parents e3b85b0 + 9aab92b commit d872306

118 files changed

Lines changed: 545 additions & 567 deletions

File tree

Some content is hidden

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

‎Documentation/devicetree/bindings/input/stmpe-keypad.txt‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎Documentation/devicetree/bindings/input/touchscreen/stmpe.txt‎

Lines changed: 0 additions & 108 deletions
This file was deleted.

‎Documentation/devicetree/bindings/mfd/allwinner,sun6i-a31-prcm.yaml‎

Lines changed: 3 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ patternProperties:
3434
- allwinner,sun6i-a31-clock-reset
3535
- fixed-factor-clock
3636

37+
required:
38+
- compatible
39+
3740
allOf:
3841
- if:
3942
properties:
@@ -55,25 +58,17 @@ patternProperties:
5558
"#clock-cells":
5659
const: 0
5760

58-
# Already checked in the main schema
59-
compatible: true
60-
6161
clocks:
6262
maxItems: 2
6363

6464
clock-output-names:
6565
maxItems: 1
6666

67-
phandle: true
68-
6967
required:
7068
- "#clock-cells"
71-
- compatible
7269
- clocks
7370
- clock-output-names
7471

75-
additionalProperties: false
76-
7772
- if:
7873
properties:
7974
compatible:
@@ -85,25 +80,17 @@ patternProperties:
8580
"#clock-cells":
8681
const: 0
8782

88-
# Already checked in the main schema
89-
compatible: true
90-
9183
clocks:
9284
maxItems: 1
9385

9486
clock-output-names:
9587
maxItems: 1
9688

97-
phandle: true
98-
9989
required:
10090
- "#clock-cells"
101-
- compatible
10291
- clocks
10392
- clock-output-names
10493

105-
additionalProperties: false
106-
10794
- if:
10895
properties:
10996
compatible:
@@ -119,26 +106,18 @@ patternProperties:
119106
offset of the bit controlling this particular gate in
120107
the register.
121108
122-
# Already checked in the main schema
123-
compatible: true
124-
125109
clocks:
126110
maxItems: 1
127111

128112
clock-output-names:
129113
minItems: 1
130114
maxItems: 32
131115

132-
phandle: true
133-
134116
required:
135117
- "#clock-cells"
136-
- compatible
137118
- clocks
138119
- clock-output-names
139120

140-
additionalProperties: false
141-
142121
- if:
143122
properties:
144123
compatible:
@@ -150,9 +129,6 @@ patternProperties:
150129
"#clock-cells":
151130
const: 0
152131

153-
# Already checked in the main schema
154-
compatible: true
155-
156132
clocks:
157133
maxItems: 4
158134
description: >
@@ -162,16 +138,11 @@ patternProperties:
162138
clock-output-names:
163139
maxItems: 1
164140

165-
phandle: true
166-
167141
required:
168142
- "#clock-cells"
169-
- compatible
170143
- clocks
171144
- clock-output-names
172145

173-
additionalProperties: false
174-
175146
- if:
176147
properties:
177148
compatible:
@@ -183,16 +154,8 @@ patternProperties:
183154
"#reset-cells":
184155
const: 1
185156

186-
# Already checked in the main schema
187-
compatible: true
188-
189-
phandle: true
190-
191157
required:
192158
- "#reset-cells"
193-
- compatible
194-
195-
additionalProperties: false
196159

197160
required:
198161
- compatible

‎Documentation/devicetree/bindings/mfd/allwinner,sun8i-a23-prcm.yaml‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -57,25 +57,17 @@ patternProperties:
5757
"#clock-cells":
5858
const: 0
5959

60-
# Already checked in the main schema
61-
compatible: true
62-
6360
clocks:
6461
maxItems: 1
6562

6663
clock-output-names:
6764
maxItems: 1
6865

69-
phandle: true
70-
7166
required:
7267
- "#clock-cells"
73-
- compatible
7468
- clocks
7569
- clock-output-names
7670

77-
additionalProperties: false
78-
7971
- if:
8072
properties:
8173
compatible:
@@ -91,26 +83,18 @@ patternProperties:
9183
offset of the bit controlling this particular gate in
9284
the register.
9385
94-
# Already checked in the main schema
95-
compatible: true
96-
9786
clocks:
9887
maxItems: 1
9988

10089
clock-output-names:
10190
minItems: 1
10291
maxItems: 32
10392

104-
phandle: true
105-
10693
required:
10794
- "#clock-cells"
108-
- compatible
10995
- clocks
11096
- clock-output-names
11197

112-
additionalProperties: false
113-
11498
- if:
11599
properties:
116100
compatible:
@@ -122,34 +106,8 @@ patternProperties:
122106
"#reset-cells":
123107
const: 1
124108

125-
# Already checked in the main schema
126-
compatible: true
127-
128-
phandle: true
129-
130109
required:
131110
- "#reset-cells"
132-
- compatible
133-
134-
additionalProperties: false
135-
136-
- if:
137-
properties:
138-
compatible:
139-
contains:
140-
const: allwinner,sun8i-a23-codec-analog
141-
142-
then:
143-
properties:
144-
# Already checked in the main schema
145-
compatible: true
146-
147-
phandle: true
148-
149-
required:
150-
- compatible
151-
152-
additionalProperties: false
153111

154112
required:
155113
- compatible

‎Documentation/devicetree/bindings/mfd/atmel-flexcom.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ at boot time according to the device tree.
66

77
Required properties:
88
- compatible: Should be "atmel,sama5d2-flexcom"
9+
or "microchip,sam9x7-flexcom", "atmel,sama5d2-flexcom"
910
- reg: Should be the offset/length value for Flexcom dedicated
1011
I/O registers (without USART, TWI or SPI registers).
1112
- clocks: Should be the Flexcom peripheral clock from PMC.

‎Documentation/devicetree/bindings/mfd/atmel-gpbr.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Required properties:
66
- compatible: Should be one of the following:
77
"atmel,at91sam9260-gpbr", "syscon"
88
"microchip,sam9x60-gpbr", "syscon"
9+
"microchip,sam9x7-gpbr", "microchip,sam9x60-gpbr", "syscon"
910
- reg: contains offset/length value of the GPBR memory
1011
region.
1112

‎Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Required properties:
88
"atmel,sama5d3-hlcdc"
99
"atmel,sama5d4-hlcdc"
1010
"microchip,sam9x60-hlcdc"
11+
"microchip,sam9x75-xlcdc"
1112
- reg: base address and size of the HLCDC device registers.
1213
- clock-names: the name of the 3 clocks requested by the HLCDC device.
1314
Should contain "periph_clk", "sys_clk" and "slow_clk".

0 commit comments

Comments
 (0)