Skip to content

Commit a85629f

Browse files
committed
Merge tag 'mfd-next-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD updates from Lee Jones: "New Device Support: - Add support for X-Powers AXP717 PMIC to AXP22X - Add support for Rockchip RK816 PMIC to RK8XX - Add support for TI TPS65224 PMIC to TPS6594 New Functionality: - Add Power Off functionality to Rohm BD71828 - Allow I2C SMBus access in Renesas RSMU Fix-ups: - Device Tree binding adaptions/conversions/creation - Shift Intel support over to MSI interrupts - Generify adding platform data away from being ACPI specific - Use device core supplied attribute to register sysfs entries - Replace hand-rolled functionality with generic APIs - Utilise centrally provided helpers and macros - Clean-up error handling - Remove superfluous/duplicated/unused sections - Trivial; spelling, whitespace, coding-style adaptions - More Maple Tree conversions" * tag 'mfd-next-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (44 commits) dt-bindings: mfd: Use full path to other schemas mfd: rsmu: support I2C SMBus access dt-bindings: mfd: Convert lp873x.txt to json-schema dt-bindings: mfd: aspeed: Drop 'oneOf' for pinctrl node dt-bindings: mfd: allwinner,sun6i-a31-prcm: Use hyphens in node names mfd: ssbi: Remove unused field 'slave' from 'struct ssbi' mfd: kempld: Remove custom DMI matching code mfd: cs42l43: Update patching revision check dt-bindings: mfd: qcom: pm8xxx: Add pm8901 compatible mfd: timberdale: Remove redundant assignment to variable err dt-bindings: mfd: qcom,spmi-pmic: Add pbs to SPMI device types dt-bindings: mfd: syscon: Add ti,am62p-cpsw-mac-efuse compatible dt-bindings: mfd: qcom,tcsr: Add compatible for SDX75 mfd: axp20x: Convert to use Maple Tree register cache mfd: bd71828: Remove commented code lines mfd: intel-m10-bmc: Change staging size to a variable dt-bindings: mfd: Add ROHM BD71879 mfd: Tidy Kconfig dependency's parentheses mfd: ocelot-spi: Use spi_sync_transfer() dt-bindings: mfd: syscon: Add missing simple syscon compatibles ...
2 parents 0bfbc91 + 1482489 commit a85629f

Some content is hidden

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

77 files changed

+2529
-732
lines changed

Documentation/devicetree/bindings/arm/altera/socfpga-sdram-controller.txt

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

Documentation/devicetree/bindings/arm/apm/scu.txt

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

Documentation/devicetree/bindings/arm/marvell/armada-37xx.txt

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

Documentation/devicetree/bindings/input/twl4030-pwrbutton.txt

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

Documentation/devicetree/bindings/mfd/actions,atc260x.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ description: |
2121
regulators.
2222
2323
allOf:
24-
- $ref: ../input/input.yaml
24+
- $ref: /schemas/input/input.yaml
2525

2626
properties:
2727
compatible:
@@ -57,7 +57,7 @@ properties:
5757

5858
switchldo1:
5959
type: object
60-
$ref: ../regulator/regulator.yaml
60+
$ref: /schemas/regulator/regulator.yaml
6161

6262
properties:
6363
regulator-name: true
@@ -76,7 +76,7 @@ properties:
7676

7777
"^(dcdc[0-4]|ldo[0-9]|ldo1[1-2])$":
7878
type: object
79-
$ref: ../regulator/regulator.yaml
79+
$ref: /schemas/regulator/regulator.yaml
8080

8181
properties:
8282
regulator-name: true

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ properties:
2020
maxItems: 1
2121

2222
patternProperties:
23-
"^.*_(clk|rst)$":
23+
"^.*-(clk|rst)$":
2424
type: object
2525
unevaluatedProperties: false
2626

@@ -171,7 +171,7 @@ examples:
171171
compatible = "allwinner,sun6i-a31-prcm";
172172
reg = <0x01f01400 0x200>;
173173
174-
ar100: ar100_clk {
174+
ar100: ar100-clk {
175175
compatible = "allwinner,sun6i-a31-ar100-clk";
176176
#clock-cells = <0>;
177177
clocks = <&rtc 0>, <&osc24M>,
@@ -180,7 +180,7 @@ examples:
180180
clock-output-names = "ar100";
181181
};
182182
183-
ahb0: ahb0_clk {
183+
ahb0: ahb0-clk {
184184
compatible = "fixed-factor-clock";
185185
#clock-cells = <0>;
186186
clock-div = <1>;
@@ -189,14 +189,14 @@ examples:
189189
clock-output-names = "ahb0";
190190
};
191191
192-
apb0: apb0_clk {
192+
apb0: apb0-clk {
193193
compatible = "allwinner,sun6i-a31-apb0-clk";
194194
#clock-cells = <0>;
195195
clocks = <&ahb0>;
196196
clock-output-names = "apb0";
197197
};
198198
199-
apb0_gates: apb0_gates_clk {
199+
apb0_gates: apb0-gates-clk {
200200
compatible = "allwinner,sun6i-a31-apb0-gates-clk";
201201
#clock-cells = <1>;
202202
clocks = <&apb0>;
@@ -206,14 +206,14 @@ examples:
206206
"apb0_i2c";
207207
};
208208
209-
ir_clk: ir_clk {
209+
ir_clk: ir-clk {
210210
#clock-cells = <0>;
211211
compatible = "allwinner,sun4i-a10-mod0-clk";
212212
clocks = <&rtc 0>, <&osc24M>;
213213
clock-output-names = "ir";
214214
};
215215
216-
apb0_rst: apb0_rst {
216+
apb0_rst: apb0-rst {
217217
compatible = "allwinner,sun6i-a31-clock-reset";
218218
#reset-cells = <1>;
219219
};

Documentation/devicetree/bindings/mfd/aspeed,ast2x00-scu.yaml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,18 @@ patternProperties:
4747
type: object
4848

4949
'^pinctrl(@[0-9a-f]+)?$':
50-
oneOf:
51-
- $ref: /schemas/pinctrl/aspeed,ast2400-pinctrl.yaml
52-
- $ref: /schemas/pinctrl/aspeed,ast2500-pinctrl.yaml
53-
- $ref: /schemas/pinctrl/aspeed,ast2600-pinctrl.yaml
50+
type: object
51+
additionalProperties: true
52+
properties:
53+
compatible:
54+
contains:
55+
enum:
56+
- aspeed,ast2400-pinctrl
57+
- aspeed,ast2500-pinctrl
58+
- aspeed,ast2600-pinctrl
59+
60+
required:
61+
- compatible
5462

5563
'^interrupt-controller@[0-9a-f]+$':
5664
description: See Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt

Documentation/devicetree/bindings/mfd/brcm,cru.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ properties:
3434

3535
patternProperties:
3636
'^clock-controller@[a-f0-9]+$':
37-
$ref: ../clock/brcm,iproc-clocks.yaml
37+
$ref: /schemas/clock/brcm,iproc-clocks.yaml
3838

3939
'^phy@[a-f0-9]+$':
40-
$ref: ../phy/bcm-ns-usb2-phy.yaml
40+
$ref: /schemas/phy/bcm-ns-usb2-phy.yaml
4141

4242
'^pinctrl@[a-f0-9]+$':
43-
$ref: ../pinctrl/brcm,ns-pinmux.yaml
43+
$ref: /schemas/pinctrl/brcm,ns-pinmux.yaml
4444

4545
'^syscon@[a-f0-9]+$':
4646
$ref: syscon.yaml
4747

4848
'^thermal@[a-f0-9]+$':
49-
$ref: ../thermal/brcm,ns-thermal.yaml
49+
$ref: /schemas/thermal/brcm,ns-thermal.yaml
5050

5151
additionalProperties: false
5252

Documentation/devicetree/bindings/mfd/brcm,iproc-cdru.txt

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

Documentation/devicetree/bindings/mfd/brcm,iproc-mhb.txt

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

0 commit comments

Comments
 (0)