Merge branch 'ib-qcom-ssbi' into devel

diff --combined drivers/mfd/Kconfig
index 76f9909cf3966e82e19aef759d03c18a0b5a2c72,001a84749852f95b065d7b2e6768cc1d9b61d9ef..5f1349c86a6fba0bf01305f55bd3a7216211ebb6
--- 1/drivers/mfd/Kconfig
--- 2/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@@ -102,7 -102,6 +102,7 @@@ config MFD_AAT2870_COR
  config MFD_AT91_USART
        tristate "AT91 USART Driver"
        select MFD_CORE
 +      depends on ARCH_AT91 || COMPILE_TEST
        help
          Select this to get support for AT91 USART IP. This is a wrapper
          over at91-usart-serial driver and usart-spi-driver. Only one function
@@@ -928,7 -927,7 +928,7 @@@ config UCB1400_COR
  config MFD_PM8XXX
        tristate "Qualcomm PM8xxx PMIC chips driver"
        depends on (ARM || HEXAGON || COMPILE_TEST)
-       select IRQ_DOMAIN
+       select IRQ_DOMAIN_HIERARCHY
        select MFD_CORE
        select REGMAP
        help
@@@ -1419,7 -1418,7 +1419,7 @@@ config MFD_TPS6521
  
  config MFD_TPS68470
        bool "TI TPS68470 Power Management / LED chips"
 -      depends on ACPI && I2C=y
 +      depends on ACPI && PCI && I2C=y
        select MFD_CORE
        select REGMAP_I2C
        select I2C_DESIGNWARE_PLATFORM

diff --combined drivers/pinctrl/qcom/Kconfig
index 93efbffcd3a4c30bcc3ea4a03c270b184ee5b4a7,8e7e4255b7a47d33397cf639f2dd392b0a4bf84c..2e66ab72c10b52d2011fc6c5dfe394cd74509e2e
--- 1/drivers/pinctrl/qcom/Kconfig
--- 2/drivers/pinctrl/qcom/Kconfig
+++ b/drivers/pinctrl/qcom/Kconfig
@@@ -137,7 -137,6 +137,7 @@@ config PINCTRL_QCOM_SPMI_PMI
         select PINMUX
         select PINCONF
         select GENERIC_PINCONF
 +       select IRQ_DOMAIN_HIERARCHY
         help
           This is the pinctrl, pinmux, pinconf and gpiolib driver for the
           Qualcomm GPIO and MPP blocks found in the Qualcomm PMIC's chips,
@@@ -150,6 -149,7 +150,7 @@@ config PINCTRL_QCOM_SSBI_PMI
         select PINMUX
         select PINCONF
         select GENERIC_PINCONF
+        select IRQ_DOMAIN_HIERARCHY
         help
           This is the pinctrl, pinmux, pinconf and gpiolib driver for the
           Qualcomm GPIO and MPP blocks found in the Qualcomm PMIC's chips,

diff --combined kernel/irq/chip.c
index 086d5a34b5a0cf087f61f92414a1751c313d7c64,982b75e127c5ea573dbdb15619d637806e2d91b0..0aefc2e69cf576f38e78f65e0626d987f47c4239
--- 1/kernel/irq/chip.c
--- 2/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@@ -1277,6 -1277,17 +1277,17 @@@ void irq_chip_mask_parent(struct irq_da
  }
  EXPORT_SYMBOL_GPL(irq_chip_mask_parent);
  
+ /**
+  * irq_chip_mask_ack_parent - Mask and acknowledge the parent interrupt
+  * @data:     Pointer to interrupt specific data
+  */
+ void irq_chip_mask_ack_parent(struct irq_data *data)
+ {
+       data = data->parent_data;
+       data->chip->irq_mask_ack(data);
+ }
+ EXPORT_SYMBOL_GPL(irq_chip_mask_ack_parent);
+ 
  /**
   * irq_chip_unmask_parent - Unmask the parent interrupt
   * @data:     Pointer to interrupt specific data
@@@ -1381,7 -1392,6 +1392,7 @@@ int irq_chip_set_wake_parent(struct irq
  
        return -ENOSYS;
  }
 +EXPORT_SYMBOL_GPL(irq_chip_set_wake_parent);
  #endif
  
  /**