Commit a85629f4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents 0bfbc914 1482489b

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

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
Altera SOCFPGA SDRAM Controller



Required properties:

- compatible : Should contain "altr,sdr-ctl" and "syscon".

  syscon is required by the Altera SOCFPGA SDRAM EDAC.

- reg : Should contain 1 register range (address and length)



Example:

	sdr: sdr@ffc25000 {

		compatible = "altr,sdr-ctl", "syscon";

		reg = <0xffc25000 0x1000>;

	};

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

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
APM X-GENE SoC series SCU Registers



This system clock unit contain various register that control block resets,

clock enable/disables, clock divisors and other deepsleep registers.



Properties:

 - compatible : should contain two values. First value must be:

		   - "apm,xgene-scu"

		second value must be always "syscon".



 - reg : offset and length of the register set.



Example :

	scu: system-clk-controller@17000000 {

		compatible = "apm,xgene-scu","syscon";

		reg = <0x0 0x17000000 0x0 0x400>;

	};

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

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
Power management

----------------



For power management (particularly DVFS and AVS), the North Bridge

Power Management component is needed:



Required properties:

- compatible     : should contain "marvell,armada-3700-nb-pm", "syscon";

- reg            : the register start and length for the North Bridge

		    Power Management



Example:



nb_pm: syscon@14000 {

	compatible = "marvell,armada-3700-nb-pm", "syscon";

	reg = <0x14000 0x60>;

}



AVS

---



For AVS an other component is needed:



Required properties:

- compatible     : should contain "marvell,armada-3700-avs", "syscon";

- reg            : the register start and length for the AVS



Example:

avs: avs@11500 {

	compatible = "marvell,armada-3700-avs", "syscon";

	reg = <0x11500 0x40>;

}

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

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
Texas Instruments TWL family (twl4030) pwrbutton module



This module is part of the TWL4030. For more details about the whole

chip see Documentation/devicetree/bindings/mfd/ti,twl.yaml.



This module provides a simple power button event via an Interrupt.



Required properties:

- compatible: should be one of the following

   - "ti,twl4030-pwrbutton": For controllers compatible with twl4030

- interrupts: should be one of the following

   - <8>: For controllers compatible with twl4030



Example:



&twl {

	twl_pwrbutton: pwrbutton {

		compatible = "ti,twl4030-pwrbutton";

		interrupts = <8>;

	};

};

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

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ description: | 
  regulators.



allOf:

  - $ref: ../input/input.yaml

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



properties:

  compatible:
@@ -57,7 +57,7 @@ properties: 


      switchldo1:

        type: object

        $ref: ../regulator/regulator.yaml

        $ref: /schemas/regulator/regulator.yaml



        properties:

          regulator-name: true
@@ -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