Merge branches 'ib-mfd-clk-4.6', 'ib-mfd-input-iio-4.6', 'ib-mfd-regulator-4.6' and...

diff --cc drivers/mfd/Kconfig
index 9ca66de0c1c1770f4630c35a93c81adfdcee4883,6980e0463c8c6055d992b3b4a7713d55351bda4a,ae3990b5a2bf3d19b0c2a4c9f22c052d677ef230,1bc97c2761e4121a6dc2328b8fbf6c17ac835d58..19a5caec7a02f7306756956f434a0808ab6fe10a
--- 1/drivers/mfd/Kconfig
--- 2/drivers/mfd/Kconfig
--- 3/drivers/mfd/Kconfig
--- 4/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@@@@ -91,14 -91,14 -91,29 -91,14 +91,29 @@@@@ config MFD_BCM590X
          Support for the BCM590xx PMUs from Broadcom
    
    config MFD_AXP20X
-- -    bool "X-Powers AXP20X"
++ +    tristate
        select MFD_CORE
-- -    select REGMAP_I2C
        select REGMAP_IRQ
-- -    depends on I2C=y
++ +
++ +config MFD_AXP20X_I2C
++ +    tristate "X-Powers AXP series PMICs with I2C"
++ +    select MFD_AXP20X
++ +    select REGMAP_I2C
++ +    depends on I2C
+  +    help
 -        If you say Y here you get support for the X-Powers AXP202, AXP209 and
 -        AXP288 power management IC (PMIC).
++ +      If you say Y here you get support for the X-Powers AXP series power
++ +      management ICs (PMICs) controlled with I2C.
++ +      This driver include only the core APIs. You have to select individual
++ +      components like regulators or the PEK (Power Enable Key) under the
++ +      corresponding menus.
++ +
++ +config MFD_AXP20X_RSB
++ +    tristate "X-Powers AXP series PMICs with RSB"
++ +    select MFD_AXP20X
++ +    depends on SUNXI_RSB
 +      help
-  -      If you say Y here you get support for the X-Powers AXP202, AXP209 and
-  -      AXP288 power management IC (PMIC).
++ +      If you say Y here you get support for the X-Powers AXP series power
++ +      management ICs (PMICs) controlled with RSB.
          This driver include only the core APIs. You have to select individual
          components like regulators or the PEK (Power Enable Key) under the
          corresponding menus.

diff --cc drivers/mfd/Makefile
Simple merge