From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 25 Nov 2014 01:18:58 +0000 (+0100)
Subject: Merge branch 'ib-mfd-iio-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/lee... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a26033a1f56b7b1f8a56050c0a9095694aecae11;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'ib-mfd-iio-3.19' of git://git./linux/kernel/git/lee/mfd into acpi-pmic

Pull MFD changes that the ACPI PMIC changes depend on from Lee Jones.
---

a26033a1f56b7b1f8a56050c0a9095694aecae11
diff --cc drivers/iio/adc/Kconfig
index 88bdc8f612e2,db2681b4f24b..bc4e787096e8
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@@ -127,9 -127,17 +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/mfd/axp20x.c
index 6231adbb295d,9c4714e13c3c..971b0eb8d821
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@@ -133,13 -250,36 +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",