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

Pull MFD updates from Lee Jones:
 "Changes to existing drivers:
  - DT clean-ups in da9055-core, max14577, rn5t618, arizona, hi6421, stmpe, twl4030
  - Export symbols for use in modules in max14577
  - Plenty of static code analysis/Coccinelle fixes throughout the SS
  - Regmap clean-ups in arizona, wm5102, wm5110, da9052, tps65217, rk808
  - Remove unused/duplicate code in da9052, 88pm860x, ti_ssp, lpc_sch, arizona
  - Bug fixes in ti_am335x_tscadc, da9052, ti_am335x_tscadc, rtsx_pcr
  - IRQ fixups in arizona, stmpe, max14577
  - Regulator related changes in axp20x
  - Pass DMA coherency information from parent => child in MFD core
  - Rename DT document files for consistency
  - Add ACPI support to the MFD core
  - Add Andreas Werner to MAINTAINERS for MEN F21BMC

 New drivers/supported devices:
  - New driver for MEN 14F021P00 Board Management Controller
  - New driver for Ricoh RN5T618 PMIC
  - New driver for Rockchip RK808
  - New driver for HiSilicon Hi6421 PMIC
  - New driver for Qualcomm SPMI PMICs
  - Add support for Intel Braswell in lpc_ich
  - Add support for Intel 9 Series PCH in lpc_ich
  - Add support for Intel Quark ILB in lpc_sch"

[ Delayed to after the poweer/reset pull due to Kconfig problems with
  recursive Kconfig select/depends-on chains.   - Linus ]

* tag 'mfd-for-linus-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (79 commits)
  mfd: cros_ec: wait for completion of commands that return IN_PROGRESS
  i2c: i2c-cros-ec-tunnel: Set retries to 3
  mfd: cros_ec: move locking into cros_ec_cmd_xfer
  mfd: cros_ec: stop calling ->cmd_xfer() directly
  mfd: cros_ec: Delay for 50ms when we see EC_CMD_REBOOT_EC
  MAINTAINERS: Adds Andreas Werner to maintainers list for MEN F21BMC
  mfd: arizona: Correct mask to allow setting micbias external cap
  mfd: Add ACPI support
  Revert "mfd: wm5102: Manually apply register patch"
  mfd: ti_am335x_tscadc: Update logic in CTRL register for 5-wire TS
  mfd: dt-bindings: atmel-gpbr: Rename doc file to conform to naming convention
  mfd: dt-bindings: qcom-pm8xxx: Rename doc file to conform to naming convention
  mfd: Inherit coherent_dma_mask from parent device
  mfd: Document DT bindings for Qualcomm SPMI PMICs
  mfd: Add support for Qualcomm SPMI PMICs
  mfd: dt-bindings: pm8xxx: Add new compatible string
  mfd: axp209x: Drop the parent supplies field
  mfd: twl4030-power: Use 'ti,system-power-controller' as alternative way to support system power off
  mfd: dt-bindings: twl4030-power: Use the standard property to mark power control
  mfd: syscon: Add Atmel GPBR DT bindings documention
  ...

1 files changed, 54 insertions, 2 deletions

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index cf66ef1ffaf3..1456ea70bbc7 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -210,6 +210,19 @@ config MFD_MC13XXX_I2C
         help
           Select this if your MC13xxx is connected via an I2C bus.
 
+config MFD_HI6421_PMIC
+        tristate "HiSilicon Hi6421 PMU/Codec IC"
+        depends on OF
+        select MFD_CORE
+        select REGMAP_MMIO
+        help
+          Add support for HiSilicon Hi6421 PMIC. Hi6421 includes multi-
+          functions, such as regulators, RTC, codec, Coulomb counter, etc.
+          This driver includes core APIs _only_. You have to select
+          individul components like voltage regulators under corresponding
+          menus in order to enable them.
+          We communicate with the Hi6421 via memory-mapped I/O.
+
 config HTC_EGPIO
         bool "HTC EGPIO support"
         depends on GPIOLIB && ARM
@@ -554,6 +567,21 @@ config MFD_PM8921_CORE
           Say M here if you want to include support for PM8921 chip as a module.
           This will build a module called "pm8921-core".
 
+config MFD_SPMI_PMIC
+        tristate "Qualcomm SPMI PMICs"
+        depends on ARCH_QCOM || COMPILE_TEST
+        depends on OF
+        depends on SPMI
+        select REGMAP_SPMI
+        help
+          This enables support for the Qualcomm SPMI PMICs.
+          These PMICs are currently used with the Snapdragon 800 series of
+          SoCs.  Note, that this will only be useful paired with descriptions
+          of the independent functions as children nodes in the device tree.
+
+          Say M here if you want to include support for the SPMI PMIC
+          series as a module.  The module will be called "qcom-spmi-pmic".
+
 config MFD_RDC321X
         tristate "RDC R-321x southbridge"
         select MFD_CORE
@@ -597,6 +625,30 @@ config MFD_RC5T583
           Additional drivers must be enabled in order to use the
           different functionality of the device.
 
+config MFD_RK808
+        tristate "Rockchip RK808 Power Management chip"
+        depends on I2C && OF
+        select MFD_CORE
+        select REGMAP_I2C
+        select REGMAP_IRQ
+        help
+          If you say yes here you get support for the RK808
+          Power Management chips.
+          This driver provides common support for accessing the device
+          through I2C interface. The device supports multiple sub-devices
+          including interrupts, RTC, LDO & DCDC regulators, and onkey.
+
+config MFD_RN5T618
+        tristate "Ricoh RN5T5618 PMIC"
+        depends on I2C
+        select MFD_CORE
+        select REGMAP_I2C
+        help
+          Say yes here to add support for the Ricoh RN5T618 PMIC. This
+          driver provides common support for accessing the device,
+          additional drivers must be enabled in order to use the
+          functionality of the device.
+
 config MFD_SEC_CORE
         bool "SAMSUNG Electronics PMIC Series Support"
         depends on I2C=y
@@ -1243,11 +1295,11 @@ config MFD_WM8350_I2C
           selected to enable support for the functionality of the chip.
 
 config MFD_WM8994
-        bool "Wolfson Microelectronics WM8994"
+        tristate "Wolfson Microelectronics WM8994"
         select MFD_CORE
         select REGMAP_I2C
         select REGMAP_IRQ
-        depends on I2C=y
+        depends on I2C
         help
           The WM8994 is a highly integrated hi-fi CODEC designed for
           smartphone applicatiosn.  As well as audio functionality it