Skip to content

Commit

Permalink
Merge tag 'mfd-next-6.10' of git://git.kernel.org/pub/scm/linux/kerne…
Browse files Browse the repository at this point in the history
…l/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
  ...
  • Loading branch information
torvalds committed May 22, 2024
2 parents 0bfbc91 + 1482489 commit a85629f
Show file tree
Hide file tree
Showing 77 changed files with 2,529 additions and 732 deletions.

This file was deleted.

17 changes: 0 additions & 17 deletions Documentation/devicetree/bindings/arm/apm/scu.txt

This file was deleted.

32 changes: 0 additions & 32 deletions Documentation/devicetree/bindings/arm/marvell/armada-37xx.txt

This file was deleted.

21 changes: 0 additions & 21 deletions Documentation/devicetree/bindings/input/twl4030-pwrbutton.txt

This file was deleted.

6 changes: 3 additions & 3 deletions Documentation/devicetree/bindings/mfd/actions,atc260x.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ description: |
regulators.
allOf:
- $ref: ../input/input.yaml
- $ref: /schemas/input/input.yaml

properties:
compatible:
Expand Down Expand Up @@ -57,7 +57,7 @@ properties:

switchldo1:
type: object
$ref: ../regulator/regulator.yaml
$ref: /schemas/regulator/regulator.yaml

properties:
regulator-name: true
Expand All @@ -76,7 +76,7 @@ properties:

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

properties:
regulator-name: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ properties:
maxItems: 1

patternProperties:
"^.*_(clk|rst)$":
"^.*-(clk|rst)$":
type: object
unevaluatedProperties: false

Expand Down Expand Up @@ -171,7 +171,7 @@ examples:
compatible = "allwinner,sun6i-a31-prcm";
reg = <0x01f01400 0x200>;
ar100: ar100_clk {
ar100: ar100-clk {
compatible = "allwinner,sun6i-a31-ar100-clk";
#clock-cells = <0>;
clocks = <&rtc 0>, <&osc24M>,
Expand All @@ -180,7 +180,7 @@ examples:
clock-output-names = "ar100";
};
ahb0: ahb0_clk {
ahb0: ahb0-clk {
compatible = "fixed-factor-clock";
#clock-cells = <0>;
clock-div = <1>;
Expand All @@ -189,14 +189,14 @@ examples:
clock-output-names = "ahb0";
};
apb0: apb0_clk {
apb0: apb0-clk {
compatible = "allwinner,sun6i-a31-apb0-clk";
#clock-cells = <0>;
clocks = <&ahb0>;
clock-output-names = "apb0";
};
apb0_gates: apb0_gates_clk {
apb0_gates: apb0-gates-clk {
compatible = "allwinner,sun6i-a31-apb0-gates-clk";
#clock-cells = <1>;
clocks = <&apb0>;
Expand All @@ -206,14 +206,14 @@ examples:
"apb0_i2c";
};
ir_clk: ir_clk {
ir_clk: ir-clk {
#clock-cells = <0>;
compatible = "allwinner,sun4i-a10-mod0-clk";
clocks = <&rtc 0>, <&osc24M>;
clock-output-names = "ir";
};
apb0_rst: apb0_rst {
apb0_rst: apb0-rst {
compatible = "allwinner,sun6i-a31-clock-reset";
#reset-cells = <1>;
};
Expand Down
16 changes: 12 additions & 4 deletions Documentation/devicetree/bindings/mfd/aspeed,ast2x00-scu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,18 @@ patternProperties:
type: object

'^pinctrl(@[0-9a-f]+)?$':
oneOf:
- $ref: /schemas/pinctrl/aspeed,ast2400-pinctrl.yaml
- $ref: /schemas/pinctrl/aspeed,ast2500-pinctrl.yaml
- $ref: /schemas/pinctrl/aspeed,ast2600-pinctrl.yaml
type: object
additionalProperties: true
properties:
compatible:
contains:
enum:
- aspeed,ast2400-pinctrl
- aspeed,ast2500-pinctrl
- aspeed,ast2600-pinctrl

required:
- compatible

'^interrupt-controller@[0-9a-f]+$':
description: See Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2xxx-scu-ic.txt
Expand Down
8 changes: 4 additions & 4 deletions Documentation/devicetree/bindings/mfd/brcm,cru.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,19 @@ properties:

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

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

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

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

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

additionalProperties: false

Expand Down
16 changes: 0 additions & 16 deletions Documentation/devicetree/bindings/mfd/brcm,iproc-cdru.txt

This file was deleted.

18 changes: 0 additions & 18 deletions Documentation/devicetree/bindings/mfd/brcm,iproc-mhb.txt

This file was deleted.

2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/mfd/brcm,misc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ properties:

patternProperties:
'^reset-controller@[a-f0-9]+$':
$ref: ../reset/brcm,bcm4908-misc-pcie-reset.yaml
$ref: /schemas/reset/brcm,bcm4908-misc-pcie-reset.yaml

additionalProperties: false

Expand Down
6 changes: 3 additions & 3 deletions Documentation/devicetree/bindings/mfd/canaan,k210-sysctl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ properties:
clock-controller:
# Child node
type: object
$ref: ../clock/canaan,k210-clk.yaml
$ref: /schemas/clock/canaan,k210-clk.yaml
description:
Clock controller for the SoC clocks. This child node definition
should follow the bindings specified in
Expand All @@ -45,7 +45,7 @@ properties:
reset-controller:
# Child node
type: object
$ref: ../reset/canaan,k210-rst.yaml
$ref: /schemas/reset/canaan,k210-rst.yaml
description:
Reset controller for the SoC. This child node definition
should follow the bindings specified in
Expand All @@ -54,7 +54,7 @@ properties:
syscon-reboot:
# Child node
type: object
$ref: ../power/reset/syscon-reboot.yaml
$ref: /schemas/power/reset/syscon-reboot.yaml
description:
Reboot method for the SoC. This child node definition
should follow the bindings specified in
Expand Down
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/mfd/delta,tn48m-cpld.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ required:

patternProperties:
"^gpio(@[0-9a-f]+)?$":
$ref: ../gpio/delta,tn48m-gpio.yaml
$ref: /schemas/gpio/delta,tn48m-gpio.yaml

"^reset-controller?$":
$ref: ../reset/delta,tn48m-reset.yaml
$ref: /schemas/reset/delta,tn48m-reset.yaml

additionalProperties: false

Expand Down
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/mfd/iqs62x.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ properties:
device name with ".bin" as the extension (e.g. iqs620a.bin for IQS620A).

keys:
$ref: ../input/iqs62x-keys.yaml
$ref: /schemas/input/iqs62x-keys.yaml

pwm:
$ref: ../pwm/iqs620a-pwm.yaml
$ref: /schemas/pwm/iqs620a-pwm.yaml

required:
- compatible
Expand Down
10 changes: 5 additions & 5 deletions Documentation/devicetree/bindings/mfd/kontron,sl28cpld.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,19 @@ properties:

patternProperties:
"^gpio(@[0-9a-f]+)?$":
$ref: ../gpio/kontron,sl28cpld-gpio.yaml
$ref: /schemas/gpio/kontron,sl28cpld-gpio.yaml

"^hwmon(@[0-9a-f]+)?$":
$ref: ../hwmon/kontron,sl28cpld-hwmon.yaml
$ref: /schemas/hwmon/kontron,sl28cpld-hwmon.yaml

"^interrupt-controller(@[0-9a-f]+)?$":
$ref: ../interrupt-controller/kontron,sl28cpld-intc.yaml
$ref: /schemas/interrupt-controller/kontron,sl28cpld-intc.yaml

"^pwm(@[0-9a-f]+)?$":
$ref: ../pwm/kontron,sl28cpld-pwm.yaml
$ref: /schemas/pwm/kontron,sl28cpld-pwm.yaml

"^watchdog(@[0-9a-f]+)?$":
$ref: ../watchdog/kontron,sl28cpld-wdt.yaml
$ref: /schemas/watchdog/kontron,sl28cpld-wdt.yaml

required:
- "#address-cells"
Expand Down
Loading

0 comments on commit a85629f

Please sign in to comment.