[PATCH v3 0/5] Initial support for XPowers AXP288 PMIC

[PATCH v3 0/5] Initial support for XPowers AXP288 PMIC

[Jacob Pan]

XPowers AXP288 is a customized PMIC found on some Intel Baytrail-CR platforms.
It comes with sub-functions such as USB charging, fuel gauge, ADC, and many LDO
and BUCK channels.

By extending the existing AXP20x driver, this patchset adds basic support
for AXP288 PMIC with GPADC as one MFD cell device driver. It also adds hooks
for ACPI opregion handler driver which can be used to handle ACPI requests.

Currently, the PMIC driver in this patchset does not support platform data
enumeration. But when ACPI _DSD and unified device properties become available,
cell devices with platform data will be added.

This patch does not use intel_soc_pmic core for i2c and regmap handling in that
axp288 shares similar programming interface with other Xpower PMICs supported in
axp20x.c. Therefore, extending axp20x.c to include axp288 makes more sense.

Changes
 v3:	- put all file rename changes in 1/5
 	- add iio documentation for in_current_raw/scale
	- removed global variables in axp2xx
	- removed pm callbacks from GPADC
	- removed ACPI opregion cell device
	- added scales to ADC current and voltage
	- removed ADC thermal sensor from sysfs, kernel internal use only

 v2:
	- use format -M for 1/4
	- minor tweak based on Maxime's review


Jacob Pan (5):
  mfd/axp20x: rename files to support more devices
  mfd/axp2xx: extend axp20x to support axp288 pmic
  regulator/axp20x: use axp2xx consolidated header
  iio/adc/axp288: add support for axp288 gpadc
  iio: add documentation for current attribute

 Documentation/ABI/testing/sysfs-bus-iio  |   8 +
 drivers/iio/adc/Kconfig                  |   8 +
 drivers/iio/adc/Makefile                 |   1 +
 drivers/iio/adc/axp288_gpadc.c           | 238 +++++++++++++++
 drivers/mfd/Kconfig                      |   7 +-
 drivers/mfd/Makefile                     |   2 +-
 drivers/mfd/axp20x.c                     | 258 ----------------
 drivers/mfd/axp2xx.c                     | 493 +++++++++++++++++++++++++++++++
 drivers/regulator/axp20x-regulator.c     |   6 +-
 include/linux/mfd/{axp20x.h => axp2xx.h} |  66 ++++-
 10 files changed, 818 insertions(+), 269 deletions(-)
 create mode 100644 drivers/iio/adc/axp288_gpadc.c
 delete mode 100644 drivers/mfd/axp20x.c
 create mode 100644 drivers/mfd/axp2xx.c
 rename include/linux/mfd/{axp20x.h => axp2xx.h} (76%)

-- 
1.9.1

[PATCH v3 1/5] mfd/axp20x: rename files to support more devices

[Jacob Pan]

More XPowers PMIC devices can be supported by extending this driver, so
rename it to axp2xx to cover axp288 variant.

Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
---
 drivers/mfd/Kconfig                      | 7 ++++---
 drivers/mfd/Makefile                     | 2 +-
 drivers/mfd/{axp20x.c => axp2xx.c}       | 6 +++---
 include/linux/mfd/{axp20x.h => axp2xx.h} | 6 +++---
 4 files changed, 11 insertions(+), 10 deletions(-)
 rename drivers/mfd/{axp20x.c => axp2xx.c} (97%)
 rename include/linux/mfd/{axp20x.h => axp2xx.h} (98%)

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index de5abf2..42a70a3 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -67,14 +67,15 @@ config MFD_BCM590XX
 	help
 	  Support for the BCM590xx PMUs from Broadcom
 
-config MFD_AXP20X
-	bool "X-Powers AXP20X"
+config MFD_AXP2XX
+	bool "X-Powers AXP2XX"
 	select MFD_CORE
 	select REGMAP_I2C
 	select REGMAP_IRQ
 	depends on I2C=y
 	help
-	  If you say Y here you get support for the X-Powers AXP202 and AXP209.
+	  If you say Y here you get support for the X-Powers AXP202, AXP209 and
+	  AXP288 power management IC (PMIC).
 	  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 --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 3fcfdfc..8d0beb2 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -103,7 +103,7 @@ obj-$(CONFIG_PMIC_DA9052)	+= da9052-irq.o
 obj-$(CONFIG_PMIC_DA9052)	+= da9052-core.o
 obj-$(CONFIG_MFD_DA9052_SPI)	+= da9052-spi.o
 obj-$(CONFIG_MFD_DA9052_I2C)	+= da9052-i2c.o
-obj-$(CONFIG_MFD_AXP20X)	+= axp20x.o
+obj-$(CONFIG_MFD_AXP2XX)	+= axp2xx.o
 
 obj-$(CONFIG_MFD_LP3943)	+= lp3943.o
 obj-$(CONFIG_MFD_LP8788)	+= lp8788.o lp8788-irq.o
diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp2xx.c
similarity index 97%
rename from drivers/mfd/axp20x.c
rename to drivers/mfd/axp2xx.c
index dee6539..332a8a0 100644
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp2xx.c
@@ -1,7 +1,7 @@
 /*
- * axp20x.c - MFD core driver for the X-Powers AXP202 and AXP209
+ * axp2xx.c - MFD core driver for the X-Powers AXP202 and AXP209
  *
- * AXP20x comprises an adaptive USB-Compatible PWM charger, 2 BUCK DC-DC
+ * AXP2xx comprises an adaptive USB-Compatible PWM charger, 2 BUCK DC-DC
  * converters, 5 LDOs, multiple 12-bit ADCs of voltage, current and temperature
  * as well as 4 configurable GPIOs.
  *
@@ -21,7 +21,7 @@
 #include <linux/regmap.h>
 #include <linux/slab.h>
 #include <linux/regulator/consumer.h>
-#include <linux/mfd/axp20x.h>
+#include <linux/mfd/axp2xx.h>
 #include <linux/mfd/core.h>
 #include <linux/of_device.h>
 #include <linux/of_irq.h>
diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp2xx.h
similarity index 98%
rename from include/linux/mfd/axp20x.h
rename to include/linux/mfd/axp2xx.h
index d0e31a2..a36d91b 100644
--- a/include/linux/mfd/axp20x.h
+++ b/include/linux/mfd/axp2xx.h
@@ -8,8 +8,8 @@
  * published by the Free Software Foundation.
  */
 
-#ifndef __LINUX_MFD_AXP20X_H
-#define __LINUX_MFD_AXP20X_H
+#ifndef __LINUX_MFD_AXP2XX_H
+#define __LINUX_MFD_AXP2XX_H
 
 enum {
 	AXP202_ID = 0,
@@ -177,4 +177,4 @@ struct axp20x_dev {
 	long				variant;
 };
 
-#endif /* __LINUX_MFD_AXP20X_H */
+#endif /* __LINUX_MFD_AXP2XX_H */
-- 
1.9.1

Re: [PATCH v3 1/5] mfd/axp20x: rename files to support more devices

[Jonathan Cameron]

On 12/09/14 00:15, Jacob Pan wrote:
> More XPowers PMIC devices can be supported by extending this driver, so
> rename it to axp2xx to cover axp288 variant.
> 
> Acked-by: Lee Jones <lee.jones@linaro.org>
> Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
I'm not sure this rename is a good idea (or the original wild
card was for that matter).

For example, just a quick look at the xpowers website shows there is a AXP228
which just got swept up by the name change.

Best plan, in my view, is to always name a driver after an individual part it
supports and rely on Kconfig description to say what else is supported.
Bit late here, but perhaps best not to make things worse!
> ---
>  drivers/mfd/Kconfig                      | 7 ++++---
>  drivers/mfd/Makefile                     | 2 +-
>  drivers/mfd/{axp20x.c => axp2xx.c}       | 6 +++---
>  include/linux/mfd/{axp20x.h => axp2xx.h} | 6 +++---
>  4 files changed, 11 insertions(+), 10 deletions(-)
>  rename drivers/mfd/{axp20x.c => axp2xx.c} (97%)
>  rename include/linux/mfd/{axp20x.h => axp2xx.h} (98%)
> 
> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> index de5abf2..42a70a3 100644
> --- a/drivers/mfd/Kconfig
> +++ b/drivers/mfd/Kconfig
> @@ -67,14 +67,15 @@ config MFD_BCM590XX
>  	help
>  	  Support for the BCM590xx PMUs from Broadcom
>  
> -config MFD_AXP20X
> -	bool "X-Powers AXP20X"
> +config MFD_AXP2XX
> +	bool "X-Powers AXP2XX"
>  	select MFD_CORE
>  	select REGMAP_I2C
>  	select REGMAP_IRQ
>  	depends on I2C=y
>  	help
> -	  If you say Y here you get support for the X-Powers AXP202 and AXP209.
> +	  If you say Y here you get support for the X-Powers AXP202, AXP209 and
> +	  AXP288 power management IC (PMIC).
>  	  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 --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
> index 3fcfdfc..8d0beb2 100644
> --- a/drivers/mfd/Makefile
> +++ b/drivers/mfd/Makefile
> @@ -103,7 +103,7 @@ obj-$(CONFIG_PMIC_DA9052)	+= da9052-irq.o
>  obj-$(CONFIG_PMIC_DA9052)	+= da9052-core.o
>  obj-$(CONFIG_MFD_DA9052_SPI)	+= da9052-spi.o
>  obj-$(CONFIG_MFD_DA9052_I2C)	+= da9052-i2c.o
> -obj-$(CONFIG_MFD_AXP20X)	+= axp20x.o
> +obj-$(CONFIG_MFD_AXP2XX)	+= axp2xx.o
>  
>  obj-$(CONFIG_MFD_LP3943)	+= lp3943.o
>  obj-$(CONFIG_MFD_LP8788)	+= lp8788.o lp8788-irq.o
> diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp2xx.c
> similarity index 97%
> rename from drivers/mfd/axp20x.c
> rename to drivers/mfd/axp2xx.c
> index dee6539..332a8a0 100644
> --- a/drivers/mfd/axp20x.c
> +++ b/drivers/mfd/axp2xx.c
> @@ -1,7 +1,7 @@
>  /*
> - * axp20x.c - MFD core driver for the X-Powers AXP202 and AXP209
> + * axp2xx.c - MFD core driver for the X-Powers AXP202 and AXP209
>   *
> - * AXP20x comprises an adaptive USB-Compatible PWM charger, 2 BUCK DC-DC
> + * AXP2xx comprises an adaptive USB-Compatible PWM charger, 2 BUCK DC-DC
>   * converters, 5 LDOs, multiple 12-bit ADCs of voltage, current and temperature
>   * as well as 4 configurable GPIOs.
>   *
> @@ -21,7 +21,7 @@
>  #include <linux/regmap.h>
>  #include <linux/slab.h>
>  #include <linux/regulator/consumer.h>
> -#include <linux/mfd/axp20x.h>
> +#include <linux/mfd/axp2xx.h>
>  #include <linux/mfd/core.h>
>  #include <linux/of_device.h>
>  #include <linux/of_irq.h>
> diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp2xx.h
> similarity index 98%
> rename from include/linux/mfd/axp20x.h
> rename to include/linux/mfd/axp2xx.h
> index d0e31a2..a36d91b 100644
> --- a/include/linux/mfd/axp20x.h
> +++ b/include/linux/mfd/axp2xx.h
> @@ -8,8 +8,8 @@
>   * published by the Free Software Foundation.
>   */
>  
> -#ifndef __LINUX_MFD_AXP20X_H
> -#define __LINUX_MFD_AXP20X_H
> +#ifndef __LINUX_MFD_AXP2XX_H
> +#define __LINUX_MFD_AXP2XX_H
>  
>  enum {
>  	AXP202_ID = 0,
> @@ -177,4 +177,4 @@ struct axp20x_dev {
>  	long				variant;
>  };
>  
> -#endif /* __LINUX_MFD_AXP20X_H */
> +#endif /* __LINUX_MFD_AXP2XX_H */
> 

Re: [PATCH v3 1/5] mfd/axp20x: rename files to support more devices

[Jacob Pan]

On Sat, 13 Sep 2014 21:00:36 +0100
Jonathan Cameron <jic23@kernel.org> wrote:

> On 12/09/14 00:15, Jacob Pan wrote:
> > More XPowers PMIC devices can be supported by extending this
> > driver, so rename it to axp2xx to cover axp288 variant.
> > 
> > Acked-by: Lee Jones <lee.jones@linaro.org>
> > Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
> I'm not sure this rename is a good idea (or the original wild
> card was for that matter).
> 
> For example, just a quick look at the xpowers website shows there is
> a AXP228 which just got swept up by the name change.
> 
> Best plan, in my view, is to always name a driver after an individual
> part it supports and rely on Kconfig description to say what else is
> supported. Bit late here, but perhaps best not to make things worse!
> > ---
OK. I agree with this plan to keep axp20x name and modify Kconfig
description.

Lee is that OK with you? please help to make a decision here.


> >  drivers/mfd/Kconfig                      | 7 ++++---
> >  drivers/mfd/Makefile                     | 2 +-
> >  drivers/mfd/{axp20x.c => axp2xx.c}       | 6 +++---
> >  include/linux/mfd/{axp20x.h => axp2xx.h} | 6 +++---
> >  4 files changed, 11 insertions(+), 10 deletions(-)
> >  rename drivers/mfd/{axp20x.c => axp2xx.c} (97%)
> >  rename include/linux/mfd/{axp20x.h => axp2xx.h} (98%)
> > 
> > diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> > index de5abf2..42a70a3 100644
> > --- a/drivers/mfd/Kconfig
> > +++ b/drivers/mfd/Kconfig
> > @@ -67,14 +67,15 @@ config MFD_BCM590XX
> >  	help
> >  	  Support for the BCM590xx PMUs from Broadcom
> >  
> > -config MFD_AXP20X
> > -	bool "X-Powers AXP20X"
> > +config MFD_AXP2XX
> > +	bool "X-Powers AXP2XX"
> >  	select MFD_CORE
> >  	select REGMAP_I2C
> >  	select REGMAP_IRQ
> >  	depends on I2C=y
> >  	help
> > -	  If you say Y here you get support for the X-Powers
> > AXP202 and AXP209.
> > +	  If you say Y here you get support for the X-Powers
> > AXP202, AXP209 and
> > +	  AXP288 power management IC (PMIC).
> >  	  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 --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
> > index 3fcfdfc..8d0beb2 100644
> > --- a/drivers/mfd/Makefile
> > +++ b/drivers/mfd/Makefile
> > @@ -103,7 +103,7 @@ obj-$(CONFIG_PMIC_DA9052)	+= da9052-irq.o
> >  obj-$(CONFIG_PMIC_DA9052)	+= da9052-core.o
> >  obj-$(CONFIG_MFD_DA9052_SPI)	+= da9052-spi.o
> >  obj-$(CONFIG_MFD_DA9052_I2C)	+= da9052-i2c.o
> > -obj-$(CONFIG_MFD_AXP20X)	+= axp20x.o
> > +obj-$(CONFIG_MFD_AXP2XX)	+= axp2xx.o
> >  
> >  obj-$(CONFIG_MFD_LP3943)	+= lp3943.o
> >  obj-$(CONFIG_MFD_LP8788)	+= lp8788.o lp8788-irq.o
> > diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp2xx.c
> > similarity index 97%
> > rename from drivers/mfd/axp20x.c
> > rename to drivers/mfd/axp2xx.c
> > index dee6539..332a8a0 100644
> > --- a/drivers/mfd/axp20x.c
> > +++ b/drivers/mfd/axp2xx.c
> > @@ -1,7 +1,7 @@
> >  /*
> > - * axp20x.c - MFD core driver for the X-Powers AXP202 and AXP209
> > + * axp2xx.c - MFD core driver for the X-Powers AXP202 and AXP209
> >   *
> > - * AXP20x comprises an adaptive USB-Compatible PWM charger, 2 BUCK
> > DC-DC
> > + * AXP2xx comprises an adaptive USB-Compatible PWM charger, 2 BUCK
> > DC-DC
> >   * converters, 5 LDOs, multiple 12-bit ADCs of voltage, current
> > and temperature
> >   * as well as 4 configurable GPIOs.
> >   *
> > @@ -21,7 +21,7 @@
> >  #include <linux/regmap.h>
> >  #include <linux/slab.h>
> >  #include <linux/regulator/consumer.h>
> > -#include <linux/mfd/axp20x.h>
> > +#include <linux/mfd/axp2xx.h>
> >  #include <linux/mfd/core.h>
> >  #include <linux/of_device.h>
> >  #include <linux/of_irq.h>
> > diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp2xx.h
> > similarity index 98%
> > rename from include/linux/mfd/axp20x.h
> > rename to include/linux/mfd/axp2xx.h
> > index d0e31a2..a36d91b 100644
> > --- a/include/linux/mfd/axp20x.h
> > +++ b/include/linux/mfd/axp2xx.h
> > @@ -8,8 +8,8 @@
> >   * published by the Free Software Foundation.
> >   */
> >  
> > -#ifndef __LINUX_MFD_AXP20X_H
> > -#define __LINUX_MFD_AXP20X_H
> > +#ifndef __LINUX_MFD_AXP2XX_H
> > +#define __LINUX_MFD_AXP2XX_H
> >  
> >  enum {
> >  	AXP202_ID = 0,
> > @@ -177,4 +177,4 @@ struct axp20x_dev {
> >  	long				variant;
> >  };
> >  
> > -#endif /* __LINUX_MFD_AXP20X_H */
> > +#endif /* __LINUX_MFD_AXP2XX_H */
> > 

[Jacob Pan]

Re: [PATCH v3 1/5] mfd/axp20x: rename files to support more devices

[Lee Jones]

On Mon, 15 Sep 2014, Jacob Pan wrote:

> On Sat, 13 Sep 2014 21:00:36 +0100
> Jonathan Cameron <jic23@kernel.org> wrote:
> 
> > On 12/09/14 00:15, Jacob Pan wrote:
> > > More XPowers PMIC devices can be supported by extending this
> > > driver, so rename it to axp2xx to cover axp288 variant.
> > > 
> > > Acked-by: Lee Jones <lee.jones@linaro.org>
> > > Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
> > I'm not sure this rename is a good idea (or the original wild
> > card was for that matter).
> > 
> > For example, just a quick look at the xpowers website shows there is
> > a AXP228 which just got swept up by the name change.
> > 
> > Best plan, in my view, is to always name a driver after an individual
> > part it supports and rely on Kconfig description to say what else is
> > supported. Bit late here, but perhaps best not to make things worse!
> > > ---
> OK. I agree with this plan to keep axp20x name and modify Kconfig
> description.
> 
> Lee is that OK with you? please help to make a decision here.

I have no strong opinion either way.

> > >  drivers/mfd/Kconfig                      | 7 ++++---
> > >  drivers/mfd/Makefile                     | 2 +-
> > >  drivers/mfd/{axp20x.c => axp2xx.c}       | 6 +++---
> > >  include/linux/mfd/{axp20x.h => axp2xx.h} | 6 +++---
> > >  4 files changed, 11 insertions(+), 10 deletions(-)
> > >  rename drivers/mfd/{axp20x.c => axp2xx.c} (97%)
> > >  rename include/linux/mfd/{axp20x.h => axp2xx.h} (98%)
> > > 
> > > diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> > > index de5abf2..42a70a3 100644
> > > --- a/drivers/mfd/Kconfig
> > > +++ b/drivers/mfd/Kconfig
> > > @@ -67,14 +67,15 @@ config MFD_BCM590XX
> > >  	help
> > >  	  Support for the BCM590xx PMUs from Broadcom
> > >  
> > > -config MFD_AXP20X
> > > -	bool "X-Powers AXP20X"
> > > +config MFD_AXP2XX
> > > +	bool "X-Powers AXP2XX"
> > >  	select MFD_CORE
> > >  	select REGMAP_I2C
> > >  	select REGMAP_IRQ
> > >  	depends on I2C=y
> > >  	help
> > > -	  If you say Y here you get support for the X-Powers
> > > AXP202 and AXP209.
> > > +	  If you say Y here you get support for the X-Powers
> > > AXP202, AXP209 and
> > > +	  AXP288 power management IC (PMIC).
> > >  	  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 --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
> > > index 3fcfdfc..8d0beb2 100644
> > > --- a/drivers/mfd/Makefile
> > > +++ b/drivers/mfd/Makefile
> > > @@ -103,7 +103,7 @@ obj-$(CONFIG_PMIC_DA9052)	+= da9052-irq.o
> > >  obj-$(CONFIG_PMIC_DA9052)	+= da9052-core.o
> > >  obj-$(CONFIG_MFD_DA9052_SPI)	+= da9052-spi.o
> > >  obj-$(CONFIG_MFD_DA9052_I2C)	+= da9052-i2c.o
> > > -obj-$(CONFIG_MFD_AXP20X)	+= axp20x.o
> > > +obj-$(CONFIG_MFD_AXP2XX)	+= axp2xx.o
> > >  
> > >  obj-$(CONFIG_MFD_LP3943)	+= lp3943.o
> > >  obj-$(CONFIG_MFD_LP8788)	+= lp8788.o lp8788-irq.o
> > > diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp2xx.c
> > > similarity index 97%
> > > rename from drivers/mfd/axp20x.c
> > > rename to drivers/mfd/axp2xx.c
> > > index dee6539..332a8a0 100644
> > > --- a/drivers/mfd/axp20x.c
> > > +++ b/drivers/mfd/axp2xx.c
> > > @@ -1,7 +1,7 @@
> > >  /*
> > > - * axp20x.c - MFD core driver for the X-Powers AXP202 and AXP209
> > > + * axp2xx.c - MFD core driver for the X-Powers AXP202 and AXP209
> > >   *
> > > - * AXP20x comprises an adaptive USB-Compatible PWM charger, 2 BUCK
> > > DC-DC
> > > + * AXP2xx comprises an adaptive USB-Compatible PWM charger, 2 BUCK
> > > DC-DC
> > >   * converters, 5 LDOs, multiple 12-bit ADCs of voltage, current
> > > and temperature
> > >   * as well as 4 configurable GPIOs.
> > >   *
> > > @@ -21,7 +21,7 @@
> > >  #include <linux/regmap.h>
> > >  #include <linux/slab.h>
> > >  #include <linux/regulator/consumer.h>
> > > -#include <linux/mfd/axp20x.h>
> > > +#include <linux/mfd/axp2xx.h>
> > >  #include <linux/mfd/core.h>
> > >  #include <linux/of_device.h>
> > >  #include <linux/of_irq.h>
> > > diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp2xx.h
> > > similarity index 98%
> > > rename from include/linux/mfd/axp20x.h
> > > rename to include/linux/mfd/axp2xx.h
> > > index d0e31a2..a36d91b 100644
> > > --- a/include/linux/mfd/axp20x.h
> > > +++ b/include/linux/mfd/axp2xx.h
> > > @@ -8,8 +8,8 @@
> > >   * published by the Free Software Foundation.
> > >   */
> > >  
> > > -#ifndef __LINUX_MFD_AXP20X_H
> > > -#define __LINUX_MFD_AXP20X_H
> > > +#ifndef __LINUX_MFD_AXP2XX_H
> > > +#define __LINUX_MFD_AXP2XX_H
> > >  
> > >  enum {
> > >  	AXP202_ID = 0,
> > > @@ -177,4 +177,4 @@ struct axp20x_dev {
> > >  	long				variant;
> > >  };
> > >  
> > > -#endif /* __LINUX_MFD_AXP20X_H */
> > > +#endif /* __LINUX_MFD_AXP2XX_H */
> > > 
> 
> [Jacob Pan]

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

[PATCH v3 2/5] mfd/axp2xx: extend axp20x to support axp288 pmic

[Jacob Pan]

XPower AXP288 is a customized PMIC for Intel Baytrail-CR platforms. Similar
to AXP202/209, AXP288 comes with USB charger, more LDO and BUCK channels, and
AD converter. It also provides extended status and interrupt reporting
capabilities than the devices supported in axp20x.c.

In addition to feature extension, this patch also adds ACPI binding for
enumeration and hooks for ACPI custom operational region handlers.

Common data structures and constants have been renamed from axp20x to axp2xx
in order to suit the extended scope of devices.

This consolidated driver should support more Xpowers' PMICs in both device
tree and ACPI enumerated platforms.

Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
---
 drivers/mfd/axp2xx.c       | 423 +++++++++++++++++++++++++++++++++++----------
 include/linux/mfd/axp2xx.h |  60 ++++++-
 2 files changed, 388 insertions(+), 95 deletions(-)

diff --git a/drivers/mfd/axp2xx.c b/drivers/mfd/axp2xx.c
index 332a8a0..300f895 100644
--- a/drivers/mfd/axp2xx.c
+++ b/drivers/mfd/axp2xx.c
@@ -1,9 +1,9 @@
 /*
- * axp2xx.c - MFD core driver for the X-Powers AXP202 and AXP209
+ * axp2xx.c - MFD core driver for the X-Powers' Power Management ICs
  *
- * AXP2xx comprises an adaptive USB-Compatible PWM charger, 2 BUCK DC-DC
- * converters, 5 LDOs, multiple 12-bit ADCs of voltage, current and temperature
- * as well as 4 configurable GPIOs.
+ * AXP2xx typically comprises an adaptive USB-Compatible PWM charger, BUCK DC-DC
+ * converters, LDOs, multiple 12-bit ADCs of voltage, current and temperature
+ * as well as configurable GPIOs.
  *
  * Author: Carlo Caione <carlo@caione.org>
  *
@@ -25,9 +25,16 @@
 #include <linux/mfd/core.h>
 #include <linux/of_device.h>
 #include <linux/of_irq.h>
+#include <linux/acpi.h>
 
 #define AXP20X_OFF	0x80
 
+static const char *axp2xx_model_names[] = {
+	"AXP202",
+	"AXP209",
+	"AXP288",
+};
+
 static const struct regmap_range axp20x_writeable_ranges[] = {
 	regmap_reg_range(AXP20X_DATACACHE(0), AXP20X_IRQ5_STATE),
 	regmap_reg_range(AXP20X_DCDC_MODE, AXP20X_FG_RES),
@@ -47,6 +54,25 @@ static const struct regmap_access_table axp20x_volatile_table = {
 	.n_yes_ranges	= ARRAY_SIZE(axp20x_volatile_ranges),
 };
 
+static const struct regmap_range axp288_writeable_ranges[] = {
+	regmap_reg_range(AXP20X_DATACACHE(0), AXP20X_IRQ6_STATE),
+	regmap_reg_range(AXP20X_DCDC_MODE, AXP288_FG_TUNE5),
+};
+
+static const struct regmap_range axp288_volatile_ranges[] = {
+	regmap_reg_range(AXP20X_IRQ1_EN,  AXP20X_IPSOUT_V_HIGH_L),
+};
+
+static const struct regmap_access_table axp288_writeable_table = {
+	.yes_ranges	= axp288_writeable_ranges,
+	.n_yes_ranges	= ARRAY_SIZE(axp288_writeable_ranges),
+};
+
+static const struct regmap_access_table axp288_volatile_table = {
+	.yes_ranges	= axp288_volatile_ranges,
+	.n_yes_ranges	= ARRAY_SIZE(axp288_volatile_ranges),
+};
+
 static struct resource axp20x_pek_resources[] = {
 	{
 		.name	= "PEK_DBR",
@@ -61,7 +87,40 @@ static struct resource axp20x_pek_resources[] = {
 	},
 };
 
-static const struct regmap_config axp20x_regmap_config = {
+static struct resource axp288_battery_resources[] = {
+	{
+		.start = AXP288_IRQ_QWBTU,
+		.end   = AXP288_IRQ_QWBTU,
+		.flags = IORESOURCE_IRQ,
+	},
+	{
+		.start = AXP288_IRQ_WBTU,
+		.end   = AXP288_IRQ_WBTU,
+		.flags = IORESOURCE_IRQ,
+	},
+	{
+		.start = AXP288_IRQ_QWBTO,
+		.end   = AXP288_IRQ_QWBTO,
+		.flags = IORESOURCE_IRQ,
+	},
+	{
+		.start = AXP288_IRQ_WBTO,
+		.end   = AXP288_IRQ_WBTO,
+		.flags = IORESOURCE_IRQ,
+	},
+	{
+		.start = AXP288_IRQ_WL2,
+		.end   = AXP288_IRQ_WL2,
+		.flags = IORESOURCE_IRQ,
+	},
+	{
+		.start = AXP288_IRQ_WL1,
+		.end   = AXP288_IRQ_WL1,
+		.flags = IORESOURCE_IRQ,
+	},
+};
+
+static struct regmap_config axp20x_regmap_config = {
 	.reg_bits	= 8,
 	.val_bits	= 8,
 	.wr_table	= &axp20x_writeable_table,
@@ -70,47 +129,96 @@ static const struct regmap_config axp20x_regmap_config = {
 	.cache_type	= REGCACHE_RBTREE,
 };
 
-#define AXP20X_IRQ(_irq, _off, _mask) \
-	[AXP20X_IRQ_##_irq] = { .reg_offset = (_off), .mask = BIT(_mask) }
+static struct regmap_config axp288_regmap_config = {
+	.reg_bits	= 8,
+	.val_bits	= 8,
+	.wr_table	= &axp288_writeable_table,
+	.volatile_table	= &axp288_volatile_table,
+	.max_register	= AXP288_FG_TUNE5,
+	.cache_type	= REGCACHE_RBTREE,
+};
+
+#define INIT_REGMAP_IRQ(_variant, _irq, _off, _mask)			\
+	[_variant##_IRQ_##_irq] = { .reg_offset = (_off), .mask = BIT(_mask) }
 
 static const struct regmap_irq axp20x_regmap_irqs[] = {
-	AXP20X_IRQ(ACIN_OVER_V,		0, 7),
-	AXP20X_IRQ(ACIN_PLUGIN,		0, 6),
-	AXP20X_IRQ(ACIN_REMOVAL,	0, 5),
-	AXP20X_IRQ(VBUS_OVER_V,		0, 4),
-	AXP20X_IRQ(VBUS_PLUGIN,		0, 3),
-	AXP20X_IRQ(VBUS_REMOVAL,	0, 2),
-	AXP20X_IRQ(VBUS_V_LOW,		0, 1),
-	AXP20X_IRQ(BATT_PLUGIN,		1, 7),
-	AXP20X_IRQ(BATT_REMOVAL,	1, 6),
-	AXP20X_IRQ(BATT_ENT_ACT_MODE,	1, 5),
-	AXP20X_IRQ(BATT_EXIT_ACT_MODE,	1, 4),
-	AXP20X_IRQ(CHARG,		1, 3),
-	AXP20X_IRQ(CHARG_DONE,		1, 2),
-	AXP20X_IRQ(BATT_TEMP_HIGH,	1, 1),
-	AXP20X_IRQ(BATT_TEMP_LOW,	1, 0),
-	AXP20X_IRQ(DIE_TEMP_HIGH,	2, 7),
-	AXP20X_IRQ(CHARG_I_LOW,		2, 6),
-	AXP20X_IRQ(DCDC1_V_LONG,	2, 5),
-	AXP20X_IRQ(DCDC2_V_LONG,	2, 4),
-	AXP20X_IRQ(DCDC3_V_LONG,	2, 3),
-	AXP20X_IRQ(PEK_SHORT,		2, 1),
-	AXP20X_IRQ(PEK_LONG,		2, 0),
-	AXP20X_IRQ(N_OE_PWR_ON,		3, 7),
-	AXP20X_IRQ(N_OE_PWR_OFF,	3, 6),
-	AXP20X_IRQ(VBUS_VALID,		3, 5),
-	AXP20X_IRQ(VBUS_NOT_VALID,	3, 4),
-	AXP20X_IRQ(VBUS_SESS_VALID,	3, 3),
-	AXP20X_IRQ(VBUS_SESS_END,	3, 2),
-	AXP20X_IRQ(LOW_PWR_LVL1,	3, 1),
-	AXP20X_IRQ(LOW_PWR_LVL2,	3, 0),
-	AXP20X_IRQ(TIMER,		4, 7),
-	AXP20X_IRQ(PEK_RIS_EDGE,	4, 6),
-	AXP20X_IRQ(PEK_FAL_EDGE,	4, 5),
-	AXP20X_IRQ(GPIO3_INPUT,		4, 3),
-	AXP20X_IRQ(GPIO2_INPUT,		4, 2),
-	AXP20X_IRQ(GPIO1_INPUT,		4, 1),
-	AXP20X_IRQ(GPIO0_INPUT,		4, 0),
+	INIT_REGMAP_IRQ(AXP20X, ACIN_OVER_V,		0, 7),
+	INIT_REGMAP_IRQ(AXP20X, ACIN_PLUGIN,		0, 6),
+	INIT_REGMAP_IRQ(AXP20X, ACIN_REMOVAL,	        0, 5),
+	INIT_REGMAP_IRQ(AXP20X, VBUS_OVER_V,		0, 4),
+	INIT_REGMAP_IRQ(AXP20X, VBUS_PLUGIN,		0, 3),
+	INIT_REGMAP_IRQ(AXP20X, VBUS_REMOVAL,	        0, 2),
+	INIT_REGMAP_IRQ(AXP20X, VBUS_V_LOW,		0, 1),
+	INIT_REGMAP_IRQ(AXP20X, BATT_PLUGIN,		1, 7),
+	INIT_REGMAP_IRQ(AXP20X, BATT_REMOVAL,	        1, 6),
+	INIT_REGMAP_IRQ(AXP20X, BATT_ENT_ACT_MODE,	1, 5),
+	INIT_REGMAP_IRQ(AXP20X, BATT_EXIT_ACT_MODE,	1, 4),
+	INIT_REGMAP_IRQ(AXP20X, CHARG,		        1, 3),
+	INIT_REGMAP_IRQ(AXP20X, CHARG_DONE,		1, 2),
+	INIT_REGMAP_IRQ(AXP20X, BATT_TEMP_HIGH,	        1, 1),
+	INIT_REGMAP_IRQ(AXP20X, BATT_TEMP_LOW,	        1, 0),
+	INIT_REGMAP_IRQ(AXP20X, DIE_TEMP_HIGH,	        2, 7),
+	INIT_REGMAP_IRQ(AXP20X, CHARG_I_LOW,		2, 6),
+	INIT_REGMAP_IRQ(AXP20X, DCDC1_V_LONG,	        2, 5),
+	INIT_REGMAP_IRQ(AXP20X, DCDC2_V_LONG,	        2, 4),
+	INIT_REGMAP_IRQ(AXP20X, DCDC3_V_LONG,	        2, 3),
+	INIT_REGMAP_IRQ(AXP20X, PEK_SHORT,		2, 1),
+	INIT_REGMAP_IRQ(AXP20X, PEK_LONG,		2, 0),
+	INIT_REGMAP_IRQ(AXP20X, N_OE_PWR_ON,		3, 7),
+	INIT_REGMAP_IRQ(AXP20X, N_OE_PWR_OFF,	        3, 6),
+	INIT_REGMAP_IRQ(AXP20X, VBUS_VALID,		3, 5),
+	INIT_REGMAP_IRQ(AXP20X, VBUS_NOT_VALID,	        3, 4),
+	INIT_REGMAP_IRQ(AXP20X, VBUS_SESS_VALID,	3, 3),
+	INIT_REGMAP_IRQ(AXP20X, VBUS_SESS_END,	        3, 2),
+	INIT_REGMAP_IRQ(AXP20X, LOW_PWR_LVL1,	        3, 1),
+	INIT_REGMAP_IRQ(AXP20X, LOW_PWR_LVL2,	        3, 0),
+	INIT_REGMAP_IRQ(AXP20X, TIMER,		        4, 7),
+	INIT_REGMAP_IRQ(AXP20X, PEK_RIS_EDGE,	        4, 6),
+	INIT_REGMAP_IRQ(AXP20X, PEK_FAL_EDGE,	        4, 5),
+	INIT_REGMAP_IRQ(AXP20X, GPIO3_INPUT,		4, 3),
+	INIT_REGMAP_IRQ(AXP20X, GPIO2_INPUT,		4, 2),
+	INIT_REGMAP_IRQ(AXP20X, GPIO1_INPUT,		4, 1),
+	INIT_REGMAP_IRQ(AXP20X, GPIO0_INPUT,		4, 0),
+};
+
+/* some IRQs are compatible with axp20x models */
+static const struct regmap_irq axp288_regmap_irqs[] = {
+	INIT_REGMAP_IRQ(AXP20X, VBUS_REMOVAL,           0, 2),
+	INIT_REGMAP_IRQ(AXP20X, VBUS_PLUGIN,            0, 3),
+	INIT_REGMAP_IRQ(AXP20X, VBUS_OVER_V,            0, 4),
+
+	INIT_REGMAP_IRQ(AXP20X, CHARG_DONE,             1, 2),
+	INIT_REGMAP_IRQ(AXP20X, CHARG,                  1, 3),
+	INIT_REGMAP_IRQ(AXP288, SAFE_QUIT,              1, 4),
+	INIT_REGMAP_IRQ(AXP288, SAFE_ENTER,             1, 5),
+	INIT_REGMAP_IRQ(AXP20X, BATT_REMOVAL,           1, 6),
+	INIT_REGMAP_IRQ(AXP20X, BATT_PLUGIN,            1, 7),
+
+	INIT_REGMAP_IRQ(AXP288, QWBTU,                  2, 0),
+	INIT_REGMAP_IRQ(AXP288, WBTU,                   2, 1),
+	INIT_REGMAP_IRQ(AXP288, QWBTO,                  2, 2),
+	INIT_REGMAP_IRQ(AXP288, WBTU,                   2, 3),
+	INIT_REGMAP_IRQ(AXP288, QCBTU,                  2, 4),
+	INIT_REGMAP_IRQ(AXP288, CBTU,                   2, 5),
+	INIT_REGMAP_IRQ(AXP288, QCBTO,                  2, 6),
+	INIT_REGMAP_IRQ(AXP288, CBTO,                   2, 7),
+
+	INIT_REGMAP_IRQ(AXP288, WL2,                    3, 0),
+	INIT_REGMAP_IRQ(AXP288, WL1,                    3, 1),
+	INIT_REGMAP_IRQ(AXP288, GPADC,                  3, 2),
+	INIT_REGMAP_IRQ(AXP288, OT,                     3, 7),
+
+	INIT_REGMAP_IRQ(AXP288, GPIO0,                  4, 0),
+	INIT_REGMAP_IRQ(AXP288, GPIO1,                  4, 1),
+	INIT_REGMAP_IRQ(AXP288, POKO,                   4, 2),
+	INIT_REGMAP_IRQ(AXP288, POKL,                   4, 3),
+	INIT_REGMAP_IRQ(AXP288, POKS,                   4, 4),
+	INIT_REGMAP_IRQ(AXP288, POKN,                   4, 5),
+	INIT_REGMAP_IRQ(AXP288, POKP,                   4, 6),
+	INIT_REGMAP_IRQ(AXP20X, TIMER,                  4, 7),
+
+	INIT_REGMAP_IRQ(AXP288, MV_CHNG,                5, 0),
+	INIT_REGMAP_IRQ(AXP288, BC_USB_CHNG,            5, 1),
 };
 
 static const struct of_device_id axp20x_of_match[] = {
@@ -123,19 +231,26 @@ MODULE_DEVICE_TABLE(of, axp20x_of_match);
 /*
  * This is useless for OF-enabled devices, but it is needed by I2C subsystem
  */
-static const struct i2c_device_id axp20x_i2c_id[] = {
+static const struct i2c_device_id axp2xx_i2c_id[] = {
+	{ },
+};
+MODULE_DEVICE_TABLE(i2c, axp2xx_i2c_id);
+
+static struct acpi_device_id axp2xx_acpi_match[] = {
+	{
+		.id = "INT33F4",
+		.driver_data = (kernel_ulong_t)AXP288_ID,
+	},
 	{ },
 };
-MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
+MODULE_DEVICE_TABLE(acpi, axp2xx_acpi_match);
 
-static const struct regmap_irq_chip axp20x_regmap_irq_chip = {
-	.name			= "axp20x_irq_chip",
+/* common irq chip attributes only */
+static struct regmap_irq_chip axp2xx_regmap_irq_chip = {
+	.name			= "axp2xx_irq_chip",
 	.status_base		= AXP20X_IRQ1_STATE,
 	.ack_base		= AXP20X_IRQ1_STATE,
 	.mask_base		= AXP20X_IRQ1_EN,
-	.num_regs		= 5,
-	.irqs			= axp20x_regmap_irqs,
-	.num_irqs		= ARRAY_SIZE(axp20x_regmap_irqs),
 	.mask_invert		= true,
 	.init_ack_masked	= true,
 };
@@ -161,98 +276,218 @@ static struct mfd_cell axp20x_cells[] = {
 	},
 };
 
-static struct axp20x_dev *axp20x_pm_power_off;
-static void axp20x_power_off(void)
+static struct resource axp288_adc_resources[] = {
+	{
+		.name	= "GPADC",
+		.start = AXP288_IRQ_GPADC,
+		.end   = AXP288_IRQ_GPADC,
+		.flags = IORESOURCE_IRQ,
+	},
+};
+
+static struct resource axp288_charger_resources[] = {
+	{
+		.start = AXP288_IRQ_OV,
+		.end   = AXP288_IRQ_OV,
+		.flags = IORESOURCE_IRQ,
+	},
+	{
+		.start = AXP288_IRQ_DONE,
+		.end   = AXP288_IRQ_DONE,
+		.flags = IORESOURCE_IRQ,
+	},
+	{
+		.start = AXP288_IRQ_CHARGING,
+		.end   = AXP288_IRQ_CHARGING,
+		.flags = IORESOURCE_IRQ,
+	},
+	{
+		.start = AXP288_IRQ_SAFE_QUIT,
+		.end   = AXP288_IRQ_SAFE_QUIT,
+		.flags = IORESOURCE_IRQ,
+	},
+	{
+		.start = AXP288_IRQ_SAFE_ENTER,
+		.end   = AXP288_IRQ_SAFE_ENTER,
+		.flags = IORESOURCE_IRQ,
+	},
+	{
+		.start = AXP288_IRQ_QCBTU,
+		.end   = AXP288_IRQ_QCBTU,
+		.flags = IORESOURCE_IRQ,
+	},
+	{
+		.start = AXP288_IRQ_CBTU,
+		.end   = AXP288_IRQ_CBTU,
+		.flags = IORESOURCE_IRQ,
+	},
+	{
+		.start = AXP288_IRQ_QCBTO,
+		.end   = AXP288_IRQ_QCBTO,
+		.flags = IORESOURCE_IRQ,
+	},
+	{
+		.start = AXP288_IRQ_CBTO,
+		.end   = AXP288_IRQ_CBTO,
+		.flags = IORESOURCE_IRQ,
+	},
+};
+
+static struct mfd_cell axp288_cells[] = {
+	{
+		.name = "axp288_adc",
+		.num_resources = ARRAY_SIZE(axp288_adc_resources),
+		.resources = axp288_adc_resources,
+	},
+	{
+		.name = "axp288_charger",
+		.num_resources = ARRAY_SIZE(axp288_charger_resources),
+		.resources = axp288_charger_resources,
+	},
+	{
+		.name = "axp288_battery",
+		.num_resources = ARRAY_SIZE(axp288_battery_resources),
+		.resources = axp288_battery_resources,
+	},
+};
+
+static struct axp2xx_dev *axp2xx_pm_power_off;
+static void axp2xx_power_off(void)
 {
-	regmap_write(axp20x_pm_power_off->regmap, AXP20X_OFF_CTRL,
+	if (axp2xx_pm_power_off->variant == AXP288_ID)
+		return;
+	regmap_write(axp2xx_pm_power_off->regmap, AXP20X_OFF_CTRL,
 		     AXP20X_OFF);
 }
 
-static int axp20x_i2c_probe(struct i2c_client *i2c,
-			 const struct i2c_device_id *id)
+static int axp2xx_match_device(struct axp2xx_dev *axp2xx, struct device *dev)
 {
-	struct axp20x_dev *axp20x;
+	const struct acpi_device_id *acpi_id;
 	const struct of_device_id *of_id;
+
+	of_id = of_match_device(axp2xx_of_match, dev);
+	if (of_id)
+		axp2xx->variant = (long) of_id->data;
+	else {
+		acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev);
+		if (!acpi_id || !acpi_id->driver_data) {
+			dev_err(dev, "Unable to determine ID\n");
+			return -ENODEV;
+		}
+		axp2xx->variant = (long) acpi_id->driver_data;
+	}
+	switch (axp2xx->variant) {
+	case AXP202_ID:
+	case AXP209_ID:
+		axp2xx->nr_cells = ARRAY_SIZE(axp20x_cells);
+		axp2xx->cells = axp20x_cells;
+		axp2xx->regmap_cfg = &axp20x_regmap_config;
+		axp2xx_regmap_irq_chip.num_regs	= 5;
+		axp2xx_regmap_irq_chip.irqs = axp20x_regmap_irqs;
+		axp2xx_regmap_irq_chip.num_irqs	=
+			ARRAY_SIZE(axp20x_regmap_irqs);
+		break;
+	case AXP288_ID:
+		axp2xx->cells = axp288_cells;
+		axp2xx->nr_cells = ARRAY_SIZE(axp288_cells);
+		axp2xx->regmap_cfg = &axp288_regmap_config;
+		axp2xx_regmap_irq_chip.irqs = axp288_regmap_irqs;
+		axp2xx_regmap_irq_chip.num_irqs	=
+			ARRAY_SIZE(axp288_regmap_irqs);
+		axp2xx_regmap_irq_chip.num_regs	= 6;
+		break;
+	default:
+		dev_err(dev, "unsupported AXP2XX ID %lu\n", axp2xx->variant);
+		return -ENODEV;
+	}
+	dev_info(dev, "AXP2xx variant %s found\n",
+		axp2xx_model_names[axp2xx->variant]);
+
+	return 0;
+}
+
+static int axp2xx_i2c_probe(struct i2c_client *i2c,
+			const struct i2c_device_id *id)
+{
+	struct axp2xx_dev *axp2xx;
 	int ret;
 
-	axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL);
-	if (!axp20x)
+	axp2xx = devm_kzalloc(&i2c->dev, sizeof(*axp2xx), GFP_KERNEL);
+	if (!axp2xx)
 		return -ENOMEM;
 
-	of_id = of_match_device(axp20x_of_match, &i2c->dev);
-	if (!of_id) {
-		dev_err(&i2c->dev, "Unable to setup AXP20X data\n");
-		return -ENODEV;
-	}
-	axp20x->variant = (long) of_id->data;
+	ret = axp2xx_match_device(axp2xx, &i2c->dev);
+	if (ret)
+		return ret;
 
-	axp20x->i2c_client = i2c;
-	axp20x->dev = &i2c->dev;
-	dev_set_drvdata(axp20x->dev, axp20x);
+	axp2xx->i2c_client = i2c;
+	axp2xx->dev = &i2c->dev;
+	dev_set_drvdata(axp2xx->dev, axp2xx);
 
-	axp20x->regmap = devm_regmap_init_i2c(i2c, &axp20x_regmap_config);
-	if (IS_ERR(axp20x->regmap)) {
-		ret = PTR_ERR(axp20x->regmap);
+	axp2xx->regmap = devm_regmap_init_i2c(i2c, axp2xx->regmap_cfg);
+	if (IS_ERR(axp2xx->regmap)) {
+		ret = PTR_ERR(axp2xx->regmap);
 		dev_err(&i2c->dev, "regmap init failed: %d\n", ret);
 		return ret;
 	}
 
-	ret = regmap_add_irq_chip(axp20x->regmap, i2c->irq,
+	ret = regmap_add_irq_chip(axp2xx->regmap, i2c->irq,
 				  IRQF_ONESHOT | IRQF_SHARED, -1,
-				  &axp20x_regmap_irq_chip,
-				  &axp20x->regmap_irqc);
+				  &axp2xx_regmap_irq_chip,
+				  &axp2xx->regmap_irqc);
 	if (ret) {
 		dev_err(&i2c->dev, "failed to add irq chip: %d\n", ret);
 		return ret;
 	}
 
-	ret = mfd_add_devices(axp20x->dev, -1, axp20x_cells,
-			      ARRAY_SIZE(axp20x_cells), NULL, 0, NULL);
+	ret = mfd_add_devices(axp2xx->dev, -1, axp2xx->cells,
+			axp2xx->nr_cells, NULL, 0, NULL);
 
 	if (ret) {
 		dev_err(&i2c->dev, "failed to add MFD devices: %d\n", ret);
-		regmap_del_irq_chip(i2c->irq, axp20x->regmap_irqc);
+		regmap_del_irq_chip(i2c->irq, axp2xx->regmap_irqc);
 		return ret;
 	}
 
 	if (!pm_power_off) {
-		axp20x_pm_power_off = axp20x;
-		pm_power_off = axp20x_power_off;
+		axp2xx_pm_power_off = axp2xx;
+		pm_power_off = axp2xx_power_off;
 	}
 
-	dev_info(&i2c->dev, "AXP20X driver loaded\n");
+	dev_info(&i2c->dev, "AXP2XX driver loaded\n");
 
 	return 0;
 }
 
-static int axp20x_i2c_remove(struct i2c_client *i2c)
+static int axp2xx_i2c_remove(struct i2c_client *i2c)
 {
-	struct axp20x_dev *axp20x = i2c_get_clientdata(i2c);
+	struct axp2xx_dev *axp2xx = i2c_get_clientdata(i2c);
 
-	if (axp20x == axp20x_pm_power_off) {
-		axp20x_pm_power_off = NULL;
+	if (axp2xx == axp2xx_pm_power_off) {
+		axp2xx_pm_power_off = NULL;
 		pm_power_off = NULL;
 	}
 
-	mfd_remove_devices(axp20x->dev);
-	regmap_del_irq_chip(axp20x->i2c_client->irq, axp20x->regmap_irqc);
+	mfd_remove_devices(axp2xx->dev);
+	regmap_del_irq_chip(axp2xx->i2c_client->irq, axp2xx->regmap_irqc);
 
 	return 0;
 }
 
-static struct i2c_driver axp20x_i2c_driver = {
+static struct i2c_driver axp2xx_i2c_driver = {
 	.driver = {
-		.name	= "axp20x",
+		.name	= "axp2xx",
 		.owner	= THIS_MODULE,
-		.of_match_table	= of_match_ptr(axp20x_of_match),
+		.of_match_table	= of_match_ptr(axp2xx_of_match),
+		.acpi_match_table = ACPI_PTR(axp2xx_acpi_match),
 	},
-	.probe		= axp20x_i2c_probe,
-	.remove		= axp20x_i2c_remove,
-	.id_table	= axp20x_i2c_id,
+	.probe		= axp2xx_i2c_probe,
+	.remove		= axp2xx_i2c_remove,
+	.id_table	= axp2xx_i2c_id,
 };
 
-module_i2c_driver(axp20x_i2c_driver);
+module_i2c_driver(axp2xx_i2c_driver);
 
-MODULE_DESCRIPTION("PMIC MFD core driver for AXP20X");
+MODULE_DESCRIPTION("PMIC MFD core driver for AXP2XX");
 MODULE_AUTHOR("Carlo Caione <carlo@caione.org>");
 MODULE_LICENSE("GPL");
diff --git a/include/linux/mfd/axp2xx.h b/include/linux/mfd/axp2xx.h
index a36d91b..331cf6e 100644
--- a/include/linux/mfd/axp2xx.h
+++ b/include/linux/mfd/axp2xx.h
@@ -14,6 +14,8 @@
 enum {
 	AXP202_ID = 0,
 	AXP209_ID,
+	AXP288_ID,
+	NR_AXP2XX_VARIANTS,
 };
 
 #define AXP20X_DATACACHE(m)		(0x04 + (m))
@@ -49,11 +51,13 @@ enum {
 #define AXP20X_IRQ3_EN			0x42
 #define AXP20X_IRQ4_EN			0x43
 #define AXP20X_IRQ5_EN			0x44
+#define AXP20X_IRQ6_EN			0x45
 #define AXP20X_IRQ1_STATE		0x48
 #define AXP20X_IRQ2_STATE		0x49
 #define AXP20X_IRQ3_STATE		0x4a
 #define AXP20X_IRQ4_STATE		0x4b
 #define AXP20X_IRQ5_STATE		0x4c
+#define AXP20X_IRQ6_STATE		0x4d
 
 /* ADC */
 #define AXP20X_ACIN_V_ADC_H		0x56
@@ -116,6 +120,15 @@ enum {
 #define AXP20X_CC_CTRL			0xb8
 #define AXP20X_FG_RES			0xb9
 
+/* AXP288 specific registers */
+#define AXP288_PMIC_ADC_H               0x56
+#define AXP288_PMIC_ADC_L               0x57
+#define AXP288_ADC_TS_PIN_CTRL          0x84
+
+#define AXP288_PMIC_ADC_EN              0x84
+#define AXP288_FG_TUNE5			0xed
+
+
 /* Regulators IDs */
 enum {
 	AXP20X_LDO1 = 0,
@@ -169,12 +182,57 @@ enum {
 	AXP20X_IRQ_GPIO0_INPUT,
 };
 
-struct axp20x_dev {
+enum axp288_irqs {
+	AXP288_IRQ_VBUS_FALL     = 2,
+	AXP288_IRQ_VBUS_RISE,
+	AXP288_IRQ_OV,
+	AXP288_IRQ_FALLING_ALT,
+	AXP288_IRQ_RISING_ALT,
+	AXP288_IRQ_OV_ALT,
+	AXP288_IRQ_DONE          = 10,
+	AXP288_IRQ_CHARGING,
+	AXP288_IRQ_SAFE_QUIT,
+	AXP288_IRQ_SAFE_ENTER,
+	AXP288_IRQ_ABSENT,
+	AXP288_IRQ_APPEND,
+	AXP288_IRQ_QWBTU,
+	AXP288_IRQ_WBTU,
+	AXP288_IRQ_QWBTO,
+	AXP288_IRQ_WBTO,
+	AXP288_IRQ_QCBTU,
+	AXP288_IRQ_CBTU,
+	AXP288_IRQ_QCBTO,
+	AXP288_IRQ_CBTO,
+	AXP288_IRQ_WL2,
+	AXP288_IRQ_WL1,
+	AXP288_IRQ_GPADC,
+	AXP288_IRQ_OT            = 31,
+	AXP288_IRQ_GPIO0,
+	AXP288_IRQ_GPIO1,
+	AXP288_IRQ_POKO,
+	AXP288_IRQ_POKL,
+	AXP288_IRQ_POKS,
+	AXP288_IRQ_POKN,
+	AXP288_IRQ_POKP,
+	AXP288_IRQ_TIMER,
+	AXP288_IRQ_MV_CHNG,
+	AXP288_IRQ_BC_USB_CHNG,
+};
+
+#define AXP288_TS_ADC_H		0x58
+#define AXP288_TS_ADC_L		0x59
+#define AXP288_GP_ADC_H		0x5a
+#define AXP288_GP_ADC_L		0x5b
+
+struct axp2xx_dev {
 	struct device			*dev;
 	struct i2c_client		*i2c_client;
 	struct regmap			*regmap;
 	struct regmap_irq_chip_data	*regmap_irqc;
 	long				variant;
+	int                             nr_cells;
+	struct mfd_cell                 *cells;
+	struct regmap_config            *regmap_cfg;
 };
 
 #endif /* __LINUX_MFD_AXP2XX_H */
-- 
1.9.1

Re: [PATCH v3 2/5] mfd/axp2xx: extend axp20x to support axp288 pmic

[Lee Jones]

On Thu, 11 Sep 2014, Jacob Pan wrote:

> XPower AXP288 is a customized PMIC for Intel Baytrail-CR platforms. Similar
> to AXP202/209, AXP288 comes with USB charger, more LDO and BUCK channels, and
> AD converter. It also provides extended status and interrupt reporting
> capabilities than the devices supported in axp20x.c.
> 
> In addition to feature extension, this patch also adds ACPI binding for
> enumeration and hooks for ACPI custom operational region handlers.
> 
> Common data structures and constants have been renamed from axp20x to axp2xx
> in order to suit the extended scope of devices.
> 
> This consolidated driver should support more Xpowers' PMICs in both device
> tree and ACPI enumerated platforms.
> 
> Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
> ---
>  drivers/mfd/axp2xx.c       | 423 +++++++++++++++++++++++++++++++++++----------
>  include/linux/mfd/axp2xx.h |  60 ++++++-
>  2 files changed, 388 insertions(+), 95 deletions(-)

I agree with Maxime and Jonathan.  Please try again.  All renaming in
one single patch, new device support in another please.

> diff --git a/drivers/mfd/axp2xx.c b/drivers/mfd/axp2xx.c
> index 332a8a0..300f895 100644
> --- a/drivers/mfd/axp2xx.c
> +++ b/drivers/mfd/axp2xx.c
> @@ -1,9 +1,9 @@
>  /*
> - * axp2xx.c - MFD core driver for the X-Powers AXP202 and AXP209
> + * axp2xx.c - MFD core driver for the X-Powers' Power Management ICs
>   *
> - * AXP2xx comprises an adaptive USB-Compatible PWM charger, 2 BUCK DC-DC
> - * converters, 5 LDOs, multiple 12-bit ADCs of voltage, current and temperature
> - * as well as 4 configurable GPIOs.
> + * AXP2xx typically comprises an adaptive USB-Compatible PWM charger, BUCK DC-DC
> + * converters, LDOs, multiple 12-bit ADCs of voltage, current and temperature
> + * as well as configurable GPIOs.
>   *
>   * Author: Carlo Caione <carlo@caione.org>
>   *
> @@ -25,9 +25,16 @@
>  #include <linux/mfd/core.h>
>  #include <linux/of_device.h>
>  #include <linux/of_irq.h>
> +#include <linux/acpi.h>
>  
>  #define AXP20X_OFF	0x80
>  
> +static const char *axp2xx_model_names[] = {
> +	"AXP202",
> +	"AXP209",
> +	"AXP288",
> +};
> +
>  static const struct regmap_range axp20x_writeable_ranges[] = {
>  	regmap_reg_range(AXP20X_DATACACHE(0), AXP20X_IRQ5_STATE),
>  	regmap_reg_range(AXP20X_DCDC_MODE, AXP20X_FG_RES),
> @@ -47,6 +54,25 @@ static const struct regmap_access_table axp20x_volatile_table = {
>  	.n_yes_ranges	= ARRAY_SIZE(axp20x_volatile_ranges),
>  };
>  
> +static const struct regmap_range axp288_writeable_ranges[] = {
> +	regmap_reg_range(AXP20X_DATACACHE(0), AXP20X_IRQ6_STATE),
> +	regmap_reg_range(AXP20X_DCDC_MODE, AXP288_FG_TUNE5),
> +};
> +
> +static const struct regmap_range axp288_volatile_ranges[] = {
> +	regmap_reg_range(AXP20X_IRQ1_EN,  AXP20X_IPSOUT_V_HIGH_L),
> +};
> +
> +static const struct regmap_access_table axp288_writeable_table = {
> +	.yes_ranges	= axp288_writeable_ranges,
> +	.n_yes_ranges	= ARRAY_SIZE(axp288_writeable_ranges),
> +};
> +
> +static const struct regmap_access_table axp288_volatile_table = {
> +	.yes_ranges	= axp288_volatile_ranges,
> +	.n_yes_ranges	= ARRAY_SIZE(axp288_volatile_ranges),
> +};
> +
>  static struct resource axp20x_pek_resources[] = {
>  	{
>  		.name	= "PEK_DBR",
> @@ -61,7 +87,40 @@ static struct resource axp20x_pek_resources[] = {
>  	},
>  };
>  
> -static const struct regmap_config axp20x_regmap_config = {
> +static struct resource axp288_battery_resources[] = {
> +	{
> +		.start = AXP288_IRQ_QWBTU,
> +		.end   = AXP288_IRQ_QWBTU,
> +		.flags = IORESOURCE_IRQ,
> +	},
> +	{
> +		.start = AXP288_IRQ_WBTU,
> +		.end   = AXP288_IRQ_WBTU,
> +		.flags = IORESOURCE_IRQ,
> +	},
> +	{
> +		.start = AXP288_IRQ_QWBTO,
> +		.end   = AXP288_IRQ_QWBTO,
> +		.flags = IORESOURCE_IRQ,
> +	},
> +	{
> +		.start = AXP288_IRQ_WBTO,
> +		.end   = AXP288_IRQ_WBTO,
> +		.flags = IORESOURCE_IRQ,
> +	},
> +	{
> +		.start = AXP288_IRQ_WL2,
> +		.end   = AXP288_IRQ_WL2,
> +		.flags = IORESOURCE_IRQ,
> +	},
> +	{
> +		.start = AXP288_IRQ_WL1,
> +		.end   = AXP288_IRQ_WL1,
> +		.flags = IORESOURCE_IRQ,
> +	},
> +};
> +
> +static struct regmap_config axp20x_regmap_config = {
>  	.reg_bits	= 8,
>  	.val_bits	= 8,
>  	.wr_table	= &axp20x_writeable_table,
> @@ -70,47 +129,96 @@ static const struct regmap_config axp20x_regmap_config = {
>  	.cache_type	= REGCACHE_RBTREE,
>  };
>  
> -#define AXP20X_IRQ(_irq, _off, _mask) \
> -	[AXP20X_IRQ_##_irq] = { .reg_offset = (_off), .mask = BIT(_mask) }
> +static struct regmap_config axp288_regmap_config = {
> +	.reg_bits	= 8,
> +	.val_bits	= 8,
> +	.wr_table	= &axp288_writeable_table,
> +	.volatile_table	= &axp288_volatile_table,
> +	.max_register	= AXP288_FG_TUNE5,
> +	.cache_type	= REGCACHE_RBTREE,
> +};
> +
> +#define INIT_REGMAP_IRQ(_variant, _irq, _off, _mask)			\
> +	[_variant##_IRQ_##_irq] = { .reg_offset = (_off), .mask = BIT(_mask) }
>  
>  static const struct regmap_irq axp20x_regmap_irqs[] = {
> -	AXP20X_IRQ(ACIN_OVER_V,		0, 7),
> -	AXP20X_IRQ(ACIN_PLUGIN,		0, 6),
> -	AXP20X_IRQ(ACIN_REMOVAL,	0, 5),
> -	AXP20X_IRQ(VBUS_OVER_V,		0, 4),
> -	AXP20X_IRQ(VBUS_PLUGIN,		0, 3),
> -	AXP20X_IRQ(VBUS_REMOVAL,	0, 2),
> -	AXP20X_IRQ(VBUS_V_LOW,		0, 1),
> -	AXP20X_IRQ(BATT_PLUGIN,		1, 7),
> -	AXP20X_IRQ(BATT_REMOVAL,	1, 6),
> -	AXP20X_IRQ(BATT_ENT_ACT_MODE,	1, 5),
> -	AXP20X_IRQ(BATT_EXIT_ACT_MODE,	1, 4),
> -	AXP20X_IRQ(CHARG,		1, 3),
> -	AXP20X_IRQ(CHARG_DONE,		1, 2),
> -	AXP20X_IRQ(BATT_TEMP_HIGH,	1, 1),
> -	AXP20X_IRQ(BATT_TEMP_LOW,	1, 0),
> -	AXP20X_IRQ(DIE_TEMP_HIGH,	2, 7),
> -	AXP20X_IRQ(CHARG_I_LOW,		2, 6),
> -	AXP20X_IRQ(DCDC1_V_LONG,	2, 5),
> -	AXP20X_IRQ(DCDC2_V_LONG,	2, 4),
> -	AXP20X_IRQ(DCDC3_V_LONG,	2, 3),
> -	AXP20X_IRQ(PEK_SHORT,		2, 1),
> -	AXP20X_IRQ(PEK_LONG,		2, 0),
> -	AXP20X_IRQ(N_OE_PWR_ON,		3, 7),
> -	AXP20X_IRQ(N_OE_PWR_OFF,	3, 6),
> -	AXP20X_IRQ(VBUS_VALID,		3, 5),
> -	AXP20X_IRQ(VBUS_NOT_VALID,	3, 4),
> -	AXP20X_IRQ(VBUS_SESS_VALID,	3, 3),
> -	AXP20X_IRQ(VBUS_SESS_END,	3, 2),
> -	AXP20X_IRQ(LOW_PWR_LVL1,	3, 1),
> -	AXP20X_IRQ(LOW_PWR_LVL2,	3, 0),
> -	AXP20X_IRQ(TIMER,		4, 7),
> -	AXP20X_IRQ(PEK_RIS_EDGE,	4, 6),
> -	AXP20X_IRQ(PEK_FAL_EDGE,	4, 5),
> -	AXP20X_IRQ(GPIO3_INPUT,		4, 3),
> -	AXP20X_IRQ(GPIO2_INPUT,		4, 2),
> -	AXP20X_IRQ(GPIO1_INPUT,		4, 1),
> -	AXP20X_IRQ(GPIO0_INPUT,		4, 0),
> +	INIT_REGMAP_IRQ(AXP20X, ACIN_OVER_V,		0, 7),
> +	INIT_REGMAP_IRQ(AXP20X, ACIN_PLUGIN,		0, 6),
> +	INIT_REGMAP_IRQ(AXP20X, ACIN_REMOVAL,	        0, 5),
> +	INIT_REGMAP_IRQ(AXP20X, VBUS_OVER_V,		0, 4),
> +	INIT_REGMAP_IRQ(AXP20X, VBUS_PLUGIN,		0, 3),
> +	INIT_REGMAP_IRQ(AXP20X, VBUS_REMOVAL,	        0, 2),
> +	INIT_REGMAP_IRQ(AXP20X, VBUS_V_LOW,		0, 1),
> +	INIT_REGMAP_IRQ(AXP20X, BATT_PLUGIN,		1, 7),
> +	INIT_REGMAP_IRQ(AXP20X, BATT_REMOVAL,	        1, 6),
> +	INIT_REGMAP_IRQ(AXP20X, BATT_ENT_ACT_MODE,	1, 5),
> +	INIT_REGMAP_IRQ(AXP20X, BATT_EXIT_ACT_MODE,	1, 4),
> +	INIT_REGMAP_IRQ(AXP20X, CHARG,		        1, 3),
> +	INIT_REGMAP_IRQ(AXP20X, CHARG_DONE,		1, 2),
> +	INIT_REGMAP_IRQ(AXP20X, BATT_TEMP_HIGH,	        1, 1),
> +	INIT_REGMAP_IRQ(AXP20X, BATT_TEMP_LOW,	        1, 0),
> +	INIT_REGMAP_IRQ(AXP20X, DIE_TEMP_HIGH,	        2, 7),
> +	INIT_REGMAP_IRQ(AXP20X, CHARG_I_LOW,		2, 6),
> +	INIT_REGMAP_IRQ(AXP20X, DCDC1_V_LONG,	        2, 5),
> +	INIT_REGMAP_IRQ(AXP20X, DCDC2_V_LONG,	        2, 4),
> +	INIT_REGMAP_IRQ(AXP20X, DCDC3_V_LONG,	        2, 3),
> +	INIT_REGMAP_IRQ(AXP20X, PEK_SHORT,		2, 1),
> +	INIT_REGMAP_IRQ(AXP20X, PEK_LONG,		2, 0),
> +	INIT_REGMAP_IRQ(AXP20X, N_OE_PWR_ON,		3, 7),
> +	INIT_REGMAP_IRQ(AXP20X, N_OE_PWR_OFF,	        3, 6),
> +	INIT_REGMAP_IRQ(AXP20X, VBUS_VALID,		3, 5),
> +	INIT_REGMAP_IRQ(AXP20X, VBUS_NOT_VALID,	        3, 4),
> +	INIT_REGMAP_IRQ(AXP20X, VBUS_SESS_VALID,	3, 3),
> +	INIT_REGMAP_IRQ(AXP20X, VBUS_SESS_END,	        3, 2),
> +	INIT_REGMAP_IRQ(AXP20X, LOW_PWR_LVL1,	        3, 1),
> +	INIT_REGMAP_IRQ(AXP20X, LOW_PWR_LVL2,	        3, 0),
> +	INIT_REGMAP_IRQ(AXP20X, TIMER,		        4, 7),
> +	INIT_REGMAP_IRQ(AXP20X, PEK_RIS_EDGE,	        4, 6),
> +	INIT_REGMAP_IRQ(AXP20X, PEK_FAL_EDGE,	        4, 5),
> +	INIT_REGMAP_IRQ(AXP20X, GPIO3_INPUT,		4, 3),
> +	INIT_REGMAP_IRQ(AXP20X, GPIO2_INPUT,		4, 2),
> +	INIT_REGMAP_IRQ(AXP20X, GPIO1_INPUT,		4, 1),
> +	INIT_REGMAP_IRQ(AXP20X, GPIO0_INPUT,		4, 0),
> +};
> +
> +/* some IRQs are compatible with axp20x models */
> +static const struct regmap_irq axp288_regmap_irqs[] = {
> +	INIT_REGMAP_IRQ(AXP20X, VBUS_REMOVAL,           0, 2),
> +	INIT_REGMAP_IRQ(AXP20X, VBUS_PLUGIN,            0, 3),
> +	INIT_REGMAP_IRQ(AXP20X, VBUS_OVER_V,            0, 4),
> +
> +	INIT_REGMAP_IRQ(AXP20X, CHARG_DONE,             1, 2),
> +	INIT_REGMAP_IRQ(AXP20X, CHARG,                  1, 3),
> +	INIT_REGMAP_IRQ(AXP288, SAFE_QUIT,              1, 4),
> +	INIT_REGMAP_IRQ(AXP288, SAFE_ENTER,             1, 5),
> +	INIT_REGMAP_IRQ(AXP20X, BATT_REMOVAL,           1, 6),
> +	INIT_REGMAP_IRQ(AXP20X, BATT_PLUGIN,            1, 7),
> +
> +	INIT_REGMAP_IRQ(AXP288, QWBTU,                  2, 0),
> +	INIT_REGMAP_IRQ(AXP288, WBTU,                   2, 1),
> +	INIT_REGMAP_IRQ(AXP288, QWBTO,                  2, 2),
> +	INIT_REGMAP_IRQ(AXP288, WBTU,                   2, 3),
> +	INIT_REGMAP_IRQ(AXP288, QCBTU,                  2, 4),
> +	INIT_REGMAP_IRQ(AXP288, CBTU,                   2, 5),
> +	INIT_REGMAP_IRQ(AXP288, QCBTO,                  2, 6),
> +	INIT_REGMAP_IRQ(AXP288, CBTO,                   2, 7),
> +
> +	INIT_REGMAP_IRQ(AXP288, WL2,                    3, 0),
> +	INIT_REGMAP_IRQ(AXP288, WL1,                    3, 1),
> +	INIT_REGMAP_IRQ(AXP288, GPADC,                  3, 2),
> +	INIT_REGMAP_IRQ(AXP288, OT,                     3, 7),
> +
> +	INIT_REGMAP_IRQ(AXP288, GPIO0,                  4, 0),
> +	INIT_REGMAP_IRQ(AXP288, GPIO1,                  4, 1),
> +	INIT_REGMAP_IRQ(AXP288, POKO,                   4, 2),
> +	INIT_REGMAP_IRQ(AXP288, POKL,                   4, 3),
> +	INIT_REGMAP_IRQ(AXP288, POKS,                   4, 4),
> +	INIT_REGMAP_IRQ(AXP288, POKN,                   4, 5),
> +	INIT_REGMAP_IRQ(AXP288, POKP,                   4, 6),
> +	INIT_REGMAP_IRQ(AXP20X, TIMER,                  4, 7),
> +
> +	INIT_REGMAP_IRQ(AXP288, MV_CHNG,                5, 0),
> +	INIT_REGMAP_IRQ(AXP288, BC_USB_CHNG,            5, 1),
>  };
>  
>  static const struct of_device_id axp20x_of_match[] = {
> @@ -123,19 +231,26 @@ MODULE_DEVICE_TABLE(of, axp20x_of_match);
>  /*
>   * This is useless for OF-enabled devices, but it is needed by I2C subsystem
>   */
> -static const struct i2c_device_id axp20x_i2c_id[] = {
> +static const struct i2c_device_id axp2xx_i2c_id[] = {
> +	{ },
> +};
> +MODULE_DEVICE_TABLE(i2c, axp2xx_i2c_id);
> +
> +static struct acpi_device_id axp2xx_acpi_match[] = {
> +	{
> +		.id = "INT33F4",
> +		.driver_data = (kernel_ulong_t)AXP288_ID,
> +	},
>  	{ },
>  };
> -MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
> +MODULE_DEVICE_TABLE(acpi, axp2xx_acpi_match);
>  
> -static const struct regmap_irq_chip axp20x_regmap_irq_chip = {
> -	.name			= "axp20x_irq_chip",
> +/* common irq chip attributes only */
> +static struct regmap_irq_chip axp2xx_regmap_irq_chip = {
> +	.name			= "axp2xx_irq_chip",
>  	.status_base		= AXP20X_IRQ1_STATE,
>  	.ack_base		= AXP20X_IRQ1_STATE,
>  	.mask_base		= AXP20X_IRQ1_EN,
> -	.num_regs		= 5,
> -	.irqs			= axp20x_regmap_irqs,
> -	.num_irqs		= ARRAY_SIZE(axp20x_regmap_irqs),
>  	.mask_invert		= true,
>  	.init_ack_masked	= true,
>  };
> @@ -161,98 +276,218 @@ static struct mfd_cell axp20x_cells[] = {
>  	},
>  };
>  
> -static struct axp20x_dev *axp20x_pm_power_off;
> -static void axp20x_power_off(void)
> +static struct resource axp288_adc_resources[] = {
> +	{
> +		.name	= "GPADC",
> +		.start = AXP288_IRQ_GPADC,
> +		.end   = AXP288_IRQ_GPADC,
> +		.flags = IORESOURCE_IRQ,
> +	},
> +};
> +
> +static struct resource axp288_charger_resources[] = {
> +	{
> +		.start = AXP288_IRQ_OV,
> +		.end   = AXP288_IRQ_OV,
> +		.flags = IORESOURCE_IRQ,
> +	},
> +	{
> +		.start = AXP288_IRQ_DONE,
> +		.end   = AXP288_IRQ_DONE,
> +		.flags = IORESOURCE_IRQ,
> +	},
> +	{
> +		.start = AXP288_IRQ_CHARGING,
> +		.end   = AXP288_IRQ_CHARGING,
> +		.flags = IORESOURCE_IRQ,
> +	},
> +	{
> +		.start = AXP288_IRQ_SAFE_QUIT,
> +		.end   = AXP288_IRQ_SAFE_QUIT,
> +		.flags = IORESOURCE_IRQ,
> +	},
> +	{
> +		.start = AXP288_IRQ_SAFE_ENTER,
> +		.end   = AXP288_IRQ_SAFE_ENTER,
> +		.flags = IORESOURCE_IRQ,
> +	},
> +	{
> +		.start = AXP288_IRQ_QCBTU,
> +		.end   = AXP288_IRQ_QCBTU,
> +		.flags = IORESOURCE_IRQ,
> +	},
> +	{
> +		.start = AXP288_IRQ_CBTU,
> +		.end   = AXP288_IRQ_CBTU,
> +		.flags = IORESOURCE_IRQ,
> +	},
> +	{
> +		.start = AXP288_IRQ_QCBTO,
> +		.end   = AXP288_IRQ_QCBTO,
> +		.flags = IORESOURCE_IRQ,
> +	},
> +	{
> +		.start = AXP288_IRQ_CBTO,
> +		.end   = AXP288_IRQ_CBTO,
> +		.flags = IORESOURCE_IRQ,
> +	},
> +};
> +
> +static struct mfd_cell axp288_cells[] = {
> +	{
> +		.name = "axp288_adc",
> +		.num_resources = ARRAY_SIZE(axp288_adc_resources),
> +		.resources = axp288_adc_resources,
> +	},
> +	{
> +		.name = "axp288_charger",
> +		.num_resources = ARRAY_SIZE(axp288_charger_resources),
> +		.resources = axp288_charger_resources,
> +	},
> +	{
> +		.name = "axp288_battery",
> +		.num_resources = ARRAY_SIZE(axp288_battery_resources),
> +		.resources = axp288_battery_resources,
> +	},
> +};
> +
> +static struct axp2xx_dev *axp2xx_pm_power_off;
> +static void axp2xx_power_off(void)
>  {
> -	regmap_write(axp20x_pm_power_off->regmap, AXP20X_OFF_CTRL,
> +	if (axp2xx_pm_power_off->variant == AXP288_ID)
> +		return;
> +	regmap_write(axp2xx_pm_power_off->regmap, AXP20X_OFF_CTRL,
>  		     AXP20X_OFF);
>  }
>  
> -static int axp20x_i2c_probe(struct i2c_client *i2c,
> -			 const struct i2c_device_id *id)
> +static int axp2xx_match_device(struct axp2xx_dev *axp2xx, struct device *dev)
>  {
> -	struct axp20x_dev *axp20x;
> +	const struct acpi_device_id *acpi_id;
>  	const struct of_device_id *of_id;
> +
> +	of_id = of_match_device(axp2xx_of_match, dev);
> +	if (of_id)
> +		axp2xx->variant = (long) of_id->data;
> +	else {
> +		acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev);
> +		if (!acpi_id || !acpi_id->driver_data) {
> +			dev_err(dev, "Unable to determine ID\n");
> +			return -ENODEV;
> +		}
> +		axp2xx->variant = (long) acpi_id->driver_data;
> +	}
> +	switch (axp2xx->variant) {
> +	case AXP202_ID:
> +	case AXP209_ID:
> +		axp2xx->nr_cells = ARRAY_SIZE(axp20x_cells);
> +		axp2xx->cells = axp20x_cells;
> +		axp2xx->regmap_cfg = &axp20x_regmap_config;
> +		axp2xx_regmap_irq_chip.num_regs	= 5;
> +		axp2xx_regmap_irq_chip.irqs = axp20x_regmap_irqs;
> +		axp2xx_regmap_irq_chip.num_irqs	=
> +			ARRAY_SIZE(axp20x_regmap_irqs);
> +		break;
> +	case AXP288_ID:
> +		axp2xx->cells = axp288_cells;
> +		axp2xx->nr_cells = ARRAY_SIZE(axp288_cells);
> +		axp2xx->regmap_cfg = &axp288_regmap_config;
> +		axp2xx_regmap_irq_chip.irqs = axp288_regmap_irqs;
> +		axp2xx_regmap_irq_chip.num_irqs	=
> +			ARRAY_SIZE(axp288_regmap_irqs);
> +		axp2xx_regmap_irq_chip.num_regs	= 6;
> +		break;
> +	default:
> +		dev_err(dev, "unsupported AXP2XX ID %lu\n", axp2xx->variant);
> +		return -ENODEV;
> +	}
> +	dev_info(dev, "AXP2xx variant %s found\n",
> +		axp2xx_model_names[axp2xx->variant]);
> +
> +	return 0;
> +}
> +
> +static int axp2xx_i2c_probe(struct i2c_client *i2c,
> +			const struct i2c_device_id *id)
> +{
> +	struct axp2xx_dev *axp2xx;
>  	int ret;
>  
> -	axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL);
> -	if (!axp20x)
> +	axp2xx = devm_kzalloc(&i2c->dev, sizeof(*axp2xx), GFP_KERNEL);
> +	if (!axp2xx)
>  		return -ENOMEM;
>  
> -	of_id = of_match_device(axp20x_of_match, &i2c->dev);
> -	if (!of_id) {
> -		dev_err(&i2c->dev, "Unable to setup AXP20X data\n");
> -		return -ENODEV;
> -	}
> -	axp20x->variant = (long) of_id->data;
> +	ret = axp2xx_match_device(axp2xx, &i2c->dev);
> +	if (ret)
> +		return ret;
>  
> -	axp20x->i2c_client = i2c;
> -	axp20x->dev = &i2c->dev;
> -	dev_set_drvdata(axp20x->dev, axp20x);
> +	axp2xx->i2c_client = i2c;
> +	axp2xx->dev = &i2c->dev;
> +	dev_set_drvdata(axp2xx->dev, axp2xx);
>  
> -	axp20x->regmap = devm_regmap_init_i2c(i2c, &axp20x_regmap_config);
> -	if (IS_ERR(axp20x->regmap)) {
> -		ret = PTR_ERR(axp20x->regmap);
> +	axp2xx->regmap = devm_regmap_init_i2c(i2c, axp2xx->regmap_cfg);
> +	if (IS_ERR(axp2xx->regmap)) {
> +		ret = PTR_ERR(axp2xx->regmap);
>  		dev_err(&i2c->dev, "regmap init failed: %d\n", ret);
>  		return ret;
>  	}
>  
> -	ret = regmap_add_irq_chip(axp20x->regmap, i2c->irq,
> +	ret = regmap_add_irq_chip(axp2xx->regmap, i2c->irq,
>  				  IRQF_ONESHOT | IRQF_SHARED, -1,
> -				  &axp20x_regmap_irq_chip,
> -				  &axp20x->regmap_irqc);
> +				  &axp2xx_regmap_irq_chip,
> +				  &axp2xx->regmap_irqc);
>  	if (ret) {
>  		dev_err(&i2c->dev, "failed to add irq chip: %d\n", ret);
>  		return ret;
>  	}
>  
> -	ret = mfd_add_devices(axp20x->dev, -1, axp20x_cells,
> -			      ARRAY_SIZE(axp20x_cells), NULL, 0, NULL);
> +	ret = mfd_add_devices(axp2xx->dev, -1, axp2xx->cells,
> +			axp2xx->nr_cells, NULL, 0, NULL);
>  
>  	if (ret) {
>  		dev_err(&i2c->dev, "failed to add MFD devices: %d\n", ret);
> -		regmap_del_irq_chip(i2c->irq, axp20x->regmap_irqc);
> +		regmap_del_irq_chip(i2c->irq, axp2xx->regmap_irqc);
>  		return ret;
>  	}
>  
>  	if (!pm_power_off) {
> -		axp20x_pm_power_off = axp20x;
> -		pm_power_off = axp20x_power_off;
> +		axp2xx_pm_power_off = axp2xx;
> +		pm_power_off = axp2xx_power_off;
>  	}
>  
> -	dev_info(&i2c->dev, "AXP20X driver loaded\n");
> +	dev_info(&i2c->dev, "AXP2XX driver loaded\n");
>  
>  	return 0;
>  }
>  
> -static int axp20x_i2c_remove(struct i2c_client *i2c)
> +static int axp2xx_i2c_remove(struct i2c_client *i2c)
>  {
> -	struct axp20x_dev *axp20x = i2c_get_clientdata(i2c);
> +	struct axp2xx_dev *axp2xx = i2c_get_clientdata(i2c);
>  
> -	if (axp20x == axp20x_pm_power_off) {
> -		axp20x_pm_power_off = NULL;
> +	if (axp2xx == axp2xx_pm_power_off) {
> +		axp2xx_pm_power_off = NULL;
>  		pm_power_off = NULL;
>  	}
>  
> -	mfd_remove_devices(axp20x->dev);
> -	regmap_del_irq_chip(axp20x->i2c_client->irq, axp20x->regmap_irqc);
> +	mfd_remove_devices(axp2xx->dev);
> +	regmap_del_irq_chip(axp2xx->i2c_client->irq, axp2xx->regmap_irqc);
>  
>  	return 0;
>  }
>  
> -static struct i2c_driver axp20x_i2c_driver = {
> +static struct i2c_driver axp2xx_i2c_driver = {
>  	.driver = {
> -		.name	= "axp20x",
> +		.name	= "axp2xx",
>  		.owner	= THIS_MODULE,
> -		.of_match_table	= of_match_ptr(axp20x_of_match),
> +		.of_match_table	= of_match_ptr(axp2xx_of_match),
> +		.acpi_match_table = ACPI_PTR(axp2xx_acpi_match),
>  	},
> -	.probe		= axp20x_i2c_probe,
> -	.remove		= axp20x_i2c_remove,
> -	.id_table	= axp20x_i2c_id,
> +	.probe		= axp2xx_i2c_probe,
> +	.remove		= axp2xx_i2c_remove,
> +	.id_table	= axp2xx_i2c_id,
>  };
>  
> -module_i2c_driver(axp20x_i2c_driver);
> +module_i2c_driver(axp2xx_i2c_driver);
>  
> -MODULE_DESCRIPTION("PMIC MFD core driver for AXP20X");
> +MODULE_DESCRIPTION("PMIC MFD core driver for AXP2XX");
>  MODULE_AUTHOR("Carlo Caione <carlo@caione.org>");
>  MODULE_LICENSE("GPL");
> diff --git a/include/linux/mfd/axp2xx.h b/include/linux/mfd/axp2xx.h
> index a36d91b..331cf6e 100644
> --- a/include/linux/mfd/axp2xx.h
> +++ b/include/linux/mfd/axp2xx.h
> @@ -14,6 +14,8 @@
>  enum {
>  	AXP202_ID = 0,
>  	AXP209_ID,
> +	AXP288_ID,
> +	NR_AXP2XX_VARIANTS,
>  };
>  
>  #define AXP20X_DATACACHE(m)		(0x04 + (m))
> @@ -49,11 +51,13 @@ enum {
>  #define AXP20X_IRQ3_EN			0x42
>  #define AXP20X_IRQ4_EN			0x43
>  #define AXP20X_IRQ5_EN			0x44
> +#define AXP20X_IRQ6_EN			0x45
>  #define AXP20X_IRQ1_STATE		0x48
>  #define AXP20X_IRQ2_STATE		0x49
>  #define AXP20X_IRQ3_STATE		0x4a
>  #define AXP20X_IRQ4_STATE		0x4b
>  #define AXP20X_IRQ5_STATE		0x4c
> +#define AXP20X_IRQ6_STATE		0x4d
>  
>  /* ADC */
>  #define AXP20X_ACIN_V_ADC_H		0x56
> @@ -116,6 +120,15 @@ enum {
>  #define AXP20X_CC_CTRL			0xb8
>  #define AXP20X_FG_RES			0xb9
>  
> +/* AXP288 specific registers */
> +#define AXP288_PMIC_ADC_H               0x56
> +#define AXP288_PMIC_ADC_L               0x57
> +#define AXP288_ADC_TS_PIN_CTRL          0x84
> +
> +#define AXP288_PMIC_ADC_EN              0x84
> +#define AXP288_FG_TUNE5			0xed
> +
> +
>  /* Regulators IDs */
>  enum {
>  	AXP20X_LDO1 = 0,
> @@ -169,12 +182,57 @@ enum {
>  	AXP20X_IRQ_GPIO0_INPUT,
>  };
>  
> -struct axp20x_dev {
> +enum axp288_irqs {
> +	AXP288_IRQ_VBUS_FALL     = 2,
> +	AXP288_IRQ_VBUS_RISE,
> +	AXP288_IRQ_OV,
> +	AXP288_IRQ_FALLING_ALT,
> +	AXP288_IRQ_RISING_ALT,
> +	AXP288_IRQ_OV_ALT,
> +	AXP288_IRQ_DONE          = 10,
> +	AXP288_IRQ_CHARGING,
> +	AXP288_IRQ_SAFE_QUIT,
> +	AXP288_IRQ_SAFE_ENTER,
> +	AXP288_IRQ_ABSENT,
> +	AXP288_IRQ_APPEND,
> +	AXP288_IRQ_QWBTU,
> +	AXP288_IRQ_WBTU,
> +	AXP288_IRQ_QWBTO,
> +	AXP288_IRQ_WBTO,
> +	AXP288_IRQ_QCBTU,
> +	AXP288_IRQ_CBTU,
> +	AXP288_IRQ_QCBTO,
> +	AXP288_IRQ_CBTO,
> +	AXP288_IRQ_WL2,
> +	AXP288_IRQ_WL1,
> +	AXP288_IRQ_GPADC,
> +	AXP288_IRQ_OT            = 31,
> +	AXP288_IRQ_GPIO0,
> +	AXP288_IRQ_GPIO1,
> +	AXP288_IRQ_POKO,
> +	AXP288_IRQ_POKL,
> +	AXP288_IRQ_POKS,
> +	AXP288_IRQ_POKN,
> +	AXP288_IRQ_POKP,
> +	AXP288_IRQ_TIMER,
> +	AXP288_IRQ_MV_CHNG,
> +	AXP288_IRQ_BC_USB_CHNG,
> +};
> +
> +#define AXP288_TS_ADC_H		0x58
> +#define AXP288_TS_ADC_L		0x59
> +#define AXP288_GP_ADC_H		0x5a
> +#define AXP288_GP_ADC_L		0x5b
> +
> +struct axp2xx_dev {
>  	struct device			*dev;
>  	struct i2c_client		*i2c_client;
>  	struct regmap			*regmap;
>  	struct regmap_irq_chip_data	*regmap_irqc;
>  	long				variant;
> +	int                             nr_cells;
> +	struct mfd_cell                 *cells;
> +	struct regmap_config            *regmap_cfg;
>  };
>  
>  #endif /* __LINUX_MFD_AXP2XX_H */

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH v3 2/5] mfd/axp2xx: extend axp20x to support axp288 pmic

[Jacob Pan]

On Mon, 15 Sep 2014 23:22:16 +0100
Lee Jones <lee.jones@linaro.org> wrote:

> On Thu, 11 Sep 2014, Jacob Pan wrote:
> 
> > XPower AXP288 is a customized PMIC for Intel Baytrail-CR platforms.
> > Similar to AXP202/209, AXP288 comes with USB charger, more LDO and
> > BUCK channels, and AD converter. It also provides extended status
> > and interrupt reporting capabilities than the devices supported in
> > axp20x.c.
> > 
> > In addition to feature extension, this patch also adds ACPI binding
> > for enumeration and hooks for ACPI custom operational region
> > handlers.
> > 
> > Common data structures and constants have been renamed from axp20x
> > to axp2xx in order to suit the extended scope of devices.
> > 
> > This consolidated driver should support more Xpowers' PMICs in both
> > device tree and ACPI enumerated platforms.
> > 
> > Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
> > ---
> >  drivers/mfd/axp2xx.c       | 423
> > +++++++++++++++++++++++++++++++++++----------
> > include/linux/mfd/axp2xx.h |  60 ++++++- 2 files changed, 388
> > insertions(+), 95 deletions(-)
> 
> I agree with Maxime and Jonathan.  Please try again.  All renaming in
> one single patch, new device support in another please.
> 
If you are not against keeping the filenames, I prefer to keep the
axp20x name (not rename to axp2xx) and avoid all the trouble with
rename. Users can get device support information from the Kconfig
description as Jonathan pointed out. Is that OK?

Thanks,

Jacob
> > diff --git a/drivers/mfd/axp2xx.c b/drivers/mfd/axp2xx.c
> > index 332a8a0..300f895 100644
> > --- a/drivers/mfd/axp2xx.c
> > +++ b/drivers/mfd/axp2xx.c
> > @@ -1,9 +1,9 @@
> >  /*
> > - * axp2xx.c - MFD core driver for the X-Powers AXP202 and AXP209
> > + * axp2xx.c - MFD core driver for the X-Powers' Power Management
> > ICs *
> > - * AXP2xx comprises an adaptive USB-Compatible PWM charger, 2 BUCK
> > DC-DC
> > - * converters, 5 LDOs, multiple 12-bit ADCs of voltage, current
> > and temperature
> > - * as well as 4 configurable GPIOs.
> > + * AXP2xx typically comprises an adaptive USB-Compatible PWM
> > charger, BUCK DC-DC
> > + * converters, LDOs, multiple 12-bit ADCs of voltage, current and
> > temperature
> > + * as well as configurable GPIOs.
> >   *
> >   * Author: Carlo Caione <carlo@caione.org>
> >   *
> > @@ -25,9 +25,16 @@
> >  #include <linux/mfd/core.h>
> >  #include <linux/of_device.h>
> >  #include <linux/of_irq.h>
> > +#include <linux/acpi.h>
> >  
> >  #define AXP20X_OFF	0x80
> >  
> > +static const char *axp2xx_model_names[] = {
> > +	"AXP202",
> > +	"AXP209",
> > +	"AXP288",
> > +};
> > +
> >  static const struct regmap_range axp20x_writeable_ranges[] = {
> >  	regmap_reg_range(AXP20X_DATACACHE(0), AXP20X_IRQ5_STATE),
> >  	regmap_reg_range(AXP20X_DCDC_MODE, AXP20X_FG_RES),
> > @@ -47,6 +54,25 @@ static const struct regmap_access_table
> > axp20x_volatile_table = { .n_yes_ranges	=
> > ARRAY_SIZE(axp20x_volatile_ranges), };
> >  
> > +static const struct regmap_range axp288_writeable_ranges[] = {
> > +	regmap_reg_range(AXP20X_DATACACHE(0), AXP20X_IRQ6_STATE),
> > +	regmap_reg_range(AXP20X_DCDC_MODE, AXP288_FG_TUNE5),
> > +};
> > +
> > +static const struct regmap_range axp288_volatile_ranges[] = {
> > +	regmap_reg_range(AXP20X_IRQ1_EN,  AXP20X_IPSOUT_V_HIGH_L),
> > +};
> > +
> > +static const struct regmap_access_table axp288_writeable_table = {
> > +	.yes_ranges	= axp288_writeable_ranges,
> > +	.n_yes_ranges	= ARRAY_SIZE(axp288_writeable_ranges),
> > +};
> > +
> > +static const struct regmap_access_table axp288_volatile_table = {
> > +	.yes_ranges	= axp288_volatile_ranges,
> > +	.n_yes_ranges	= ARRAY_SIZE(axp288_volatile_ranges),
> > +};
> > +
> >  static struct resource axp20x_pek_resources[] = {
> >  	{
> >  		.name	= "PEK_DBR",
> > @@ -61,7 +87,40 @@ static struct resource axp20x_pek_resources[] = {
> >  	},
> >  };
> >  
> > -static const struct regmap_config axp20x_regmap_config = {
> > +static struct resource axp288_battery_resources[] = {
> > +	{
> > +		.start = AXP288_IRQ_QWBTU,
> > +		.end   = AXP288_IRQ_QWBTU,
> > +		.flags = IORESOURCE_IRQ,
> > +	},
> > +	{
> > +		.start = AXP288_IRQ_WBTU,
> > +		.end   = AXP288_IRQ_WBTU,
> > +		.flags = IORESOURCE_IRQ,
> > +	},
> > +	{
> > +		.start = AXP288_IRQ_QWBTO,
> > +		.end   = AXP288_IRQ_QWBTO,
> > +		.flags = IORESOURCE_IRQ,
> > +	},
> > +	{
> > +		.start = AXP288_IRQ_WBTO,
> > +		.end   = AXP288_IRQ_WBTO,
> > +		.flags = IORESOURCE_IRQ,
> > +	},
> > +	{
> > +		.start = AXP288_IRQ_WL2,
> > +		.end   = AXP288_IRQ_WL2,
> > +		.flags = IORESOURCE_IRQ,
> > +	},
> > +	{
> > +		.start = AXP288_IRQ_WL1,
> > +		.end   = AXP288_IRQ_WL1,
> > +		.flags = IORESOURCE_IRQ,
> > +	},
> > +};
> > +
> > +static struct regmap_config axp20x_regmap_config = {
> >  	.reg_bits	= 8,
> >  	.val_bits	= 8,
> >  	.wr_table	= &axp20x_writeable_table,
> > @@ -70,47 +129,96 @@ static const struct regmap_config
> > axp20x_regmap_config = { .cache_type	= REGCACHE_RBTREE,
> >  };
> >  
> > -#define AXP20X_IRQ(_irq, _off, _mask) \
> > -	[AXP20X_IRQ_##_irq] = { .reg_offset = (_off), .mask =
> > BIT(_mask) } +static struct regmap_config axp288_regmap_config = {
> > +	.reg_bits	= 8,
> > +	.val_bits	= 8,
> > +	.wr_table	= &axp288_writeable_table,
> > +	.volatile_table	= &axp288_volatile_table,
> > +	.max_register	= AXP288_FG_TUNE5,
> > +	.cache_type	= REGCACHE_RBTREE,
> > +};
> > +
> > +#define INIT_REGMAP_IRQ(_variant, _irq, _off,
> > _mask)			\
> > +	[_variant##_IRQ_##_irq] = { .reg_offset = (_off), .mask =
> > BIT(_mask) } 
> >  static const struct regmap_irq axp20x_regmap_irqs[] = {
> > -	AXP20X_IRQ(ACIN_OVER_V,		0, 7),
> > -	AXP20X_IRQ(ACIN_PLUGIN,		0, 6),
> > -	AXP20X_IRQ(ACIN_REMOVAL,	0, 5),
> > -	AXP20X_IRQ(VBUS_OVER_V,		0, 4),
> > -	AXP20X_IRQ(VBUS_PLUGIN,		0, 3),
> > -	AXP20X_IRQ(VBUS_REMOVAL,	0, 2),
> > -	AXP20X_IRQ(VBUS_V_LOW,		0, 1),
> > -	AXP20X_IRQ(BATT_PLUGIN,		1, 7),
> > -	AXP20X_IRQ(BATT_REMOVAL,	1, 6),
> > -	AXP20X_IRQ(BATT_ENT_ACT_MODE,	1, 5),
> > -	AXP20X_IRQ(BATT_EXIT_ACT_MODE,	1, 4),
> > -	AXP20X_IRQ(CHARG,		1, 3),
> > -	AXP20X_IRQ(CHARG_DONE,		1, 2),
> > -	AXP20X_IRQ(BATT_TEMP_HIGH,	1, 1),
> > -	AXP20X_IRQ(BATT_TEMP_LOW,	1, 0),
> > -	AXP20X_IRQ(DIE_TEMP_HIGH,	2, 7),
> > -	AXP20X_IRQ(CHARG_I_LOW,		2, 6),
> > -	AXP20X_IRQ(DCDC1_V_LONG,	2, 5),
> > -	AXP20X_IRQ(DCDC2_V_LONG,	2, 4),
> > -	AXP20X_IRQ(DCDC3_V_LONG,	2, 3),
> > -	AXP20X_IRQ(PEK_SHORT,		2, 1),
> > -	AXP20X_IRQ(PEK_LONG,		2, 0),
> > -	AXP20X_IRQ(N_OE_PWR_ON,		3, 7),
> > -	AXP20X_IRQ(N_OE_PWR_OFF,	3, 6),
> > -	AXP20X_IRQ(VBUS_VALID,		3, 5),
> > -	AXP20X_IRQ(VBUS_NOT_VALID,	3, 4),
> > -	AXP20X_IRQ(VBUS_SESS_VALID,	3, 3),
> > -	AXP20X_IRQ(VBUS_SESS_END,	3, 2),
> > -	AXP20X_IRQ(LOW_PWR_LVL1,	3, 1),
> > -	AXP20X_IRQ(LOW_PWR_LVL2,	3, 0),
> > -	AXP20X_IRQ(TIMER,		4, 7),
> > -	AXP20X_IRQ(PEK_RIS_EDGE,	4, 6),
> > -	AXP20X_IRQ(PEK_FAL_EDGE,	4, 5),
> > -	AXP20X_IRQ(GPIO3_INPUT,		4, 3),
> > -	AXP20X_IRQ(GPIO2_INPUT,		4, 2),
> > -	AXP20X_IRQ(GPIO1_INPUT,		4, 1),
> > -	AXP20X_IRQ(GPIO0_INPUT,		4, 0),
> > +	INIT_REGMAP_IRQ(AXP20X, ACIN_OVER_V,		0, 7),
> > +	INIT_REGMAP_IRQ(AXP20X, ACIN_PLUGIN,		0, 6),
> > +	INIT_REGMAP_IRQ(AXP20X, ACIN_REMOVAL,	        0, 5),
> > +	INIT_REGMAP_IRQ(AXP20X, VBUS_OVER_V,		0, 4),
> > +	INIT_REGMAP_IRQ(AXP20X, VBUS_PLUGIN,		0, 3),
> > +	INIT_REGMAP_IRQ(AXP20X, VBUS_REMOVAL,	        0, 2),
> > +	INIT_REGMAP_IRQ(AXP20X, VBUS_V_LOW,		0, 1),
> > +	INIT_REGMAP_IRQ(AXP20X, BATT_PLUGIN,		1, 7),
> > +	INIT_REGMAP_IRQ(AXP20X, BATT_REMOVAL,	        1, 6),
> > +	INIT_REGMAP_IRQ(AXP20X, BATT_ENT_ACT_MODE,	1, 5),
> > +	INIT_REGMAP_IRQ(AXP20X, BATT_EXIT_ACT_MODE,	1, 4),
> > +	INIT_REGMAP_IRQ(AXP20X, CHARG,		        1,
> > 3),
> > +	INIT_REGMAP_IRQ(AXP20X, CHARG_DONE,		1, 2),
> > +	INIT_REGMAP_IRQ(AXP20X, BATT_TEMP_HIGH,	        1,
> > 1),
> > +	INIT_REGMAP_IRQ(AXP20X, BATT_TEMP_LOW,	        1,
> > 0),
> > +	INIT_REGMAP_IRQ(AXP20X, DIE_TEMP_HIGH,	        2,
> > 7),
> > +	INIT_REGMAP_IRQ(AXP20X, CHARG_I_LOW,		2, 6),
> > +	INIT_REGMAP_IRQ(AXP20X, DCDC1_V_LONG,	        2, 5),
> > +	INIT_REGMAP_IRQ(AXP20X, DCDC2_V_LONG,	        2, 4),
> > +	INIT_REGMAP_IRQ(AXP20X, DCDC3_V_LONG,	        2, 3),
> > +	INIT_REGMAP_IRQ(AXP20X, PEK_SHORT,		2, 1),
> > +	INIT_REGMAP_IRQ(AXP20X, PEK_LONG,		2, 0),
> > +	INIT_REGMAP_IRQ(AXP20X, N_OE_PWR_ON,		3, 7),
> > +	INIT_REGMAP_IRQ(AXP20X, N_OE_PWR_OFF,	        3, 6),
> > +	INIT_REGMAP_IRQ(AXP20X, VBUS_VALID,		3, 5),
> > +	INIT_REGMAP_IRQ(AXP20X, VBUS_NOT_VALID,	        3,
> > 4),
> > +	INIT_REGMAP_IRQ(AXP20X, VBUS_SESS_VALID,	3, 3),
> > +	INIT_REGMAP_IRQ(AXP20X, VBUS_SESS_END,	        3,
> > 2),
> > +	INIT_REGMAP_IRQ(AXP20X, LOW_PWR_LVL1,	        3, 1),
> > +	INIT_REGMAP_IRQ(AXP20X, LOW_PWR_LVL2,	        3, 0),
> > +	INIT_REGMAP_IRQ(AXP20X, TIMER,		        4,
> > 7),
> > +	INIT_REGMAP_IRQ(AXP20X, PEK_RIS_EDGE,	        4, 6),
> > +	INIT_REGMAP_IRQ(AXP20X, PEK_FAL_EDGE,	        4, 5),
> > +	INIT_REGMAP_IRQ(AXP20X, GPIO3_INPUT,		4, 3),
> > +	INIT_REGMAP_IRQ(AXP20X, GPIO2_INPUT,		4, 2),
> > +	INIT_REGMAP_IRQ(AXP20X, GPIO1_INPUT,		4, 1),
> > +	INIT_REGMAP_IRQ(AXP20X, GPIO0_INPUT,		4, 0),
> > +};
> > +
> > +/* some IRQs are compatible with axp20x models */
> > +static const struct regmap_irq axp288_regmap_irqs[] = {
> > +	INIT_REGMAP_IRQ(AXP20X, VBUS_REMOVAL,           0, 2),
> > +	INIT_REGMAP_IRQ(AXP20X, VBUS_PLUGIN,            0, 3),
> > +	INIT_REGMAP_IRQ(AXP20X, VBUS_OVER_V,            0, 4),
> > +
> > +	INIT_REGMAP_IRQ(AXP20X, CHARG_DONE,             1, 2),
> > +	INIT_REGMAP_IRQ(AXP20X, CHARG,                  1, 3),
> > +	INIT_REGMAP_IRQ(AXP288, SAFE_QUIT,              1, 4),
> > +	INIT_REGMAP_IRQ(AXP288, SAFE_ENTER,             1, 5),
> > +	INIT_REGMAP_IRQ(AXP20X, BATT_REMOVAL,           1, 6),
> > +	INIT_REGMAP_IRQ(AXP20X, BATT_PLUGIN,            1, 7),
> > +
> > +	INIT_REGMAP_IRQ(AXP288, QWBTU,                  2, 0),
> > +	INIT_REGMAP_IRQ(AXP288, WBTU,                   2, 1),
> > +	INIT_REGMAP_IRQ(AXP288, QWBTO,                  2, 2),
> > +	INIT_REGMAP_IRQ(AXP288, WBTU,                   2, 3),
> > +	INIT_REGMAP_IRQ(AXP288, QCBTU,                  2, 4),
> > +	INIT_REGMAP_IRQ(AXP288, CBTU,                   2, 5),
> > +	INIT_REGMAP_IRQ(AXP288, QCBTO,                  2, 6),
> > +	INIT_REGMAP_IRQ(AXP288, CBTO,                   2, 7),
> > +
> > +	INIT_REGMAP_IRQ(AXP288, WL2,                    3, 0),
> > +	INIT_REGMAP_IRQ(AXP288, WL1,                    3, 1),
> > +	INIT_REGMAP_IRQ(AXP288, GPADC,                  3, 2),
> > +	INIT_REGMAP_IRQ(AXP288, OT,                     3, 7),
> > +
> > +	INIT_REGMAP_IRQ(AXP288, GPIO0,                  4, 0),
> > +	INIT_REGMAP_IRQ(AXP288, GPIO1,                  4, 1),
> > +	INIT_REGMAP_IRQ(AXP288, POKO,                   4, 2),
> > +	INIT_REGMAP_IRQ(AXP288, POKL,                   4, 3),
> > +	INIT_REGMAP_IRQ(AXP288, POKS,                   4, 4),
> > +	INIT_REGMAP_IRQ(AXP288, POKN,                   4, 5),
> > +	INIT_REGMAP_IRQ(AXP288, POKP,                   4, 6),
> > +	INIT_REGMAP_IRQ(AXP20X, TIMER,                  4, 7),
> > +
> > +	INIT_REGMAP_IRQ(AXP288, MV_CHNG,                5, 0),
> > +	INIT_REGMAP_IRQ(AXP288, BC_USB_CHNG,            5, 1),
> >  };
> >  
> >  static const struct of_device_id axp20x_of_match[] = {
> > @@ -123,19 +231,26 @@ MODULE_DEVICE_TABLE(of, axp20x_of_match);
> >  /*
> >   * This is useless for OF-enabled devices, but it is needed by I2C
> > subsystem */
> > -static const struct i2c_device_id axp20x_i2c_id[] = {
> > +static const struct i2c_device_id axp2xx_i2c_id[] = {
> > +	{ },
> > +};
> > +MODULE_DEVICE_TABLE(i2c, axp2xx_i2c_id);
> > +
> > +static struct acpi_device_id axp2xx_acpi_match[] = {
> > +	{
> > +		.id = "INT33F4",
> > +		.driver_data = (kernel_ulong_t)AXP288_ID,
> > +	},
> >  	{ },
> >  };
> > -MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
> > +MODULE_DEVICE_TABLE(acpi, axp2xx_acpi_match);
> >  
> > -static const struct regmap_irq_chip axp20x_regmap_irq_chip = {
> > -	.name			= "axp20x_irq_chip",
> > +/* common irq chip attributes only */
> > +static struct regmap_irq_chip axp2xx_regmap_irq_chip = {
> > +	.name			= "axp2xx_irq_chip",
> >  	.status_base		= AXP20X_IRQ1_STATE,
> >  	.ack_base		= AXP20X_IRQ1_STATE,
> >  	.mask_base		= AXP20X_IRQ1_EN,
> > -	.num_regs		= 5,
> > -	.irqs			= axp20x_regmap_irqs,
> > -	.num_irqs		= ARRAY_SIZE(axp20x_regmap_irqs),
> >  	.mask_invert		= true,
> >  	.init_ack_masked	= true,
> >  };
> > @@ -161,98 +276,218 @@ static struct mfd_cell axp20x_cells[] = {
> >  	},
> >  };
> >  
> > -static struct axp20x_dev *axp20x_pm_power_off;
> > -static void axp20x_power_off(void)
> > +static struct resource axp288_adc_resources[] = {
> > +	{
> > +		.name	= "GPADC",
> > +		.start = AXP288_IRQ_GPADC,
> > +		.end   = AXP288_IRQ_GPADC,
> > +		.flags = IORESOURCE_IRQ,
> > +	},
> > +};
> > +
> > +static struct resource axp288_charger_resources[] = {
> > +	{
> > +		.start = AXP288_IRQ_OV,
> > +		.end   = AXP288_IRQ_OV,
> > +		.flags = IORESOURCE_IRQ,
> > +	},
> > +	{
> > +		.start = AXP288_IRQ_DONE,
> > +		.end   = AXP288_IRQ_DONE,
> > +		.flags = IORESOURCE_IRQ,
> > +	},
> > +	{
> > +		.start = AXP288_IRQ_CHARGING,
> > +		.end   = AXP288_IRQ_CHARGING,
> > +		.flags = IORESOURCE_IRQ,
> > +	},
> > +	{
> > +		.start = AXP288_IRQ_SAFE_QUIT,
> > +		.end   = AXP288_IRQ_SAFE_QUIT,
> > +		.flags = IORESOURCE_IRQ,
> > +	},
> > +	{
> > +		.start = AXP288_IRQ_SAFE_ENTER,
> > +		.end   = AXP288_IRQ_SAFE_ENTER,
> > +		.flags = IORESOURCE_IRQ,
> > +	},
> > +	{
> > +		.start = AXP288_IRQ_QCBTU,
> > +		.end   = AXP288_IRQ_QCBTU,
> > +		.flags = IORESOURCE_IRQ,
> > +	},
> > +	{
> > +		.start = AXP288_IRQ_CBTU,
> > +		.end   = AXP288_IRQ_CBTU,
> > +		.flags = IORESOURCE_IRQ,
> > +	},
> > +	{
> > +		.start = AXP288_IRQ_QCBTO,
> > +		.end   = AXP288_IRQ_QCBTO,
> > +		.flags = IORESOURCE_IRQ,
> > +	},
> > +	{
> > +		.start = AXP288_IRQ_CBTO,
> > +		.end   = AXP288_IRQ_CBTO,
> > +		.flags = IORESOURCE_IRQ,
> > +	},
> > +};
> > +
> > +static struct mfd_cell axp288_cells[] = {
> > +	{
> > +		.name = "axp288_adc",
> > +		.num_resources = ARRAY_SIZE(axp288_adc_resources),
> > +		.resources = axp288_adc_resources,
> > +	},
> > +	{
> > +		.name = "axp288_charger",
> > +		.num_resources =
> > ARRAY_SIZE(axp288_charger_resources),
> > +		.resources = axp288_charger_resources,
> > +	},
> > +	{
> > +		.name = "axp288_battery",
> > +		.num_resources =
> > ARRAY_SIZE(axp288_battery_resources),
> > +		.resources = axp288_battery_resources,
> > +	},
> > +};
> > +
> > +static struct axp2xx_dev *axp2xx_pm_power_off;
> > +static void axp2xx_power_off(void)
> >  {
> > -	regmap_write(axp20x_pm_power_off->regmap, AXP20X_OFF_CTRL,
> > +	if (axp2xx_pm_power_off->variant == AXP288_ID)
> > +		return;
> > +	regmap_write(axp2xx_pm_power_off->regmap, AXP20X_OFF_CTRL,
> >  		     AXP20X_OFF);
> >  }
> >  
> > -static int axp20x_i2c_probe(struct i2c_client *i2c,
> > -			 const struct i2c_device_id *id)
> > +static int axp2xx_match_device(struct axp2xx_dev *axp2xx, struct
> > device *dev) {
> > -	struct axp20x_dev *axp20x;
> > +	const struct acpi_device_id *acpi_id;
> >  	const struct of_device_id *of_id;
> > +
> > +	of_id = of_match_device(axp2xx_of_match, dev);
> > +	if (of_id)
> > +		axp2xx->variant = (long) of_id->data;
> > +	else {
> > +		acpi_id =
> > acpi_match_device(dev->driver->acpi_match_table, dev);
> > +		if (!acpi_id || !acpi_id->driver_data) {
> > +			dev_err(dev, "Unable to determine ID\n");
> > +			return -ENODEV;
> > +		}
> > +		axp2xx->variant = (long) acpi_id->driver_data;
> > +	}
> > +	switch (axp2xx->variant) {
> > +	case AXP202_ID:
> > +	case AXP209_ID:
> > +		axp2xx->nr_cells = ARRAY_SIZE(axp20x_cells);
> > +		axp2xx->cells = axp20x_cells;
> > +		axp2xx->regmap_cfg = &axp20x_regmap_config;
> > +		axp2xx_regmap_irq_chip.num_regs	= 5;
> > +		axp2xx_regmap_irq_chip.irqs = axp20x_regmap_irqs;
> > +		axp2xx_regmap_irq_chip.num_irqs	=
> > +			ARRAY_SIZE(axp20x_regmap_irqs);
> > +		break;
> > +	case AXP288_ID:
> > +		axp2xx->cells = axp288_cells;
> > +		axp2xx->nr_cells = ARRAY_SIZE(axp288_cells);
> > +		axp2xx->regmap_cfg = &axp288_regmap_config;
> > +		axp2xx_regmap_irq_chip.irqs = axp288_regmap_irqs;
> > +		axp2xx_regmap_irq_chip.num_irqs	=
> > +			ARRAY_SIZE(axp288_regmap_irqs);
> > +		axp2xx_regmap_irq_chip.num_regs	= 6;
> > +		break;
> > +	default:
> > +		dev_err(dev, "unsupported AXP2XX ID %lu\n",
> > axp2xx->variant);
> > +		return -ENODEV;
> > +	}
> > +	dev_info(dev, "AXP2xx variant %s found\n",
> > +		axp2xx_model_names[axp2xx->variant]);
> > +
> > +	return 0;
> > +}
> > +
> > +static int axp2xx_i2c_probe(struct i2c_client *i2c,
> > +			const struct i2c_device_id *id)
> > +{
> > +	struct axp2xx_dev *axp2xx;
> >  	int ret;
> >  
> > -	axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x),
> > GFP_KERNEL);
> > -	if (!axp20x)
> > +	axp2xx = devm_kzalloc(&i2c->dev, sizeof(*axp2xx),
> > GFP_KERNEL);
> > +	if (!axp2xx)
> >  		return -ENOMEM;
> >  
> > -	of_id = of_match_device(axp20x_of_match, &i2c->dev);
> > -	if (!of_id) {
> > -		dev_err(&i2c->dev, "Unable to setup AXP20X
> > data\n");
> > -		return -ENODEV;
> > -	}
> > -	axp20x->variant = (long) of_id->data;
> > +	ret = axp2xx_match_device(axp2xx, &i2c->dev);
> > +	if (ret)
> > +		return ret;
> >  
> > -	axp20x->i2c_client = i2c;
> > -	axp20x->dev = &i2c->dev;
> > -	dev_set_drvdata(axp20x->dev, axp20x);
> > +	axp2xx->i2c_client = i2c;
> > +	axp2xx->dev = &i2c->dev;
> > +	dev_set_drvdata(axp2xx->dev, axp2xx);
> >  
> > -	axp20x->regmap = devm_regmap_init_i2c(i2c,
> > &axp20x_regmap_config);
> > -	if (IS_ERR(axp20x->regmap)) {
> > -		ret = PTR_ERR(axp20x->regmap);
> > +	axp2xx->regmap = devm_regmap_init_i2c(i2c,
> > axp2xx->regmap_cfg);
> > +	if (IS_ERR(axp2xx->regmap)) {
> > +		ret = PTR_ERR(axp2xx->regmap);
> >  		dev_err(&i2c->dev, "regmap init failed: %d\n",
> > ret); return ret;
> >  	}
> >  
> > -	ret = regmap_add_irq_chip(axp20x->regmap, i2c->irq,
> > +	ret = regmap_add_irq_chip(axp2xx->regmap, i2c->irq,
> >  				  IRQF_ONESHOT | IRQF_SHARED, -1,
> > -				  &axp20x_regmap_irq_chip,
> > -				  &axp20x->regmap_irqc);
> > +				  &axp2xx_regmap_irq_chip,
> > +				  &axp2xx->regmap_irqc);
> >  	if (ret) {
> >  		dev_err(&i2c->dev, "failed to add irq chip: %d\n",
> > ret); return ret;
> >  	}
> >  
> > -	ret = mfd_add_devices(axp20x->dev, -1, axp20x_cells,
> > -			      ARRAY_SIZE(axp20x_cells), NULL, 0,
> > NULL);
> > +	ret = mfd_add_devices(axp2xx->dev, -1, axp2xx->cells,
> > +			axp2xx->nr_cells, NULL, 0, NULL);
> >  
> >  	if (ret) {
> >  		dev_err(&i2c->dev, "failed to add MFD devices:
> > %d\n", ret);
> > -		regmap_del_irq_chip(i2c->irq, axp20x->regmap_irqc);
> > +		regmap_del_irq_chip(i2c->irq, axp2xx->regmap_irqc);
> >  		return ret;
> >  	}
> >  
> >  	if (!pm_power_off) {
> > -		axp20x_pm_power_off = axp20x;
> > -		pm_power_off = axp20x_power_off;
> > +		axp2xx_pm_power_off = axp2xx;
> > +		pm_power_off = axp2xx_power_off;
> >  	}
> >  
> > -	dev_info(&i2c->dev, "AXP20X driver loaded\n");
> > +	dev_info(&i2c->dev, "AXP2XX driver loaded\n");
> >  
> >  	return 0;
> >  }
> >  
> > -static int axp20x_i2c_remove(struct i2c_client *i2c)
> > +static int axp2xx_i2c_remove(struct i2c_client *i2c)
> >  {
> > -	struct axp20x_dev *axp20x = i2c_get_clientdata(i2c);
> > +	struct axp2xx_dev *axp2xx = i2c_get_clientdata(i2c);
> >  
> > -	if (axp20x == axp20x_pm_power_off) {
> > -		axp20x_pm_power_off = NULL;
> > +	if (axp2xx == axp2xx_pm_power_off) {
> > +		axp2xx_pm_power_off = NULL;
> >  		pm_power_off = NULL;
> >  	}
> >  
> > -	mfd_remove_devices(axp20x->dev);
> > -	regmap_del_irq_chip(axp20x->i2c_client->irq,
> > axp20x->regmap_irqc);
> > +	mfd_remove_devices(axp2xx->dev);
> > +	regmap_del_irq_chip(axp2xx->i2c_client->irq,
> > axp2xx->regmap_irqc); 
> >  	return 0;
> >  }
> >  
> > -static struct i2c_driver axp20x_i2c_driver = {
> > +static struct i2c_driver axp2xx_i2c_driver = {
> >  	.driver = {
> > -		.name	= "axp20x",
> > +		.name	= "axp2xx",
> >  		.owner	= THIS_MODULE,
> > -		.of_match_table	=
> > of_match_ptr(axp20x_of_match),
> > +		.of_match_table	=
> > of_match_ptr(axp2xx_of_match),
> > +		.acpi_match_table = ACPI_PTR(axp2xx_acpi_match),
> >  	},
> > -	.probe		= axp20x_i2c_probe,
> > -	.remove		= axp20x_i2c_remove,
> > -	.id_table	= axp20x_i2c_id,
> > +	.probe		= axp2xx_i2c_probe,
> > +	.remove		= axp2xx_i2c_remove,
> > +	.id_table	= axp2xx_i2c_id,
> >  };
> >  
> > -module_i2c_driver(axp20x_i2c_driver);
> > +module_i2c_driver(axp2xx_i2c_driver);
> >  
> > -MODULE_DESCRIPTION("PMIC MFD core driver for AXP20X");
> > +MODULE_DESCRIPTION("PMIC MFD core driver for AXP2XX");
> >  MODULE_AUTHOR("Carlo Caione <carlo@caione.org>");
> >  MODULE_LICENSE("GPL");
> > diff --git a/include/linux/mfd/axp2xx.h b/include/linux/mfd/axp2xx.h
> > index a36d91b..331cf6e 100644
> > --- a/include/linux/mfd/axp2xx.h
> > +++ b/include/linux/mfd/axp2xx.h
> > @@ -14,6 +14,8 @@
> >  enum {
> >  	AXP202_ID = 0,
> >  	AXP209_ID,
> > +	AXP288_ID,
> > +	NR_AXP2XX_VARIANTS,
> >  };
> >  
> >  #define AXP20X_DATACACHE(m)		(0x04 + (m))
> > @@ -49,11 +51,13 @@ enum {
> >  #define AXP20X_IRQ3_EN			0x42
> >  #define AXP20X_IRQ4_EN			0x43
> >  #define AXP20X_IRQ5_EN			0x44
> > +#define AXP20X_IRQ6_EN			0x45
> >  #define AXP20X_IRQ1_STATE		0x48
> >  #define AXP20X_IRQ2_STATE		0x49
> >  #define AXP20X_IRQ3_STATE		0x4a
> >  #define AXP20X_IRQ4_STATE		0x4b
> >  #define AXP20X_IRQ5_STATE		0x4c
> > +#define AXP20X_IRQ6_STATE		0x4d
> >  
> >  /* ADC */
> >  #define AXP20X_ACIN_V_ADC_H		0x56
> > @@ -116,6 +120,15 @@ enum {
> >  #define AXP20X_CC_CTRL			0xb8
> >  #define AXP20X_FG_RES			0xb9
> >  
> > +/* AXP288 specific registers */
> > +#define AXP288_PMIC_ADC_H               0x56
> > +#define AXP288_PMIC_ADC_L               0x57
> > +#define AXP288_ADC_TS_PIN_CTRL          0x84
> > +
> > +#define AXP288_PMIC_ADC_EN              0x84
> > +#define AXP288_FG_TUNE5			0xed
> > +
> > +
> >  /* Regulators IDs */
> >  enum {
> >  	AXP20X_LDO1 = 0,
> > @@ -169,12 +182,57 @@ enum {
> >  	AXP20X_IRQ_GPIO0_INPUT,
> >  };
> >  
> > -struct axp20x_dev {
> > +enum axp288_irqs {
> > +	AXP288_IRQ_VBUS_FALL     = 2,
> > +	AXP288_IRQ_VBUS_RISE,
> > +	AXP288_IRQ_OV,
> > +	AXP288_IRQ_FALLING_ALT,
> > +	AXP288_IRQ_RISING_ALT,
> > +	AXP288_IRQ_OV_ALT,
> > +	AXP288_IRQ_DONE          = 10,
> > +	AXP288_IRQ_CHARGING,
> > +	AXP288_IRQ_SAFE_QUIT,
> > +	AXP288_IRQ_SAFE_ENTER,
> > +	AXP288_IRQ_ABSENT,
> > +	AXP288_IRQ_APPEND,
> > +	AXP288_IRQ_QWBTU,
> > +	AXP288_IRQ_WBTU,
> > +	AXP288_IRQ_QWBTO,
> > +	AXP288_IRQ_WBTO,
> > +	AXP288_IRQ_QCBTU,
> > +	AXP288_IRQ_CBTU,
> > +	AXP288_IRQ_QCBTO,
> > +	AXP288_IRQ_CBTO,
> > +	AXP288_IRQ_WL2,
> > +	AXP288_IRQ_WL1,
> > +	AXP288_IRQ_GPADC,
> > +	AXP288_IRQ_OT            = 31,
> > +	AXP288_IRQ_GPIO0,
> > +	AXP288_IRQ_GPIO1,
> > +	AXP288_IRQ_POKO,
> > +	AXP288_IRQ_POKL,
> > +	AXP288_IRQ_POKS,
> > +	AXP288_IRQ_POKN,
> > +	AXP288_IRQ_POKP,
> > +	AXP288_IRQ_TIMER,
> > +	AXP288_IRQ_MV_CHNG,
> > +	AXP288_IRQ_BC_USB_CHNG,
> > +};
> > +
> > +#define AXP288_TS_ADC_H		0x58
> > +#define AXP288_TS_ADC_L		0x59
> > +#define AXP288_GP_ADC_H		0x5a
> > +#define AXP288_GP_ADC_L		0x5b
> > +
> > +struct axp2xx_dev {
> >  	struct device			*dev;
> >  	struct i2c_client		*i2c_client;
> >  	struct regmap			*regmap;
> >  	struct regmap_irq_chip_data	*regmap_irqc;
> >  	long				variant;
> > +	int                             nr_cells;
> > +	struct mfd_cell                 *cells;
> > +	struct regmap_config            *regmap_cfg;
> >  };
> >  
> >  #endif /* __LINUX_MFD_AXP2XX_H */
> 

[Jacob Pan]

Re: [PATCH v3 2/5] mfd/axp2xx: extend axp20x to support axp288 pmic

[Lee Jones]

On Mon, 15 Sep 2014, Jacob Pan wrote:

> On Mon, 15 Sep 2014 23:22:16 +0100
> Lee Jones <lee.jones@linaro.org> wrote:
> 
> > On Thu, 11 Sep 2014, Jacob Pan wrote:
> > 
> > > XPower AXP288 is a customized PMIC for Intel Baytrail-CR platforms.
> > > Similar to AXP202/209, AXP288 comes with USB charger, more LDO and
> > > BUCK channels, and AD converter. It also provides extended status
> > > and interrupt reporting capabilities than the devices supported in
> > > axp20x.c.
> > > 
> > > In addition to feature extension, this patch also adds ACPI binding
> > > for enumeration and hooks for ACPI custom operational region
> > > handlers.
> > > 
> > > Common data structures and constants have been renamed from axp20x
> > > to axp2xx in order to suit the extended scope of devices.
> > > 
> > > This consolidated driver should support more Xpowers' PMICs in both
> > > device tree and ACPI enumerated platforms.
> > > 
> > > Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
> > > ---
> > >  drivers/mfd/axp2xx.c       | 423
> > > +++++++++++++++++++++++++++++++++++----------
> > > include/linux/mfd/axp2xx.h |  60 ++++++- 2 files changed, 388
> > > insertions(+), 95 deletions(-)
> > 
> > I agree with Maxime and Jonathan.  Please try again.  All renaming in
> > one single patch, new device support in another please.
> > 
> If you are not against keeping the filenames, I prefer to keep the
> axp20x name (not rename to axp2xx) and avoid all the trouble with
> rename. Users can get device support information from the Kconfig
> description as Jonathan pointed out. Is that OK?

Yes, fine.  Please submit your set and I will review.

> > > diff --git a/drivers/mfd/axp2xx.c b/drivers/mfd/axp2xx.c
> > > index 332a8a0..300f895 100644
> > > --- a/drivers/mfd/axp2xx.c
> > > +++ b/drivers/mfd/axp2xx.c
> > > @@ -1,9 +1,9 @@
> > >  /*
> > > - * axp2xx.c - MFD core driver for the X-Powers AXP202 and AXP209
> > > + * axp2xx.c - MFD core driver for the X-Powers' Power Management
> > > ICs *
> > > - * AXP2xx comprises an adaptive USB-Compatible PWM charger, 2 BUCK
> > > DC-DC
> > > - * converters, 5 LDOs, multiple 12-bit ADCs of voltage, current
> > > and temperature
> > > - * as well as 4 configurable GPIOs.
> > > + * AXP2xx typically comprises an adaptive USB-Compatible PWM
> > > charger, BUCK DC-DC
> > > + * converters, LDOs, multiple 12-bit ADCs of voltage, current and
> > > temperature
> > > + * as well as configurable GPIOs.
> > >   *
> > >   * Author: Carlo Caione <carlo@caione.org>
> > >   *
> > > @@ -25,9 +25,16 @@
> > >  #include <linux/mfd/core.h>
> > >  #include <linux/of_device.h>
> > >  #include <linux/of_irq.h>
> > > +#include <linux/acpi.h>
> > >  
> > >  #define AXP20X_OFF	0x80
> > >  
> > > +static const char *axp2xx_model_names[] = {
> > > +	"AXP202",
> > > +	"AXP209",
> > > +	"AXP288",
> > > +};
> > > +
> > >  static const struct regmap_range axp20x_writeable_ranges[] = {
> > >  	regmap_reg_range(AXP20X_DATACACHE(0), AXP20X_IRQ5_STATE),
> > >  	regmap_reg_range(AXP20X_DCDC_MODE, AXP20X_FG_RES),
> > > @@ -47,6 +54,25 @@ static const struct regmap_access_table
> > > axp20x_volatile_table = { .n_yes_ranges	=
> > > ARRAY_SIZE(axp20x_volatile_ranges), };
> > >  
> > > +static const struct regmap_range axp288_writeable_ranges[] = {
> > > +	regmap_reg_range(AXP20X_DATACACHE(0), AXP20X_IRQ6_STATE),
> > > +	regmap_reg_range(AXP20X_DCDC_MODE, AXP288_FG_TUNE5),
> > > +};
> > > +
> > > +static const struct regmap_range axp288_volatile_ranges[] = {
> > > +	regmap_reg_range(AXP20X_IRQ1_EN,  AXP20X_IPSOUT_V_HIGH_L),
> > > +};
> > > +
> > > +static const struct regmap_access_table axp288_writeable_table = {
> > > +	.yes_ranges	= axp288_writeable_ranges,
> > > +	.n_yes_ranges	= ARRAY_SIZE(axp288_writeable_ranges),
> > > +};
> > > +
> > > +static const struct regmap_access_table axp288_volatile_table = {
> > > +	.yes_ranges	= axp288_volatile_ranges,
> > > +	.n_yes_ranges	= ARRAY_SIZE(axp288_volatile_ranges),
> > > +};
> > > +
> > >  static struct resource axp20x_pek_resources[] = {
> > >  	{
> > >  		.name	= "PEK_DBR",
> > > @@ -61,7 +87,40 @@ static struct resource axp20x_pek_resources[] = {
> > >  	},
> > >  };
> > >  
> > > -static const struct regmap_config axp20x_regmap_config = {
> > > +static struct resource axp288_battery_resources[] = {
> > > +	{
> > > +		.start = AXP288_IRQ_QWBTU,
> > > +		.end   = AXP288_IRQ_QWBTU,
> > > +		.flags = IORESOURCE_IRQ,
> > > +	},
> > > +	{
> > > +		.start = AXP288_IRQ_WBTU,
> > > +		.end   = AXP288_IRQ_WBTU,
> > > +		.flags = IORESOURCE_IRQ,
> > > +	},
> > > +	{
> > > +		.start = AXP288_IRQ_QWBTO,
> > > +		.end   = AXP288_IRQ_QWBTO,
> > > +		.flags = IORESOURCE_IRQ,
> > > +	},
> > > +	{
> > > +		.start = AXP288_IRQ_WBTO,
> > > +		.end   = AXP288_IRQ_WBTO,
> > > +		.flags = IORESOURCE_IRQ,
> > > +	},
> > > +	{
> > > +		.start = AXP288_IRQ_WL2,
> > > +		.end   = AXP288_IRQ_WL2,
> > > +		.flags = IORESOURCE_IRQ,
> > > +	},
> > > +	{
> > > +		.start = AXP288_IRQ_WL1,
> > > +		.end   = AXP288_IRQ_WL1,
> > > +		.flags = IORESOURCE_IRQ,
> > > +	},
> > > +};
> > > +
> > > +static struct regmap_config axp20x_regmap_config = {
> > >  	.reg_bits	= 8,
> > >  	.val_bits	= 8,
> > >  	.wr_table	= &axp20x_writeable_table,
> > > @@ -70,47 +129,96 @@ static const struct regmap_config
> > > axp20x_regmap_config = { .cache_type	= REGCACHE_RBTREE,
> > >  };
> > >  
> > > -#define AXP20X_IRQ(_irq, _off, _mask) \
> > > -	[AXP20X_IRQ_##_irq] = { .reg_offset = (_off), .mask =
> > > BIT(_mask) } +static struct regmap_config axp288_regmap_config = {
> > > +	.reg_bits	= 8,
> > > +	.val_bits	= 8,
> > > +	.wr_table	= &axp288_writeable_table,
> > > +	.volatile_table	= &axp288_volatile_table,
> > > +	.max_register	= AXP288_FG_TUNE5,
> > > +	.cache_type	= REGCACHE_RBTREE,
> > > +};
> > > +
> > > +#define INIT_REGMAP_IRQ(_variant, _irq, _off,
> > > _mask)			\
> > > +	[_variant##_IRQ_##_irq] = { .reg_offset = (_off), .mask =
> > > BIT(_mask) } 
> > >  static const struct regmap_irq axp20x_regmap_irqs[] = {
> > > -	AXP20X_IRQ(ACIN_OVER_V,		0, 7),
> > > -	AXP20X_IRQ(ACIN_PLUGIN,		0, 6),
> > > -	AXP20X_IRQ(ACIN_REMOVAL,	0, 5),
> > > -	AXP20X_IRQ(VBUS_OVER_V,		0, 4),
> > > -	AXP20X_IRQ(VBUS_PLUGIN,		0, 3),
> > > -	AXP20X_IRQ(VBUS_REMOVAL,	0, 2),
> > > -	AXP20X_IRQ(VBUS_V_LOW,		0, 1),
> > > -	AXP20X_IRQ(BATT_PLUGIN,		1, 7),
> > > -	AXP20X_IRQ(BATT_REMOVAL,	1, 6),
> > > -	AXP20X_IRQ(BATT_ENT_ACT_MODE,	1, 5),
> > > -	AXP20X_IRQ(BATT_EXIT_ACT_MODE,	1, 4),
> > > -	AXP20X_IRQ(CHARG,		1, 3),
> > > -	AXP20X_IRQ(CHARG_DONE,		1, 2),
> > > -	AXP20X_IRQ(BATT_TEMP_HIGH,	1, 1),
> > > -	AXP20X_IRQ(BATT_TEMP_LOW,	1, 0),
> > > -	AXP20X_IRQ(DIE_TEMP_HIGH,	2, 7),
> > > -	AXP20X_IRQ(CHARG_I_LOW,		2, 6),
> > > -	AXP20X_IRQ(DCDC1_V_LONG,	2, 5),
> > > -	AXP20X_IRQ(DCDC2_V_LONG,	2, 4),
> > > -	AXP20X_IRQ(DCDC3_V_LONG,	2, 3),
> > > -	AXP20X_IRQ(PEK_SHORT,		2, 1),
> > > -	AXP20X_IRQ(PEK_LONG,		2, 0),
> > > -	AXP20X_IRQ(N_OE_PWR_ON,		3, 7),
> > > -	AXP20X_IRQ(N_OE_PWR_OFF,	3, 6),
> > > -	AXP20X_IRQ(VBUS_VALID,		3, 5),
> > > -	AXP20X_IRQ(VBUS_NOT_VALID,	3, 4),
> > > -	AXP20X_IRQ(VBUS_SESS_VALID,	3, 3),
> > > -	AXP20X_IRQ(VBUS_SESS_END,	3, 2),
> > > -	AXP20X_IRQ(LOW_PWR_LVL1,	3, 1),
> > > -	AXP20X_IRQ(LOW_PWR_LVL2,	3, 0),
> > > -	AXP20X_IRQ(TIMER,		4, 7),
> > > -	AXP20X_IRQ(PEK_RIS_EDGE,	4, 6),
> > > -	AXP20X_IRQ(PEK_FAL_EDGE,	4, 5),
> > > -	AXP20X_IRQ(GPIO3_INPUT,		4, 3),
> > > -	AXP20X_IRQ(GPIO2_INPUT,		4, 2),
> > > -	AXP20X_IRQ(GPIO1_INPUT,		4, 1),
> > > -	AXP20X_IRQ(GPIO0_INPUT,		4, 0),
> > > +	INIT_REGMAP_IRQ(AXP20X, ACIN_OVER_V,		0, 7),
> > > +	INIT_REGMAP_IRQ(AXP20X, ACIN_PLUGIN,		0, 6),
> > > +	INIT_REGMAP_IRQ(AXP20X, ACIN_REMOVAL,	        0, 5),
> > > +	INIT_REGMAP_IRQ(AXP20X, VBUS_OVER_V,		0, 4),
> > > +	INIT_REGMAP_IRQ(AXP20X, VBUS_PLUGIN,		0, 3),
> > > +	INIT_REGMAP_IRQ(AXP20X, VBUS_REMOVAL,	        0, 2),
> > > +	INIT_REGMAP_IRQ(AXP20X, VBUS_V_LOW,		0, 1),
> > > +	INIT_REGMAP_IRQ(AXP20X, BATT_PLUGIN,		1, 7),
> > > +	INIT_REGMAP_IRQ(AXP20X, BATT_REMOVAL,	        1, 6),
> > > +	INIT_REGMAP_IRQ(AXP20X, BATT_ENT_ACT_MODE,	1, 5),
> > > +	INIT_REGMAP_IRQ(AXP20X, BATT_EXIT_ACT_MODE,	1, 4),
> > > +	INIT_REGMAP_IRQ(AXP20X, CHARG,		        1,
> > > 3),
> > > +	INIT_REGMAP_IRQ(AXP20X, CHARG_DONE,		1, 2),
> > > +	INIT_REGMAP_IRQ(AXP20X, BATT_TEMP_HIGH,	        1,
> > > 1),
> > > +	INIT_REGMAP_IRQ(AXP20X, BATT_TEMP_LOW,	        1,
> > > 0),
> > > +	INIT_REGMAP_IRQ(AXP20X, DIE_TEMP_HIGH,	        2,
> > > 7),
> > > +	INIT_REGMAP_IRQ(AXP20X, CHARG_I_LOW,		2, 6),
> > > +	INIT_REGMAP_IRQ(AXP20X, DCDC1_V_LONG,	        2, 5),
> > > +	INIT_REGMAP_IRQ(AXP20X, DCDC2_V_LONG,	        2, 4),
> > > +	INIT_REGMAP_IRQ(AXP20X, DCDC3_V_LONG,	        2, 3),
> > > +	INIT_REGMAP_IRQ(AXP20X, PEK_SHORT,		2, 1),
> > > +	INIT_REGMAP_IRQ(AXP20X, PEK_LONG,		2, 0),
> > > +	INIT_REGMAP_IRQ(AXP20X, N_OE_PWR_ON,		3, 7),
> > > +	INIT_REGMAP_IRQ(AXP20X, N_OE_PWR_OFF,	        3, 6),
> > > +	INIT_REGMAP_IRQ(AXP20X, VBUS_VALID,		3, 5),
> > > +	INIT_REGMAP_IRQ(AXP20X, VBUS_NOT_VALID,	        3,
> > > 4),
> > > +	INIT_REGMAP_IRQ(AXP20X, VBUS_SESS_VALID,	3, 3),
> > > +	INIT_REGMAP_IRQ(AXP20X, VBUS_SESS_END,	        3,
> > > 2),
> > > +	INIT_REGMAP_IRQ(AXP20X, LOW_PWR_LVL1,	        3, 1),
> > > +	INIT_REGMAP_IRQ(AXP20X, LOW_PWR_LVL2,	        3, 0),
> > > +	INIT_REGMAP_IRQ(AXP20X, TIMER,		        4,
> > > 7),
> > > +	INIT_REGMAP_IRQ(AXP20X, PEK_RIS_EDGE,	        4, 6),
> > > +	INIT_REGMAP_IRQ(AXP20X, PEK_FAL_EDGE,	        4, 5),
> > > +	INIT_REGMAP_IRQ(AXP20X, GPIO3_INPUT,		4, 3),
> > > +	INIT_REGMAP_IRQ(AXP20X, GPIO2_INPUT,		4, 2),
> > > +	INIT_REGMAP_IRQ(AXP20X, GPIO1_INPUT,		4, 1),
> > > +	INIT_REGMAP_IRQ(AXP20X, GPIO0_INPUT,		4, 0),
> > > +};
> > > +
> > > +/* some IRQs are compatible with axp20x models */
> > > +static const struct regmap_irq axp288_regmap_irqs[] = {
> > > +	INIT_REGMAP_IRQ(AXP20X, VBUS_REMOVAL,           0, 2),
> > > +	INIT_REGMAP_IRQ(AXP20X, VBUS_PLUGIN,            0, 3),
> > > +	INIT_REGMAP_IRQ(AXP20X, VBUS_OVER_V,            0, 4),
> > > +
> > > +	INIT_REGMAP_IRQ(AXP20X, CHARG_DONE,             1, 2),
> > > +	INIT_REGMAP_IRQ(AXP20X, CHARG,                  1, 3),
> > > +	INIT_REGMAP_IRQ(AXP288, SAFE_QUIT,              1, 4),
> > > +	INIT_REGMAP_IRQ(AXP288, SAFE_ENTER,             1, 5),
> > > +	INIT_REGMAP_IRQ(AXP20X, BATT_REMOVAL,           1, 6),
> > > +	INIT_REGMAP_IRQ(AXP20X, BATT_PLUGIN,            1, 7),
> > > +
> > > +	INIT_REGMAP_IRQ(AXP288, QWBTU,                  2, 0),
> > > +	INIT_REGMAP_IRQ(AXP288, WBTU,                   2, 1),
> > > +	INIT_REGMAP_IRQ(AXP288, QWBTO,                  2, 2),
> > > +	INIT_REGMAP_IRQ(AXP288, WBTU,                   2, 3),
> > > +	INIT_REGMAP_IRQ(AXP288, QCBTU,                  2, 4),
> > > +	INIT_REGMAP_IRQ(AXP288, CBTU,                   2, 5),
> > > +	INIT_REGMAP_IRQ(AXP288, QCBTO,                  2, 6),
> > > +	INIT_REGMAP_IRQ(AXP288, CBTO,                   2, 7),
> > > +
> > > +	INIT_REGMAP_IRQ(AXP288, WL2,                    3, 0),
> > > +	INIT_REGMAP_IRQ(AXP288, WL1,                    3, 1),
> > > +	INIT_REGMAP_IRQ(AXP288, GPADC,                  3, 2),
> > > +	INIT_REGMAP_IRQ(AXP288, OT,                     3, 7),
> > > +
> > > +	INIT_REGMAP_IRQ(AXP288, GPIO0,                  4, 0),
> > > +	INIT_REGMAP_IRQ(AXP288, GPIO1,                  4, 1),
> > > +	INIT_REGMAP_IRQ(AXP288, POKO,                   4, 2),
> > > +	INIT_REGMAP_IRQ(AXP288, POKL,                   4, 3),
> > > +	INIT_REGMAP_IRQ(AXP288, POKS,                   4, 4),
> > > +	INIT_REGMAP_IRQ(AXP288, POKN,                   4, 5),
> > > +	INIT_REGMAP_IRQ(AXP288, POKP,                   4, 6),
> > > +	INIT_REGMAP_IRQ(AXP20X, TIMER,                  4, 7),
> > > +
> > > +	INIT_REGMAP_IRQ(AXP288, MV_CHNG,                5, 0),
> > > +	INIT_REGMAP_IRQ(AXP288, BC_USB_CHNG,            5, 1),
> > >  };
> > >  
> > >  static const struct of_device_id axp20x_of_match[] = {
> > > @@ -123,19 +231,26 @@ MODULE_DEVICE_TABLE(of, axp20x_of_match);
> > >  /*
> > >   * This is useless for OF-enabled devices, but it is needed by I2C
> > > subsystem */
> > > -static const struct i2c_device_id axp20x_i2c_id[] = {
> > > +static const struct i2c_device_id axp2xx_i2c_id[] = {
> > > +	{ },
> > > +};
> > > +MODULE_DEVICE_TABLE(i2c, axp2xx_i2c_id);
> > > +
> > > +static struct acpi_device_id axp2xx_acpi_match[] = {
> > > +	{
> > > +		.id = "INT33F4",
> > > +		.driver_data = (kernel_ulong_t)AXP288_ID,
> > > +	},
> > >  	{ },
> > >  };
> > > -MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
> > > +MODULE_DEVICE_TABLE(acpi, axp2xx_acpi_match);
> > >  
> > > -static const struct regmap_irq_chip axp20x_regmap_irq_chip = {
> > > -	.name			= "axp20x_irq_chip",
> > > +/* common irq chip attributes only */
> > > +static struct regmap_irq_chip axp2xx_regmap_irq_chip = {
> > > +	.name			= "axp2xx_irq_chip",
> > >  	.status_base		= AXP20X_IRQ1_STATE,
> > >  	.ack_base		= AXP20X_IRQ1_STATE,
> > >  	.mask_base		= AXP20X_IRQ1_EN,
> > > -	.num_regs		= 5,
> > > -	.irqs			= axp20x_regmap_irqs,
> > > -	.num_irqs		= ARRAY_SIZE(axp20x_regmap_irqs),
> > >  	.mask_invert		= true,
> > >  	.init_ack_masked	= true,
> > >  };
> > > @@ -161,98 +276,218 @@ static struct mfd_cell axp20x_cells[] = {
> > >  	},
> > >  };
> > >  
> > > -static struct axp20x_dev *axp20x_pm_power_off;
> > > -static void axp20x_power_off(void)
> > > +static struct resource axp288_adc_resources[] = {
> > > +	{
> > > +		.name	= "GPADC",
> > > +		.start = AXP288_IRQ_GPADC,
> > > +		.end   = AXP288_IRQ_GPADC,
> > > +		.flags = IORESOURCE_IRQ,
> > > +	},
> > > +};
> > > +
> > > +static struct resource axp288_charger_resources[] = {
> > > +	{
> > > +		.start = AXP288_IRQ_OV,
> > > +		.end   = AXP288_IRQ_OV,
> > > +		.flags = IORESOURCE_IRQ,
> > > +	},
> > > +	{
> > > +		.start = AXP288_IRQ_DONE,
> > > +		.end   = AXP288_IRQ_DONE,
> > > +		.flags = IORESOURCE_IRQ,
> > > +	},
> > > +	{
> > > +		.start = AXP288_IRQ_CHARGING,
> > > +		.end   = AXP288_IRQ_CHARGING,
> > > +		.flags = IORESOURCE_IRQ,
> > > +	},
> > > +	{
> > > +		.start = AXP288_IRQ_SAFE_QUIT,
> > > +		.end   = AXP288_IRQ_SAFE_QUIT,
> > > +		.flags = IORESOURCE_IRQ,
> > > +	},
> > > +	{
> > > +		.start = AXP288_IRQ_SAFE_ENTER,
> > > +		.end   = AXP288_IRQ_SAFE_ENTER,
> > > +		.flags = IORESOURCE_IRQ,
> > > +	},
> > > +	{
> > > +		.start = AXP288_IRQ_QCBTU,
> > > +		.end   = AXP288_IRQ_QCBTU,
> > > +		.flags = IORESOURCE_IRQ,
> > > +	},
> > > +	{
> > > +		.start = AXP288_IRQ_CBTU,
> > > +		.end   = AXP288_IRQ_CBTU,
> > > +		.flags = IORESOURCE_IRQ,
> > > +	},
> > > +	{
> > > +		.start = AXP288_IRQ_QCBTO,
> > > +		.end   = AXP288_IRQ_QCBTO,
> > > +		.flags = IORESOURCE_IRQ,
> > > +	},
> > > +	{
> > > +		.start = AXP288_IRQ_CBTO,
> > > +		.end   = AXP288_IRQ_CBTO,
> > > +		.flags = IORESOURCE_IRQ,
> > > +	},
> > > +};
> > > +
> > > +static struct mfd_cell axp288_cells[] = {
> > > +	{
> > > +		.name = "axp288_adc",
> > > +		.num_resources = ARRAY_SIZE(axp288_adc_resources),
> > > +		.resources = axp288_adc_resources,
> > > +	},
> > > +	{
> > > +		.name = "axp288_charger",
> > > +		.num_resources =
> > > ARRAY_SIZE(axp288_charger_resources),
> > > +		.resources = axp288_charger_resources,
> > > +	},
> > > +	{
> > > +		.name = "axp288_battery",
> > > +		.num_resources =
> > > ARRAY_SIZE(axp288_battery_resources),
> > > +		.resources = axp288_battery_resources,
> > > +	},
> > > +};
> > > +
> > > +static struct axp2xx_dev *axp2xx_pm_power_off;
> > > +static void axp2xx_power_off(void)
> > >  {
> > > -	regmap_write(axp20x_pm_power_off->regmap, AXP20X_OFF_CTRL,
> > > +	if (axp2xx_pm_power_off->variant == AXP288_ID)
> > > +		return;
> > > +	regmap_write(axp2xx_pm_power_off->regmap, AXP20X_OFF_CTRL,
> > >  		     AXP20X_OFF);
> > >  }
> > >  
> > > -static int axp20x_i2c_probe(struct i2c_client *i2c,
> > > -			 const struct i2c_device_id *id)
> > > +static int axp2xx_match_device(struct axp2xx_dev *axp2xx, struct
> > > device *dev) {
> > > -	struct axp20x_dev *axp20x;
> > > +	const struct acpi_device_id *acpi_id;
> > >  	const struct of_device_id *of_id;
> > > +
> > > +	of_id = of_match_device(axp2xx_of_match, dev);
> > > +	if (of_id)
> > > +		axp2xx->variant = (long) of_id->data;
> > > +	else {
> > > +		acpi_id =
> > > acpi_match_device(dev->driver->acpi_match_table, dev);
> > > +		if (!acpi_id || !acpi_id->driver_data) {
> > > +			dev_err(dev, "Unable to determine ID\n");
> > > +			return -ENODEV;
> > > +		}
> > > +		axp2xx->variant = (long) acpi_id->driver_data;
> > > +	}
> > > +	switch (axp2xx->variant) {
> > > +	case AXP202_ID:
> > > +	case AXP209_ID:
> > > +		axp2xx->nr_cells = ARRAY_SIZE(axp20x_cells);
> > > +		axp2xx->cells = axp20x_cells;
> > > +		axp2xx->regmap_cfg = &axp20x_regmap_config;
> > > +		axp2xx_regmap_irq_chip.num_regs	= 5;
> > > +		axp2xx_regmap_irq_chip.irqs = axp20x_regmap_irqs;
> > > +		axp2xx_regmap_irq_chip.num_irqs	=
> > > +			ARRAY_SIZE(axp20x_regmap_irqs);
> > > +		break;
> > > +	case AXP288_ID:
> > > +		axp2xx->cells = axp288_cells;
> > > +		axp2xx->nr_cells = ARRAY_SIZE(axp288_cells);
> > > +		axp2xx->regmap_cfg = &axp288_regmap_config;
> > > +		axp2xx_regmap_irq_chip.irqs = axp288_regmap_irqs;
> > > +		axp2xx_regmap_irq_chip.num_irqs	=
> > > +			ARRAY_SIZE(axp288_regmap_irqs);
> > > +		axp2xx_regmap_irq_chip.num_regs	= 6;
> > > +		break;
> > > +	default:
> > > +		dev_err(dev, "unsupported AXP2XX ID %lu\n",
> > > axp2xx->variant);
> > > +		return -ENODEV;
> > > +	}
> > > +	dev_info(dev, "AXP2xx variant %s found\n",
> > > +		axp2xx_model_names[axp2xx->variant]);
> > > +
> > > +	return 0;
> > > +}
> > > +
> > > +static int axp2xx_i2c_probe(struct i2c_client *i2c,
> > > +			const struct i2c_device_id *id)
> > > +{
> > > +	struct axp2xx_dev *axp2xx;
> > >  	int ret;
> > >  
> > > -	axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x),
> > > GFP_KERNEL);
> > > -	if (!axp20x)
> > > +	axp2xx = devm_kzalloc(&i2c->dev, sizeof(*axp2xx),
> > > GFP_KERNEL);
> > > +	if (!axp2xx)
> > >  		return -ENOMEM;
> > >  
> > > -	of_id = of_match_device(axp20x_of_match, &i2c->dev);
> > > -	if (!of_id) {
> > > -		dev_err(&i2c->dev, "Unable to setup AXP20X
> > > data\n");
> > > -		return -ENODEV;
> > > -	}
> > > -	axp20x->variant = (long) of_id->data;
> > > +	ret = axp2xx_match_device(axp2xx, &i2c->dev);
> > > +	if (ret)
> > > +		return ret;
> > >  
> > > -	axp20x->i2c_client = i2c;
> > > -	axp20x->dev = &i2c->dev;
> > > -	dev_set_drvdata(axp20x->dev, axp20x);
> > > +	axp2xx->i2c_client = i2c;
> > > +	axp2xx->dev = &i2c->dev;
> > > +	dev_set_drvdata(axp2xx->dev, axp2xx);
> > >  
> > > -	axp20x->regmap = devm_regmap_init_i2c(i2c,
> > > &axp20x_regmap_config);
> > > -	if (IS_ERR(axp20x->regmap)) {
> > > -		ret = PTR_ERR(axp20x->regmap);
> > > +	axp2xx->regmap = devm_regmap_init_i2c(i2c,
> > > axp2xx->regmap_cfg);
> > > +	if (IS_ERR(axp2xx->regmap)) {
> > > +		ret = PTR_ERR(axp2xx->regmap);
> > >  		dev_err(&i2c->dev, "regmap init failed: %d\n",
> > > ret); return ret;
> > >  	}
> > >  
> > > -	ret = regmap_add_irq_chip(axp20x->regmap, i2c->irq,
> > > +	ret = regmap_add_irq_chip(axp2xx->regmap, i2c->irq,
> > >  				  IRQF_ONESHOT | IRQF_SHARED, -1,
> > > -				  &axp20x_regmap_irq_chip,
> > > -				  &axp20x->regmap_irqc);
> > > +				  &axp2xx_regmap_irq_chip,
> > > +				  &axp2xx->regmap_irqc);
> > >  	if (ret) {
> > >  		dev_err(&i2c->dev, "failed to add irq chip: %d\n",
> > > ret); return ret;
> > >  	}
> > >  
> > > -	ret = mfd_add_devices(axp20x->dev, -1, axp20x_cells,
> > > -			      ARRAY_SIZE(axp20x_cells), NULL, 0,
> > > NULL);
> > > +	ret = mfd_add_devices(axp2xx->dev, -1, axp2xx->cells,
> > > +			axp2xx->nr_cells, NULL, 0, NULL);
> > >  
> > >  	if (ret) {
> > >  		dev_err(&i2c->dev, "failed to add MFD devices:
> > > %d\n", ret);
> > > -		regmap_del_irq_chip(i2c->irq, axp20x->regmap_irqc);
> > > +		regmap_del_irq_chip(i2c->irq, axp2xx->regmap_irqc);
> > >  		return ret;
> > >  	}
> > >  
> > >  	if (!pm_power_off) {
> > > -		axp20x_pm_power_off = axp20x;
> > > -		pm_power_off = axp20x_power_off;
> > > +		axp2xx_pm_power_off = axp2xx;
> > > +		pm_power_off = axp2xx_power_off;
> > >  	}
> > >  
> > > -	dev_info(&i2c->dev, "AXP20X driver loaded\n");
> > > +	dev_info(&i2c->dev, "AXP2XX driver loaded\n");
> > >  
> > >  	return 0;
> > >  }
> > >  
> > > -static int axp20x_i2c_remove(struct i2c_client *i2c)
> > > +static int axp2xx_i2c_remove(struct i2c_client *i2c)
> > >  {
> > > -	struct axp20x_dev *axp20x = i2c_get_clientdata(i2c);
> > > +	struct axp2xx_dev *axp2xx = i2c_get_clientdata(i2c);
> > >  
> > > -	if (axp20x == axp20x_pm_power_off) {
> > > -		axp20x_pm_power_off = NULL;
> > > +	if (axp2xx == axp2xx_pm_power_off) {
> > > +		axp2xx_pm_power_off = NULL;
> > >  		pm_power_off = NULL;
> > >  	}
> > >  
> > > -	mfd_remove_devices(axp20x->dev);
> > > -	regmap_del_irq_chip(axp20x->i2c_client->irq,
> > > axp20x->regmap_irqc);
> > > +	mfd_remove_devices(axp2xx->dev);
> > > +	regmap_del_irq_chip(axp2xx->i2c_client->irq,
> > > axp2xx->regmap_irqc); 
> > >  	return 0;
> > >  }
> > >  
> > > -static struct i2c_driver axp20x_i2c_driver = {
> > > +static struct i2c_driver axp2xx_i2c_driver = {
> > >  	.driver = {
> > > -		.name	= "axp20x",
> > > +		.name	= "axp2xx",
> > >  		.owner	= THIS_MODULE,
> > > -		.of_match_table	=
> > > of_match_ptr(axp20x_of_match),
> > > +		.of_match_table	=
> > > of_match_ptr(axp2xx_of_match),
> > > +		.acpi_match_table = ACPI_PTR(axp2xx_acpi_match),
> > >  	},
> > > -	.probe		= axp20x_i2c_probe,
> > > -	.remove		= axp20x_i2c_remove,
> > > -	.id_table	= axp20x_i2c_id,
> > > +	.probe		= axp2xx_i2c_probe,
> > > +	.remove		= axp2xx_i2c_remove,
> > > +	.id_table	= axp2xx_i2c_id,
> > >  };
> > >  
> > > -module_i2c_driver(axp20x_i2c_driver);
> > > +module_i2c_driver(axp2xx_i2c_driver);
> > >  
> > > -MODULE_DESCRIPTION("PMIC MFD core driver for AXP20X");
> > > +MODULE_DESCRIPTION("PMIC MFD core driver for AXP2XX");
> > >  MODULE_AUTHOR("Carlo Caione <carlo@caione.org>");
> > >  MODULE_LICENSE("GPL");
> > > diff --git a/include/linux/mfd/axp2xx.h b/include/linux/mfd/axp2xx.h
> > > index a36d91b..331cf6e 100644
> > > --- a/include/linux/mfd/axp2xx.h
> > > +++ b/include/linux/mfd/axp2xx.h
> > > @@ -14,6 +14,8 @@
> > >  enum {
> > >  	AXP202_ID = 0,
> > >  	AXP209_ID,
> > > +	AXP288_ID,
> > > +	NR_AXP2XX_VARIANTS,
> > >  };
> > >  
> > >  #define AXP20X_DATACACHE(m)		(0x04 + (m))
> > > @@ -49,11 +51,13 @@ enum {
> > >  #define AXP20X_IRQ3_EN			0x42
> > >  #define AXP20X_IRQ4_EN			0x43
> > >  #define AXP20X_IRQ5_EN			0x44
> > > +#define AXP20X_IRQ6_EN			0x45
> > >  #define AXP20X_IRQ1_STATE		0x48
> > >  #define AXP20X_IRQ2_STATE		0x49
> > >  #define AXP20X_IRQ3_STATE		0x4a
> > >  #define AXP20X_IRQ4_STATE		0x4b
> > >  #define AXP20X_IRQ5_STATE		0x4c
> > > +#define AXP20X_IRQ6_STATE		0x4d
> > >  
> > >  /* ADC */
> > >  #define AXP20X_ACIN_V_ADC_H		0x56
> > > @@ -116,6 +120,15 @@ enum {
> > >  #define AXP20X_CC_CTRL			0xb8
> > >  #define AXP20X_FG_RES			0xb9
> > >  
> > > +/* AXP288 specific registers */
> > > +#define AXP288_PMIC_ADC_H               0x56
> > > +#define AXP288_PMIC_ADC_L               0x57
> > > +#define AXP288_ADC_TS_PIN_CTRL          0x84
> > > +
> > > +#define AXP288_PMIC_ADC_EN              0x84
> > > +#define AXP288_FG_TUNE5			0xed
> > > +
> > > +
> > >  /* Regulators IDs */
> > >  enum {
> > >  	AXP20X_LDO1 = 0,
> > > @@ -169,12 +182,57 @@ enum {
> > >  	AXP20X_IRQ_GPIO0_INPUT,
> > >  };
> > >  
> > > -struct axp20x_dev {
> > > +enum axp288_irqs {
> > > +	AXP288_IRQ_VBUS_FALL     = 2,
> > > +	AXP288_IRQ_VBUS_RISE,
> > > +	AXP288_IRQ_OV,
> > > +	AXP288_IRQ_FALLING_ALT,
> > > +	AXP288_IRQ_RISING_ALT,
> > > +	AXP288_IRQ_OV_ALT,
> > > +	AXP288_IRQ_DONE          = 10,
> > > +	AXP288_IRQ_CHARGING,
> > > +	AXP288_IRQ_SAFE_QUIT,
> > > +	AXP288_IRQ_SAFE_ENTER,
> > > +	AXP288_IRQ_ABSENT,
> > > +	AXP288_IRQ_APPEND,
> > > +	AXP288_IRQ_QWBTU,
> > > +	AXP288_IRQ_WBTU,
> > > +	AXP288_IRQ_QWBTO,
> > > +	AXP288_IRQ_WBTO,
> > > +	AXP288_IRQ_QCBTU,
> > > +	AXP288_IRQ_CBTU,
> > > +	AXP288_IRQ_QCBTO,
> > > +	AXP288_IRQ_CBTO,
> > > +	AXP288_IRQ_WL2,
> > > +	AXP288_IRQ_WL1,
> > > +	AXP288_IRQ_GPADC,
> > > +	AXP288_IRQ_OT            = 31,
> > > +	AXP288_IRQ_GPIO0,
> > > +	AXP288_IRQ_GPIO1,
> > > +	AXP288_IRQ_POKO,
> > > +	AXP288_IRQ_POKL,
> > > +	AXP288_IRQ_POKS,
> > > +	AXP288_IRQ_POKN,
> > > +	AXP288_IRQ_POKP,
> > > +	AXP288_IRQ_TIMER,
> > > +	AXP288_IRQ_MV_CHNG,
> > > +	AXP288_IRQ_BC_USB_CHNG,
> > > +};
> > > +
> > > +#define AXP288_TS_ADC_H		0x58
> > > +#define AXP288_TS_ADC_L		0x59
> > > +#define AXP288_GP_ADC_H		0x5a
> > > +#define AXP288_GP_ADC_L		0x5b
> > > +
> > > +struct axp2xx_dev {
> > >  	struct device			*dev;
> > >  	struct i2c_client		*i2c_client;
> > >  	struct regmap			*regmap;
> > >  	struct regmap_irq_chip_data	*regmap_irqc;
> > >  	long				variant;
> > > +	int                             nr_cells;
> > > +	struct mfd_cell                 *cells;
> > > +	struct regmap_config            *regmap_cfg;
> > >  };
> > >  
> > >  #endif /* __LINUX_MFD_AXP2XX_H */
> > 
> 
> [Jacob Pan]

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

[PATCH v3 3/5] regulator/axp20x: use axp2xx consolidated header

[Jacob Pan]

AXP20x driver has been extended to support axp288 variant. Header file
and common data structures has also been renamed to suit the new
scope of devices supported.

This patch makes use of the renamed header and structure.

Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
---
 drivers/regulator/axp20x-regulator.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c
index 004aadb..c9b6803 100644
--- a/drivers/regulator/axp20x-regulator.c
+++ b/drivers/regulator/axp20x-regulator.c
@@ -20,7 +20,7 @@
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
-#include <linux/mfd/axp20x.h>
+#include <linux/mfd/axp2xx.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/of_regulator.h>
 
@@ -161,7 +161,7 @@ static struct of_regulator_match axp20x_matches[] = {
 
 static int axp20x_set_dcdc_freq(struct platform_device *pdev, u32 dcdcfreq)
 {
-	struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
+	struct axp2xx_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
 
 	if (dcdcfreq < 750) {
 		dcdcfreq = 750;
@@ -232,7 +232,7 @@ static int axp20x_set_dcdc_workmode(struct regulator_dev *rdev, int id, u32 work
 static int axp20x_regulator_probe(struct platform_device *pdev)
 {
 	struct regulator_dev *rdev;
-	struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
+	struct axp2xx_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
 	struct regulator_config config = { };
 	struct regulator_init_data *init_data;
 	int ret, i;
-- 
1.9.1

Re: [PATCH v3 3/5] regulator/axp20x: use axp2xx consolidated header

[Jonathan Cameron]

On 12/09/14 00:15, Jacob Pan wrote:
> AXP20x driver has been extended to support axp288 variant. Header file
> and common data structures has also been renamed to suit the new
> scope of devices supported.
> 
> This patch makes use of the renamed header and structure.
> 
> Acked-by: Mark Brown <broonie@kernel.org>
> Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
> ---
>  drivers/regulator/axp20x-regulator.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c
> index 004aadb..c9b6803 100644
> --- a/drivers/regulator/axp20x-regulator.c
> +++ b/drivers/regulator/axp20x-regulator.c
> @@ -20,7 +20,7 @@
>  #include <linux/of_device.h>
>  #include <linux/platform_device.h>
>  #include <linux/regmap.h>
> -#include <linux/mfd/axp20x.h>
> +#include <linux/mfd/axp2xx.h>
Err, doesn't this break bisection.  Rename 'must' be done in one go, not
split across patches.
>  #include <linux/regulator/driver.h>
>  #include <linux/regulator/of_regulator.h>
>  
> @@ -161,7 +161,7 @@ static struct of_regulator_match axp20x_matches[] = {
>  
>  static int axp20x_set_dcdc_freq(struct platform_device *pdev, u32 dcdcfreq)
>  {
> -	struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
> +	struct axp2xx_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
>  
>  	if (dcdcfreq < 750) {
>  		dcdcfreq = 750;
> @@ -232,7 +232,7 @@ static int axp20x_set_dcdc_workmode(struct regulator_dev *rdev, int id, u32 work
>  static int axp20x_regulator_probe(struct platform_device *pdev)
>  {
>  	struct regulator_dev *rdev;
> -	struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
> +	struct axp2xx_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
>  	struct regulator_config config = { };
>  	struct regulator_init_data *init_data;
>  	int ret, i;
> 

[PATCH v3 4/5] iio/adc/axp288: add support for axp288 gpadc

[Jacob Pan]

Platform driver for XPowers AXP288 ADC, which is a sub-device of the
customized PMIC for Intel Baytrail-CR platforms. GPADC device enumerates
as one of the MFD cell devices. It uses IIO infrastructure to communicate
with userspace and consumer drivers.

Usages of ADC channels include battery charging and thermal sensors.

Based on initial work by:
Ramakrishna Pallala <ramakrishna.pallala@intel.com>

Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
---
 drivers/iio/adc/Kconfig        |   8 ++
 drivers/iio/adc/Makefile       |   1 +
 drivers/iio/adc/axp288_gpadc.c | 238 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 247 insertions(+)
 create mode 100644 drivers/iio/adc/axp288_gpadc.c

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 11b048a..d02a08e 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -127,6 +127,14 @@ config AT91_ADC
 	help
 	  Say yes here to build support for Atmel AT91 ADC.
 
+config AXP288_GPADC
+	tristate "X-Power AXP288 GPADC driver"
+	depends on MFD_AXP2XX
+	help
+	  Say yes here to have support for X-Power 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)
diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile
index ad81b51..8bf0104 100644
--- a/drivers/iio/adc/Makefile
+++ b/drivers/iio/adc/Makefile
@@ -30,3 +30,4 @@ obj-$(CONFIG_VF610_ADC) += vf610_adc.o
 obj-$(CONFIG_VIPERBOARD_ADC) += viperboard_adc.o
 xilinx-xadc-y := xilinx-xadc-core.o xilinx-xadc-events.o
 obj-$(CONFIG_XILINX_XADC) += xilinx-xadc.o
+obj-$(CONFIG_AXP288_GPADC) += axp288_gpadc.o
diff --git a/drivers/iio/adc/axp288_gpadc.c b/drivers/iio/adc/axp288_gpadc.c
new file mode 100644
index 0000000..aaa24b0
--- /dev/null
+++ b/drivers/iio/adc/axp288_gpadc.c
@@ -0,0 +1,238 @@
+/*
+ * axp288_gpadc.c - Xpower AXP288 PMIC GPADC Driver
+ *
+ * Copyright (C) 2014 Intel Corporation
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the GNU
+ * General Public License for more details.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/device.h>
+#include <linux/regmap.h>
+#include <linux/mfd/axp2xx.h>
+#include <linux/platform_device.h>
+
+#include <linux/iio/iio.h>
+#include <linux/iio/machine.h>
+#include <linux/iio/driver.h>
+
+#define AXP288_ADC_EN_MASK		       0xF1
+#define AXP288_ADC_TS_PIN_GPADC                0xF2
+#define AXP288_ADC_TS_PIN_ON                   0xF3
+
+enum axp288_adc_id {
+	AXP288_ADC_TS,
+	AXP288_ADC_PMIC,
+	AXP288_ADC_GP,
+	AXP288_ADC_BATT_CHRG_I,
+	AXP288_ADC_BATT_DISCHRG_I,
+	AXP288_ADC_BATT_V,
+	AXP288_ADC_NR_CHAN,
+};
+
+static const int axp288_scale[AXP288_ADC_NR_CHAN] = {
+	[AXP288_ADC_BATT_CHRG_I] = 1,
+	[AXP288_ADC_BATT_DISCHRG_I] = 1,
+	[AXP288_ADC_BATT_V] = 1,
+};
+
+struct gpadc_info {
+	int irq;
+	struct device *dev;
+	struct regmap *regmap;
+};
+
+#define ADC_CHANNEL(_type, _channel, _address, _info_mask)		\
+	{								\
+		.indexed = 1,						\
+		.type = _type,						\
+		.channel = _channel,					\
+		.address = _address,					\
+		.datasheet_name = "CH"#_channel,			\
+		.info_mask_separate = _info_mask,		        \
+	}
+
+static const struct iio_chan_spec const axp288_adc_channels[] = {
+	ADC_CHANNEL(IIO_TEMP, 0, AXP288_TS_ADC_H, 0),
+	ADC_CHANNEL(IIO_TEMP, 1, AXP288_PMIC_ADC_H, 0),
+	ADC_CHANNEL(IIO_TEMP, 2, AXP288_GP_ADC_H, 0),
+	ADC_CHANNEL(IIO_CURRENT, 3, AXP20X_BATT_CHRG_I_H,
+		(BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE))),
+	ADC_CHANNEL(IIO_CURRENT, 4, AXP20X_BATT_DISCHRG_I_H,
+		(BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE))),
+	ADC_CHANNEL(IIO_VOLTAGE, 5, AXP20X_BATT_V_H,
+		(BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE))),
+};
+
+#define ADC_MAP(_adc_channel_label,				\
+		     _consumer_dev_name,			\
+		     _consumer_channel)				\
+	{							\
+		.adc_channel_label = _adc_channel_label,	\
+		.consumer_dev_name = _consumer_dev_name,	\
+		.consumer_channel = _consumer_channel,		\
+	}
+
+/* for consumer drivers */
+static struct iio_map axp288_iio_default_maps[] = {
+	ADC_MAP("TS_PIN", "axp288-batt", "axp288-batt-temp"),
+	ADC_MAP("PMIC_TEMP", "axp288-pmic", "axp288-pmic-temp"),
+	ADC_MAP("GPADC", "axp288-gpadc", "axp288-system-temp"),
+	ADC_MAP("BATT_CHG_I", "axp288-chrg", "axp288-chrg-curr"),
+	ADC_MAP("BATT_DISCHRG_I", "axp288-chrg", "axp288-chrg-d-curr"),
+	ADC_MAP("BATT_V", "axp288-batt", "axp288-batt-volt"),
+	{},
+};
+
+static int axp288_adc_read_raw(struct iio_dev *indio_dev,
+			struct iio_chan_spec const *chan,
+			int *val, int *val2, long mask)
+{
+	int ret;
+	struct gpadc_info *info = iio_priv(indio_dev);
+	unsigned int th, tl;
+
+	mutex_lock(&indio_dev->mlock);
+
+	switch (mask) {
+	case IIO_CHAN_INFO_RAW:
+		/* special case for GPADC sample */
+		if (chan->address == AXP288_GP_ADC_H)
+			regmap_write(info->regmap, AXP288_ADC_TS_PIN_CTRL,
+				AXP288_ADC_TS_PIN_GPADC);
+		ret = regmap_read(info->regmap, chan->address, &th);
+		if (ret) {
+			dev_err(&indio_dev->dev, "sample raw data high failed\n");
+			break;
+		}
+		ret = regmap_read(info->regmap, chan->address + 1, &tl);
+		if (ret) {
+			dev_err(&indio_dev->dev, "sample raw data low failed\n");
+			break;
+		}
+
+		*val = (th << 4) + ((tl >> 4) & 0x0F);
+		ret = IIO_VAL_INT;
+		break;
+	case IIO_CHAN_INFO_SCALE:
+		*val = axp288_scale[chan->channel];
+		ret = IIO_VAL_INT_PLUS_MICRO;
+		break;
+	default:
+		ret = -EINVAL;
+	}
+
+	if (IIO_CHAN_INFO_RAW && chan->address == AXP288_GP_ADC_H)
+		regmap_write(info->regmap, AXP288_ADC_TS_PIN_CTRL,
+			AXP288_ADC_TS_PIN_ON);
+
+	mutex_unlock(&indio_dev->mlock);
+
+	return ret;
+}
+
+static int axp288_gpadc_enable(struct regmap *regmap, bool enable)
+{
+	unsigned int pin_on, adc_en;
+
+	if (enable) {
+		pin_on = AXP288_ADC_TS_PIN_ON;
+		adc_en = AXP288_ADC_EN_MASK;
+	} else {
+		pin_on = ~AXP288_ADC_TS_PIN_ON;
+		adc_en = ~AXP288_ADC_EN_MASK;
+	}
+	if (regmap_write(regmap, AXP288_ADC_TS_PIN_CTRL, pin_on))
+		return -EIO;
+
+	return regmap_write(regmap, AXP20X_ADC_EN1, ~AXP288_ADC_EN_MASK);
+}
+
+static const struct iio_info axp288_iio_info = {
+	.read_raw = &axp288_adc_read_raw,
+	.driver_module = THIS_MODULE,
+};
+
+static int axp288_gpadc_probe(struct platform_device *pdev)
+{
+	int err;
+	struct gpadc_info *info;
+	struct iio_dev *indio_dev;
+	struct axp2xx_dev *axp2xx = dev_get_drvdata(pdev->dev.parent);
+	int irq;
+
+	indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*info));
+	if (!indio_dev)
+		return -ENOMEM;
+
+	info = iio_priv(indio_dev);
+	irq = platform_get_irq(pdev, 0);
+	if (irq < 0) {
+		dev_err(&pdev->dev, "no irq resource?\n");
+		return irq;
+	}
+	info->irq = irq;
+	platform_set_drvdata(pdev, indio_dev);
+	info->regmap = axp2xx->regmap;
+	axp288_gpadc_enable(axp2xx->regmap, true);
+
+	indio_dev->dev.parent = &pdev->dev;
+	indio_dev->name = pdev->name;
+	indio_dev->channels = axp288_adc_channels;
+	indio_dev->num_channels = ARRAY_SIZE(axp288_adc_channels);
+	indio_dev->info = &axp288_iio_info;
+	indio_dev->modes = INDIO_DIRECT_MODE;
+	/* REVISIT: override default map with platform data */
+	err = iio_map_array_register(indio_dev, axp288_iio_default_maps);
+	if (err)
+		goto err_disable_dev;
+
+	err = iio_device_register(indio_dev);
+	if (err < 0) {
+		dev_err(&pdev->dev, "unable to register iio device\n");
+		goto err_array_unregister;
+	}
+	return 0;
+
+err_array_unregister:
+	iio_map_array_unregister(indio_dev);
+err_disable_dev:
+	axp288_gpadc_enable(axp2xx->regmap, false);
+	return err;
+}
+
+static int axp288_gpadc_remove(struct platform_device *pdev)
+{
+	struct iio_dev *indio_dev = platform_get_drvdata(pdev);
+
+	iio_device_unregister(indio_dev);
+	iio_map_array_unregister(indio_dev);
+
+	return 0;
+}
+
+static struct platform_driver axp288_gpadc_driver = {
+	.probe = axp288_gpadc_probe,
+	.remove = axp288_gpadc_remove,
+	.driver = {
+		.name = "axp288_adc",
+		.owner = THIS_MODULE,
+	},
+};
+
+module_platform_driver(axp288_gpadc_driver);
+
+MODULE_AUTHOR("Jacob Pan <jacob.jun.pan@linux.intel.com>");
+MODULE_DESCRIPTION("Dollar Cove Xpower AXP288 General Purpose ADC Driver");
+MODULE_LICENSE("GPL");
-- 
1.9.1

[PATCH v3 5/5] iio: add documentation for current attribute

[Jacob Pan]

Add documentation for input current raw reading and scale.

Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
---
 Documentation/ABI/testing/sysfs-bus-iio | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
index d760b02..3c76bd8 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio
+++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -1028,3 +1028,11 @@ Contact:	linux-iio@vger.kernel.org
 Description:
 		Raw value of rotation from true/magnetic north measured with
 		or without compensation from tilt sensors.
+
+What:		/sys/bus/iio/devices/iio:deviceX/in_currentX_raw
+What:		/sys/bus/iio/devices/iio:deviceX/in_currentX_scale
+KernelVersion:	3.18
+Contact:	linux-iio@vger.kernel.org
+Description:
+		Raw current measurement from channel X. Units after application of
+		scale and offset are milliamps.
-- 
1.9.1

Re: [PATCH v3 5/5] iio: add documentation for current attribute

[Jonathan Cameron]

On 12/09/14 00:15, Jacob Pan wrote:
> Add documentation for input current raw reading and scale.
> 
> Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
The content is fine, but please look at how the other types are handled.
The raw attribute is described along with the units etc in it's own
section, but the _scale attribute just gets lumped in with the equivalent
for all the other channel types.

Thanks,

Jonathan
> ---
>  Documentation/ABI/testing/sysfs-bus-iio | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
> index d760b02..3c76bd8 100644
> --- a/Documentation/ABI/testing/sysfs-bus-iio
> +++ b/Documentation/ABI/testing/sysfs-bus-iio
> @@ -1028,3 +1028,11 @@ Contact:	linux-iio@vger.kernel.org
>  Description:
>  		Raw value of rotation from true/magnetic north measured with
>  		or without compensation from tilt sensors.
> +
> +What:		/sys/bus/iio/devices/iio:deviceX/in_currentX_raw
> +What:		/sys/bus/iio/devices/iio:deviceX/in_currentX_scale
> +KernelVersion:	3.18
> +Contact:	linux-iio@vger.kernel.org
> +Description:
> +		Raw current measurement from channel X. Units after application of
> +		scale and offset are milliamps.
> 

Re: [PATCH v3 5/5] iio: add documentation for current attribute

[Hartmut Knaack]

Jonathan Cameron schrieb, Am 13.09.2014 21:55:
> On 12/09/14 00:15, Jacob Pan wrote:
>> Add documentation for input current raw reading and scale.
>>
>> Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
> The content is fine, but please look at how the other types are handled.
> The raw attribute is described along with the units etc in it's own
> section, but the _scale attribute just gets lumped in with the equivalent
> for all the other channel types.
> 
> Thanks,
> 
> Jonathan
>> ---
>>  Documentation/ABI/testing/sysfs-bus-iio | 8 ++++++++
>>  1 file changed, 8 insertions(+)
>>
>> diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
>> index d760b02..3c76bd8 100644
>> --- a/Documentation/ABI/testing/sysfs-bus-iio
>> +++ b/Documentation/ABI/testing/sysfs-bus-iio
>> @@ -1028,3 +1028,11 @@ Contact:	linux-iio@vger.kernel.org
>>  Description:
>>  		Raw value of rotation from true/magnetic north measured with
>>  		or without compensation from tilt sensors.
>> +
>> +What:		/sys/bus/iio/devices/iio:deviceX/in_currentX_raw
>> +What:		/sys/bus/iio/devices/iio:deviceX/in_currentX_scale
>> +KernelVersion:	3.18
>> +Contact:	linux-iio@vger.kernel.org
>> +Description:
>> +		Raw current measurement from channel X. Units after application of
>> +		scale and offset are milliamps.
Where is the offset?
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH v3 5/5] iio: add documentation for current attribute

[Jacob Pan]

On Sun, 14 Sep 2014 15:13:48 +0200
Hartmut Knaack <knaack.h@gmx.de> wrote:

> Where is the offset?
there is no offset. thanks for pointing this out.

Re: [PATCH v3 0/5] Initial support for XPowers AXP288 PMIC

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 1176 bytes --]

On Thu, Sep 11, 2014 at 04:15:52PM -0700, Jacob Pan wrote:
> XPowers AXP288 is a customized PMIC found on some Intel Baytrail-CR platforms.
> It comes with sub-functions such as USB charging, fuel gauge, ADC, and many LDO
> and BUCK channels.
> 
> By extending the existing AXP20x driver, this patchset adds basic support
> for AXP288 PMIC with GPADC as one MFD cell device driver. It also adds hooks
> for ACPI opregion handler driver which can be used to handle ACPI requests.
> 
> Currently, the PMIC driver in this patchset does not support platform data
> enumeration. But when ACPI _DSD and unified device properties become available,
> cell devices with platform data will be added.
> 
> This patch does not use intel_soc_pmic core for i2c and regmap handling in that
> axp288 shares similar programming interface with other Xpower PMICs supported in
> axp20x.c. Therefore, extending axp20x.c to include axp288 makes more sense.
> 
> Changes
>  v3:	- put all file rename changes in 1/5

The variables renaming are still not in 1/5....

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH v3 0/5] Initial support for XPowers AXP288 PMIC

[Jacob Pan]

On Fri, 12 Sep 2014 17:18:24 +0200
Maxime Ripard <maxime.ripard@free-electrons.com> wrote:

> On Thu, Sep 11, 2014 at 04:15:52PM -0700, Jacob Pan wrote:
> > XPowers AXP288 is a customized PMIC found on some Intel Baytrail-CR
> > platforms. It comes with sub-functions such as USB charging, fuel
> > gauge, ADC, and many LDO and BUCK channels.
> > 
> > By extending the existing AXP20x driver, this patchset adds basic
> > support for AXP288 PMIC with GPADC as one MFD cell device driver.
> > It also adds hooks for ACPI opregion handler driver which can be
> > used to handle ACPI requests.
> > 
> > Currently, the PMIC driver in this patchset does not support
> > platform data enumeration. But when ACPI _DSD and unified device
> > properties become available, cell devices with platform data will
> > be added.
> > 
> > This patch does not use intel_soc_pmic core for i2c and regmap
> > handling in that axp288 shares similar programming interface with
> > other Xpower PMICs supported in axp20x.c. Therefore, extending
> > axp20x.c to include axp288 makes more sense.
> > 
> > Changes
> >  v3:	- put all file rename changes in 1/5
> 
> The variables renaming are still not in 1/5....
> 
1/5 is for file rename such that the follow up patches are more
readable. There are so many details in variable rename, I think it
belongs to the patch that expands the new device support.

Re: [PATCH v3 0/5] Initial support for XPowers AXP288 PMIC

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 1971 bytes --]

On Fri, Sep 12, 2014 at 12:36:45PM -0700, Jacob Pan wrote:
> On Fri, 12 Sep 2014 17:18:24 +0200
> Maxime Ripard <maxime.ripard@free-electrons.com> wrote:
> 
> > On Thu, Sep 11, 2014 at 04:15:52PM -0700, Jacob Pan wrote:
> > > XPowers AXP288 is a customized PMIC found on some Intel Baytrail-CR
> > > platforms. It comes with sub-functions such as USB charging, fuel
> > > gauge, ADC, and many LDO and BUCK channels.
> > > 
> > > By extending the existing AXP20x driver, this patchset adds basic
> > > support for AXP288 PMIC with GPADC as one MFD cell device driver.
> > > It also adds hooks for ACPI opregion handler driver which can be
> > > used to handle ACPI requests.
> > > 
> > > Currently, the PMIC driver in this patchset does not support
> > > platform data enumeration. But when ACPI _DSD and unified device
> > > properties become available, cell devices with platform data will
> > > be added.
> > > 
> > > This patch does not use intel_soc_pmic core for i2c and regmap
> > > handling in that axp288 shares similar programming interface with
> > > other Xpower PMICs supported in axp20x.c. Therefore, extending
> > > axp20x.c to include axp288 makes more sense.
> > > 
> > > Changes
> > >  v3:	- put all file rename changes in 1/5
> > 
> > The variables renaming are still not in 1/5....
> > 
> 1/5 is for file rename such that the follow up patches are more
> readable.

Which is exactly my point. So why don't you apply it to the variable
renames as well?

> There are so many details in variable rename, I think it
> belongs to the patch that expands the new device support.

This has nothing to do in this patch. Remember that one patch should
do one thing. You're obviously doing 2 in the second patch, and just
like you pointed out, the renaming just make the whole thing less
readable.

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]