Merge branches 'ib-mfd-gpio-i2c-3.19', 'ib-mfd-iio-3.19' and 'ib-mfd-regulator-v3...

Immutable branch between MFD, Regulator and Clk, due for v3.19

diff --cc drivers/iio/adc/Kconfig
index 88bdc8f612e2ccf299550fa8367fb2ad251b29b1,88bdc8f612e2ccf299550fa8367fb2ad251b29b1,db2681b4f24b337e54c63d3627d8057795ea31cf,88bdc8f612e2ccf299550fa8367fb2ad251b29b1,88bdc8f612e2ccf299550fa8367fb2ad251b29b1..bc4e787096e84c41ec04d3343a0a087f5620935f
--- 1/drivers/iio/adc/Kconfig
--- 2/drivers/iio/adc/Kconfig
--- 3/drivers/iio/adc/Kconfig
--- 4/drivers/iio/adc/Kconfig
--- 5/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@@@@@ -127,9 -127,9 -127,17 -127,9 -127,9 +127,17 @@@@@@ config AT91_AD
        help
          Say yes here to build support for Atmel AT91 ADC.
     
++ ++config AXP288_ADC
++ ++   tristate "X-Powers AXP288 ADC driver"
++ ++   depends on MFD_AXP20X
++ ++   help
++ ++     Say yes here to have support for X-Powers power management IC (PMIC) ADC
++ ++     device. Depending on platform configuration, this general purpose ADC can
++ ++     be used for sampling sensors such as thermal resistors.
++ ++
     config EXYNOS_ADC
        tristate "Exynos ADC driver support"
  -     depends on ARCH_EXYNOS || (OF && COMPILE_TEST)
  +     depends on ARCH_EXYNOS || ARCH_S3C24XX || ARCH_S3C64XX || (OF && COMPILE_TEST)
        help
          Core support for the ADC block found in the Samsung EXYNOS series
          of SoCs for drivers such as the touchscreen and hwmon to use to share

diff --cc drivers/iio/adc/Makefile
Simple merge

diff --cc drivers/mfd/Kconfig
Simple merge

diff --cc drivers/mfd/axp20x.c
index 6231adbb295d6afd876de989db2a97f314a96cb8,6231adbb295d6afd876de989db2a97f314a96cb8,9c4714e13c3c463dc43fd437e0f26ae6cf58232c,6231adbb295d6afd876de989db2a97f314a96cb8,6231adbb295d6afd876de989db2a97f314a96cb8..971b0eb8d82103f37729b379a170f93553affde4
--- 1/drivers/mfd/axp20x.c
--- 2/drivers/mfd/axp20x.c
--- 3/drivers/mfd/axp20x.c
--- 4/drivers/mfd/axp20x.c
--- 5/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@@@@@ -133,13 -133,13 -250,36 -133,13 -133,13 +250,27 @@@@@@ static const struct regmap_irq_chip axp
        .status_base            = AXP20X_IRQ1_STATE,
        .ack_base               = AXP20X_IRQ1_STATE,
        .mask_base              = AXP20X_IRQ1_EN,
-- --   .num_regs               = 5,
++ ++   .mask_invert            = true,
++ ++   .init_ack_masked        = true,
        .irqs                   = axp20x_regmap_irqs,
        .num_irqs               = ARRAY_SIZE(axp20x_regmap_irqs),
++ ++   .num_regs               = 5,
++ ++
++ ++};
++ ++
++ ++static const struct regmap_irq_chip axp288_regmap_irq_chip = {
++ ++   .name                   = "axp288_irq_chip",
++ ++   .status_base            = AXP20X_IRQ1_STATE,
++ ++   .ack_base               = AXP20X_IRQ1_STATE,
++ ++   .mask_base              = AXP20X_IRQ1_EN,
        .mask_invert            = true,
        .init_ack_masked        = true,
++ ++   .irqs                   = axp288_regmap_irqs,
++ ++   .num_irqs               = ARRAY_SIZE(axp288_regmap_irqs),
++ ++   .num_regs               = 6,
++ ++
     };
     
  -  static const char * const axp20x_supplies[] = {
  -     "acin",
  -     "vin2",
  -     "vin3",
  -     "ldo24in",
  -     "ldo3in",
  -     "ldo5in",
  -  };
  -  
     static struct mfd_cell axp20x_cells[] = {
        {
                .name                   = "axp20x-pek",