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

Commit 54c72d59 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mfd-for-linus-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd 

Pull MFD update from Lee Jones:
 "Changes to existing drivers:
   - checkpatch fixes throughout the subsystem
   - use Regmap to handle IRQs in max77686, extcon-max77693 and
     mc13xxx-core
   - use DMA in rtsx_pcr
   - restrict building on unsupported architectures on timberdale,
     cs5535
   - SPI hardening in cros_ec_spi
   - more robust error handing in asic3, cros_ec, ab8500-debugfs,
     max77686 and pcf50633-core
   - reorder PM runtime and regulator handing during shutdown in arizona
   - enable wakeup in cros_ec_spi
   - unused variable/code clean-up in pm8921-core, cros_ec, htc-i2cpld,
     tps65912-spi, wm5110-tables and ab8500-debugfs
   - add regulator handing into suspend() in sec-core
   - remove pointless wrapper functions in extcon-max77693 and
     i2c-cros-ec-tunnel
   - use cross-architecture friendly data sizes in stmpe-i2c, arizona,
     max77686 and tps65910
   - devicetree documentation updates throughout
   - provide power management support in max77686
   - few OF clean-ups in max77686
   - use manged resources in tps6105x

  New drivers/supported devices:
   - add support for s2mpu02 to sec-core
   - add support for Allwinner A32 to sun6i-prcm
   - add support for Maxim 77802 in max77686
   - add support for DA9063 AD in da9063
   - new driver for Intel PMICs (generic) and specifically Crystal Cove

  (Re-)moved drivers ==
   - move out keyboard functionality cros_ec ==> input/keyboard/cros_ec_keyb"

* tag 'mfd-for-linus-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (101 commits)
  MAINTAINERS: Update MFD repo location
  mfd: omap-usb-host: Fix improper mask use.
  mfd: arizona: Only free the CTRLIF_ERR IRQ if we requested it
  mfd: arizona: Add missing handling for ISRC3 under/overclocked
  mfd: wm5110: Add new interrupt register definitions
  mfd: arizona: Rename thermal shutdown interrupt
  mfd: wm5110: Add in the output done interrupts
  mfd: wm5110: Remove non-existant interrupts
  mfd: tps65912-spi: Remove unused variable
  mfd: htc-i2cpld: Remove unused code
  mfd: da9063: Add support for AD silicon variant
  mfd: arizona: Map MICVDD from extcon device to the Arizona core
  mfd: arizona: Add MICVDD to mapped regulators for wm8997
  mfd: max77686: Ensure device type IDs are architecture agnostic
  mfd: max77686: Add Maxim 77802 PMIC support
  mfd: tps6105x: Use managed resources when allocating memory
  mfd: wm8997-tables: Suppress 'line over 80 chars' warnings
  mfd: kempld-core: Correct a variety of checkpatch warnings
  mfd: ipaq-micro: Fix coding style errors/warnings reported by checkpatch
  mfd: si476x-cmd: Remedy checkpatch style complains
  ...
parents 66bb0aa0 7caa7991

Documentation/devicetree/bindings/mfd/arizona.txt

+10 −0
Original line number Diff line number Diff line
@@ -42,6 +42,16 @@ Optional properties: 
    the chip default will be used.  If present exactly five values must

    be specified.



  - DCVDD-supply, MICVDD-supply : Power supplies, only need to be specified if

    they are being externally supplied. As covered in

    Documentation/devicetree/bindings/regulator/regulator.txt



Optional subnodes:

  - ldo1 : Initial data for the LDO1 regulator, as covered in

    Documentation/devicetree/bindings/regulator/regulator.txt

  - micvdd : Initial data for the MICVDD regulator, as covered in

    Documentation/devicetree/bindings/regulator/regulator.txt



Example:



codec: wm5102@1a {

Documentation/devicetree/bindings/mfd/as3722.txt

+8 −0
Original line number Diff line number Diff line
@@ -13,6 +13,14 @@ Required properties: 
  The second cell is the flags, encoded as the trigger masks from binding document

	interrupts.txt, using dt-bindings/irq.



Optional properties:

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

- ams,enable-internal-int-pullup: Boolean property, to enable internal pullup on

	interrupt pin. Missing this will disable internal pullup on INT pin.

- ams,enable-internal-i2c-pullup: Boolean property, to enable internal pullup on

	i2c scl/sda pins. Missing this will disable internal pullup on i2c

	scl/sda lines.



Optional submodule and their properties:

=======================================

Documentation/devicetree/bindings/mfd/s2mps11.txt

+7 −4
Original line number Diff line number Diff line 


* Samsung S2MPS11 and S2MPS14 Voltage and Current Regulator

* Samsung S2MPS11, S2MPS14 and S2MPU02 Voltage and Current Regulator



The Samsung S2MPS11 is a multi-function device which includes voltage and

current regulators, RTC, charger controller and other sub-blocks. It is
@@ -7,7 +7,8 @@ interfaced to the host controller using an I2C interface. Each sub-block is 
addressed by the host system using different I2C slave addresses.



Required properties:

- compatible: Should be "samsung,s2mps11-pmic" or "samsung,s2mps14-pmic".

- compatible: Should be "samsung,s2mps11-pmic" or "samsung,s2mps14-pmic"

              or "samsung,s2mpu02-pmic".

- reg: Specifies the I2C slave address of the pmic block. It should be 0x66.



Optional properties:
@@ -81,11 +82,13 @@ as per the datasheet of s2mps11. 
		  - valid values for n are:

			- S2MPS11: 1 to 38

			- S2MPS14: 1 to 25

		  - Example: LDO1, LD02, LDO28

			- S2MPU02: 1 to 28

		  - Example: LDO1, LDO2, LDO28

	- BUCKn

		  - valid values for n are:

			- S2MPS11: 1 to 10

			- S2MPS14: 1 to 5

			- S2MPU02: 1 to 7

		  - Example: BUCK1, BUCK2, BUCK9



Example:
@@ -96,7 +99,7 @@ Example: 


		s2m_osc: clocks {

			compatible = "samsung,s2mps11-clk";

			#clock-cells = 1;

			#clock-cells = <1>;

			clock-output-names = "xx", "yy", "zz";

		};

Documentation/devicetree/bindings/mfd/sun6i-prcm.txt

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ PRCM is an MFD device exposing several Power Management related devices 
(like clks and reset controllers).



Required properties:

 - compatible: "allwinner,sun6i-a31-prcm"

 - compatible: "allwinner,sun6i-a31-prcm" or "allwinner,sun8i-a23-prcm"

 - reg: The PRCM registers range



The prcm node may contain several subdevices definitions:

Documentation/devicetree/bindings/regulator/s5m8767-regulator.txt

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ as per the datasheet of s5m8767. 


	- LDOn

		  - valid values for n are 1 to 28

		  - Example: LDO1, LD02, LDO28

		  - Example: LDO1, LDO2, LDO28

	- BUCKn

		  - valid values for n are 1 to 9.

		  - Example: BUCK1, BUCK2, BUCK9