Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'mfd-next-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd 

Pull MFD updates from Lee Jones:
 "New drivers:
   - Add support for Cherry Trail Dollar Cove TI PMIC
   - Add support for Add Spreadtrum SC27xx series PMICs

  New device support:
   - Add support Regulator to axp20x

  New functionality:
   - Add DT support; aspeed-scu sc27xx-pmic
   - Add power saving support; rts5249

  Fix-ups:
   - DT clean-up/rework; tps65217, max77693, iproc-cdru, iproc-mhb, tps65218
   - Staticise/constify; stw481x
   - Use new succinct IRQ API; fsl-imx25-tsadc
   - Kconfig fix-ups; MFD_TPS65218
   - Identify SPI method; lpc_ich
   - Use managed resources (devm_*) calls; ssbi
   - Remove unused/obsolete code/documentation; mc13xxx

  Bug fixes:
   - Fix typo in MAINTAINERS
   - Fix error handling; mxs-lradc
   - Clean-up IRQs on .remove; fsl-imx25-tsadc"

* tag 'mfd-next-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (21 commits)
  dt-bindings: mfd: mc13xxx: Remove obsolete property
  mfd: axp20x: Add axp20x-regulator cell for AXP813
  mfd: Add Spreadtrum SC27xx series PMICs driver
  dt-bindings: mfd: Add Spreadtrum SC27xx PMIC documentation
  mfd: ssbi: Use devm_of_platform_populate()
  mfd: fsl-imx25: Clean up irq settings during removal
  mfd: mxs-lradc: Fix error handling in mxs_lradc_probe()
  mfd: lpc_ich: Avoton/Rangeley uses SPI_BYT method
  mfd: tps65218: Introduce dependency on CONFIG_OF
  mfd: tps65218: Correct the config description
  MAINTAINERS: Fix Dialog search term for watchdog binding file
  mfd: fsl-imx25: Set irq handler and data in one go
  mfd: rts5249: Add support for RTS5250S power saving
  ACPI / PMIC: Add opregion driver for Intel Dollar Cove TI PMIC
  mfd: Add support for Cherry Trail Dollar Cove TI PMIC
  syscon: dt-bindings: Add binding document for iProc MHB block
  syscon: dt-bindings: Add binding doc for Broadcom iProc CDRU
  mfd: max77693: Add muic of_compatible in mfd_cell
  mfd: stw481x: Make three arrays static const, reduces object code size
  mfd: tps65217: Introduce dependency on CONFIG_OF
  ...
parents 2bf16b7a b2596d70

Documentation/devicetree/bindings/mfd/aspeed-scu.txt

+6 −0
Original line number Diff line number Diff line
@@ -9,10 +9,16 @@ Required properties: 
		"aspeed,g5-scu", "syscon", "simple-mfd"



- reg:		contains the offset and length of the SCU memory region

- #clock-cells: should be set to <1> - the system controller is also a

	clock provider

- #reset-cells: should be set to <1> - the system controller is also a

	reset line provider



Example:



syscon: syscon@1e6e2000 {

	compatible = "aspeed,ast2400-scu", "syscon", "simple-mfd";

	reg = <0x1e6e2000 0x1a8>;

	#clock-cells = <1>;

	#reset-cells = <1>;

};

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

0 → 100644
+16 −0
Original line number Diff line number Diff line 
Broadcom iProc Chip Device Resource Unit (CDRU)



Various Broadcom iProc SoCs have a set of registers that provide various

chip specific device and resource configurations. This node allows access to

these CDRU registers via syscon.



Required properties:

- compatible: should contain:

		"brcm,sr-cdru", "syscon" for Stingray

- reg: base address and range of the CDRU registers



Example:

	cdru: syscon@6641d000 {

		compatible = "brcm,sr-cdru", "syscon";

		reg = <0 0x6641d000 0 0x400>;

	};

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

0 → 100644
+18 −0
Original line number Diff line number Diff line 
Broadcom iProc Multi Host Bridge (MHB)



Certain Broadcom iProc SoCs have a multi host bridge (MHB) block that controls

the connection and configuration of 1) internal PCIe serdes; 2) PCIe endpoint

interface; 3) access to the Nitro (network processing) engine



This node allows access to these MHB registers via syscon.



Required properties:

- compatible: should contain:

		"brcm,sr-mhb", "syscon" for Stingray

- reg: base address and range of the MHB registers



Example:

	mhb: syscon@60401000 {

		compatible = "brcm,sr-mhb", "syscon";

		reg = <0 0x60401000 0 0x38c>;

	};

Documentation/devicetree/bindings/mfd/max77693.txt

+6 −0
Original line number Diff line number Diff line
@@ -127,6 +127,12 @@ Required properties for the LED child node: 
Optional properties for the LED child node:

- label : see Documentation/devicetree/bindings/leds/common.txt



Optional nodes:

- max77693-muic :

	Node used only by extcon consumers.

	Required properties:

		- compatible : "maxim,max77693-muic"



Example:

#include <dt-bindings/leds/common.h>

Documentation/devicetree/bindings/mfd/mc13xxx.txt

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ MC13892 regulators: 
Examples:



ecspi@70010000 { /* ECSPI1 */

	fsl,spi-num-chipselects = <2>;

	cs-gpios = <&gpio4 24 0>, /* GPIO4_24 */

		   <&gpio4 25 0>; /* GPIO4_25 */