From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932194AbaIIHkK (ORCPT ); Tue, 9 Sep 2014 03:40:10 -0400 Received: from top.free-electrons.com ([176.31.233.9]:54583 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932079AbaIIHkG (ORCPT ); Tue, 9 Sep 2014 03:40:06 -0400 Date: Tue, 9 Sep 2014 09:37:47 +0200 From: Maxime Ripard To: Jacob Pan Cc: IIO , LKML , DEVICE TREE , Lee Jones , Srinivas Pandruvada , Aaron Lu , Alan Cox , Jean Delvare , Samuel Ortiz , Liam Girdwood , Mark Brown , Grant Likely , Greg Kroah-Hartman , Rob Herring , Lars-Peter Clausen , Hartmut Knaack , Fugang Duan , Arnd Bergmann , Zubair Lutfullah , Sebastian Reichel , Johannes Thumshirn , Philippe Reynes , Angelo Compagnucci , Doug Anderson Subject: Re: [PATCH 2/4] mfd/axp2xx: extend axp20x to support axp288 pmic Message-ID: <20140909073747.GI3804@lukather> References: <1410215046-31751-1-git-send-email-jacob.jun.pan@linux.intel.com> <1410215046-31751-3-git-send-email-jacob.jun.pan@linux.intel.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="jaTU8Y2VLE5tlY1O" Content-Disposition: inline In-Reply-To: <1410215046-31751-3-git-send-email-jacob.jun.pan@linux.intel.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --jaTU8Y2VLE5tlY1O Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Jacob, I think it would have been nice to have CC'd Carlo Caione, the original writer of the driver on this. On Mon, Sep 08, 2014 at 03:24:04PM -0700, Jacob Pan wrote: > XPower AXP288 is a customized PMIC for Intel Baytrail-CR platforms. Simil= ar > 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. >=20 > In addition to feature extension, this patch also adds ACPI binding for > enumeration and hooks for ACPI custom operational region handlers. >=20 > Files and common data structures have been renamed from axp20x to axp2xx > in order to suit the extended scope of devices. >=20 > This consolidated driver should support more Xpower PMICs in both device > tree and ACPI based platforms. >=20 > Signed-off-by: Jacob Pan > --- > drivers/mfd/axp2xx.c | 424 +++++++++++++++++++++++++++++++++++----= ------ > include/linux/mfd/axp2xx.h | 57 +++++- > 2 files changed, 389 insertions(+), 92 deletions(-) >=20 > diff --git a/drivers/mfd/axp2xx.c b/drivers/mfd/axp2xx.c > index c534443..cf7ed16 100644 > --- a/drivers/mfd/axp2xx.c > +++ b/drivers/mfd/axp2xx.c > @@ -1,10 +1,14 @@ > /* > - * axp20x.c - MFD core driver for the X-Powers AXP202 and AXP209 > + * axp2xx.c - MFD core driver for the X-Powers AXP202, AXP209, and AXP288 Could you do the s/axp20x/axp2xx/ in the first patch? It would make more sense to have it there, and reduce the "noise" in this patch. > * > * AXP20x comprises an adaptive USB-Compatible PWM charger, 2 BUCK DC-DC > * converters, 5 LDOs, multiple 12-bit ADCs of voltage, current and temp= erature > * as well as 4 configurable GPIOs. > * > + * AXP288 is a customized PMIC for Intel Baytrail CR platform. Similar t= o AXP20x > + * it comes with USB charger, more LDO, BUCK channels, and status report= ing > + * capabilities. > + * Also, I'm not very convinced that maintaining the list of the supported AXP chips is very future proof. We have at least 3 other variants that we know of to support (AXP221, AXP223 and AXP806/809). This would end up in a huge list :) > * Author: Carlo Caione > * > * This program is free software; you can redistribute it and/or modify > @@ -25,9 +29,14 @@ > #include > #include > #include > +#include > =20 > #define AXP20X_OFF 0x80 > =20 > +static struct mfd_cell *axp2xx_cells; > +static int axp2xx_nr_cells; > +static struct regmap_config *regmap_cfg; > + > static const struct regmap_range axp20x_writeable_ranges[] =3D { > regmap_reg_range(AXP20X_DATACACHE(0), AXP20X_IRQ5_STATE), > regmap_reg_range(AXP20X_DCDC_MODE, AXP20X_FG_RES), > @@ -47,6 +56,25 @@ static const struct regmap_access_table axp20x_volatil= e_table =3D { > .n_yes_ranges =3D ARRAY_SIZE(axp20x_volatile_ranges), > }; > =20 > +static const struct regmap_range axp288_writeable_ranges[] =3D { > + 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[] =3D { > + regmap_reg_range(AXP20X_IRQ1_EN, AXP20X_IPSOUT_V_HIGH_L), > +}; > + > +static const struct regmap_access_table axp288_writeable_table =3D { > + .yes_ranges =3D axp288_writeable_ranges, > + .n_yes_ranges =3D ARRAY_SIZE(axp288_writeable_ranges), > +}; > + > +static const struct regmap_access_table axp288_volatile_table =3D { > + .yes_ranges =3D axp288_volatile_ranges, > + .n_yes_ranges =3D ARRAY_SIZE(axp288_volatile_ranges), > +}; > + > static struct resource axp20x_pek_resources[] =3D { > { > .name =3D "PEK_DBR", > @@ -61,7 +89,40 @@ static struct resource axp20x_pek_resources[] =3D { > }, > }; > =20 > -static const struct regmap_config axp20x_regmap_config =3D { > +static struct resource axp288_battery_resources[] =3D { > + { > + .start =3D AXP288_IRQ_QWBTU, > + .end =3D AXP288_IRQ_QWBTU, > + .flags =3D IORESOURCE_IRQ, > + }, > + { > + .start =3D AXP288_IRQ_WBTU, > + .end =3D AXP288_IRQ_WBTU, > + .flags =3D IORESOURCE_IRQ, > + }, > + { > + .start =3D AXP288_IRQ_QWBTO, > + .end =3D AXP288_IRQ_QWBTO, > + .flags =3D IORESOURCE_IRQ, > + }, > + { > + .start =3D AXP288_IRQ_WBTO, > + .end =3D AXP288_IRQ_WBTO, > + .flags =3D IORESOURCE_IRQ, > + }, > + { > + .start =3D AXP288_IRQ_WL2, > + .end =3D AXP288_IRQ_WL2, > + .flags =3D IORESOURCE_IRQ, > + }, > + { > + .start =3D AXP288_IRQ_WL1, > + .end =3D AXP288_IRQ_WL1, > + .flags =3D IORESOURCE_IRQ, > + }, > +}; > + > +static struct regmap_config axp20x_regmap_config =3D { > .reg_bits =3D 8, > .val_bits =3D 8, > .wr_table =3D &axp20x_writeable_table, > @@ -70,47 +131,96 @@ static const struct regmap_config axp20x_regmap_conf= ig =3D { > .cache_type =3D REGCACHE_RBTREE, > }; > =20 > -#define AXP20X_IRQ(_irq, _off, _mask) \ > - [AXP20X_IRQ_##_irq] =3D { .reg_offset =3D (_off), .mask =3D BIT(_mask) } > +static struct regmap_config axp288_regmap_config =3D { > + .reg_bits =3D 8, > + .val_bits =3D 8, > + .wr_table =3D &axp288_writeable_table, > + .volatile_table =3D &axp288_volatile_table, > + .max_register =3D AXP288_FG_TUNE5, > + .cache_type =3D REGCACHE_RBTREE, > +}; > + > +#define INIT_REGMAP_IRQ(_variant, _irq, _off, _mask) \ > + [_variant##_IRQ_##_irq] =3D { .reg_offset =3D (_off), .mask =3D BIT(_ma= sk) } > =20 > static const struct regmap_irq axp20x_regmap_irqs[] =3D { > - 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[] =3D { > + 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), > }; > =20 > static const struct of_device_id axp20x_of_match[] =3D { > @@ -123,19 +233,26 @@ MODULE_DEVICE_TABLE(of, axp20x_of_match); > /* > * This is useless for OF-enabled devices, but it is needed by I2C subsy= stem > */ > -static const struct i2c_device_id axp20x_i2c_id[] =3D { > +static const struct i2c_device_id axp2xx_i2c_id[] =3D { > { }, > }; > -MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id); > +MODULE_DEVICE_TABLE(i2c, axp2xx_i2c_id); > =20 > -static const struct regmap_irq_chip axp20x_regmap_irq_chip =3D { > - .name =3D "axp20x_irq_chip", > +static struct acpi_device_id axp2xx_acpi_match[] =3D { > + { > + .id =3D "INT33F4", > + .driver_data =3D (kernel_ulong_t)AXP288_ID, > + }, > + { }, > +}; > +MODULE_DEVICE_TABLE(acpi, axp2xx_acpi_match); > + > +/* common irq chip attributes only */ > +static struct regmap_irq_chip axp2xx_regmap_irq_chip =3D { > + .name =3D "axp2xx_irq_chip", > .status_base =3D AXP20X_IRQ1_STATE, > .ack_base =3D AXP20X_IRQ1_STATE, > .mask_base =3D AXP20X_IRQ1_EN, > - .num_regs =3D 5, > - .irqs =3D axp20x_regmap_irqs, > - .num_irqs =3D ARRAY_SIZE(axp20x_regmap_irqs), > .mask_invert =3D true, > .init_ack_masked =3D true, > }; > @@ -161,98 +278,223 @@ static struct mfd_cell axp20x_cells[] =3D { > }, > }; > =20 > -static struct axp20x_dev *axp20x_pm_power_off; > -static void axp20x_power_off(void) > +static struct resource axp288_adc_resources[] =3D { > + { > + .name =3D "GPADC", > + .start =3D AXP288_IRQ_GPADC, > + .end =3D AXP288_IRQ_GPADC, > + .flags =3D IORESOURCE_IRQ, > + }, > +}; > + > +static struct resource axp288_charger_resources[] =3D { > + { > + .start =3D AXP288_IRQ_OV, > + .end =3D AXP288_IRQ_OV, > + .flags =3D IORESOURCE_IRQ, > + }, > + { > + .start =3D AXP288_IRQ_DONE, > + .end =3D AXP288_IRQ_DONE, > + .flags =3D IORESOURCE_IRQ, > + }, > + { > + .start =3D AXP288_IRQ_CHARGING, > + .end =3D AXP288_IRQ_CHARGING, > + .flags =3D IORESOURCE_IRQ, > + }, > + { > + .start =3D AXP288_IRQ_SAFE_QUIT, > + .end =3D AXP288_IRQ_SAFE_QUIT, > + .flags =3D IORESOURCE_IRQ, > + }, > + { > + .start =3D AXP288_IRQ_SAFE_ENTER, > + .end =3D AXP288_IRQ_SAFE_ENTER, > + .flags =3D IORESOURCE_IRQ, > + }, > + { > + .start =3D AXP288_IRQ_QCBTU, > + .end =3D AXP288_IRQ_QCBTU, > + .flags =3D IORESOURCE_IRQ, > + }, > + { > + .start =3D AXP288_IRQ_CBTU, > + .end =3D AXP288_IRQ_CBTU, > + .flags =3D IORESOURCE_IRQ, > + }, > + { > + .start =3D AXP288_IRQ_QCBTO, > + .end =3D AXP288_IRQ_QCBTO, > + .flags =3D IORESOURCE_IRQ, > + }, > + { > + .start =3D AXP288_IRQ_CBTO, > + .end =3D AXP288_IRQ_CBTO, > + .flags =3D IORESOURCE_IRQ, > + }, > +}; > + > +static struct mfd_cell axp288_cells[] =3D { > + { > + .name =3D "axp288_adc", > + .num_resources =3D ARRAY_SIZE(axp288_adc_resources), > + .resources =3D axp288_adc_resources, > + }, > + { > + .name =3D "axp288_charger", > + .num_resources =3D ARRAY_SIZE(axp288_charger_resources), > + .resources =3D axp288_charger_resources, > + }, > + { > + .name =3D "axp288_battery", > + .num_resources =3D ARRAY_SIZE(axp288_battery_resources), > + .resources =3D axp288_battery_resources, > + }, > + { > + .name =3D "axp288_acpi_opregion", > + }, > +}; > + > +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 =3D=3D AXP288_ID) > + return; > + regmap_write(axp2xx_pm_power_off->regmap, AXP20X_OFF_CTRL, > AXP20X_OFF); > } > =20 > -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; > - int ret; > =20 > - axp20x =3D devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL); > - if (!axp20x) > - return -ENOMEM; > + of_id =3D of_match_device(axp2xx_of_match, dev); > + if (of_id) { > + axp2xx->variant =3D (long) of_id->data; > + goto found_match; > + } > =20 > - of_id =3D of_match_device(axp20x_of_match, &i2c->dev); > - if (!of_id) { > - dev_err(&i2c->dev, "Unable to setup AXP20X data\n"); > + acpi_id =3D acpi_match_device(dev->driver->acpi_match_table, dev); > + if (!acpi_id || !acpi_id->driver_data) { > + dev_err(dev, "Unable to setup AXP2XX ACPI data\n"); > return -ENODEV; > } > - axp20x->variant =3D (long) of_id->data; > + axp2xx->variant =3D (long) acpi_id->driver_data; Shouldn't that be in the if statement above? I guess acpi_id will be null on a DT-based system. > + > +found_match: > + switch (axp2xx->variant) { > + case AXP202_ID: > + case AXP209_ID: > + dev_dbg(dev, "AXP2xx variant AXP202/209 found\n"); > + axp2xx_nr_cells =3D ARRAY_SIZE(axp20x_cells); > + axp2xx_cells =3D axp20x_cells; > + regmap_cfg =3D &axp20x_regmap_config; > + axp2xx_regmap_irq_chip.num_regs =3D 5; > + axp2xx_regmap_irq_chip.irqs =3D axp20x_regmap_irqs; > + axp2xx_regmap_irq_chip.num_irqs =3D > + ARRAY_SIZE(axp20x_regmap_irqs); > + break; > + case AXP288_ID: > + dev_dbg(dev, "AXP2xx variant AXP288 found\n"); > + axp2xx_cells =3D axp288_cells; > + axp2xx_nr_cells =3D ARRAY_SIZE(axp288_cells); > + axp2xx_regmap_irq_chip.irqs =3D axp288_regmap_irqs; > + axp2xx_regmap_irq_chip.num_irqs =3D > + ARRAY_SIZE(axp288_regmap_irqs); > + axp2xx_regmap_irq_chip.num_regs =3D 6; > + regmap_cfg =3D &axp288_regmap_config; > + break; > + default: > + dev_err(dev, "unsupported AXP2XX ID %lu\n", axp2xx->variant); > + return -ENODEV; > + } > + > + return 0; > +} > + > +static int axp2xx_i2c_probe(struct i2c_client *i2c, > + const struct i2c_device_id *id) > +{ > + struct axp2xx_dev *axp2xx; > + int ret; > =20 > - axp20x->i2c_client =3D i2c; > - axp20x->dev =3D &i2c->dev; > - dev_set_drvdata(axp20x->dev, axp20x); > + axp2xx =3D devm_kzalloc(&i2c->dev, sizeof(*axp2xx), GFP_KERNEL); > + if (!axp2xx) > + return -ENOMEM; > + > + ret =3D axp2xx_match_device(axp2xx, &i2c->dev); > + if (ret) > + return ret; > + axp2xx->i2c_client =3D i2c; > + axp2xx->dev =3D &i2c->dev; > + dev_set_drvdata(axp2xx->dev, axp2xx); > =20 > - axp20x->regmap =3D devm_regmap_init_i2c(i2c, &axp20x_regmap_config); > - if (IS_ERR(axp20x->regmap)) { > - ret =3D PTR_ERR(axp20x->regmap); > + axp2xx->regmap =3D devm_regmap_init_i2c(i2c, regmap_cfg); > + if (IS_ERR(axp2xx->regmap)) { > + ret =3D PTR_ERR(axp2xx->regmap); > dev_err(&i2c->dev, "regmap init failed: %d\n", ret); > return ret; > } > =20 > - ret =3D regmap_add_irq_chip(axp20x->regmap, i2c->irq, > + ret =3D 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; > } > =20 > - ret =3D mfd_add_devices(axp20x->dev, -1, axp20x_cells, > - ARRAY_SIZE(axp20x_cells), NULL, 0, NULL); > + ret =3D mfd_add_devices(axp2xx->dev, -1, axp2xx_cells, > + axp2xx_nr_cells, NULL, 0, NULL); > =20 > 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; > } > =20 > if (!pm_power_off) { > - axp20x_pm_power_off =3D axp20x; > - pm_power_off =3D axp20x_power_off; > + axp2xx_pm_power_off =3D axp2xx; > + pm_power_off =3D axp2xx_power_off; > } > =20 > - dev_info(&i2c->dev, "AXP20X driver loaded\n"); > + dev_info(&i2c->dev, "AXP2XX driver loaded\n"); > =20 > return 0; > } > =20 > -static int axp20x_i2c_remove(struct i2c_client *i2c) > +static int axp2xx_i2c_remove(struct i2c_client *i2c) > { > - struct axp20x_dev *axp20x =3D i2c_get_clientdata(i2c); > + struct axp2xx_dev *axp2xx =3D i2c_get_clientdata(i2c); > =20 > - if (axp20x =3D=3D axp20x_pm_power_off) { > - axp20x_pm_power_off =3D NULL; > + if (axp2xx =3D=3D axp2xx_pm_power_off) { > + axp2xx_pm_power_off =3D NULL; > pm_power_off =3D NULL; > } > =20 > - 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); > =20 > return 0; > } > =20 > -static struct i2c_driver axp20x_i2c_driver =3D { > +static struct i2c_driver axp2xx_i2c_driver =3D { > .driver =3D { > - .name =3D "axp20x", > + .name =3D "axp2xx", > .owner =3D THIS_MODULE, > - .of_match_table =3D of_match_ptr(axp20x_of_match), > + .of_match_table =3D of_match_ptr(axp2xx_of_match), > + .acpi_match_table =3D ACPI_PTR(axp2xx_acpi_match), > }, > - .probe =3D axp20x_i2c_probe, > - .remove =3D axp20x_i2c_remove, > - .id_table =3D axp20x_i2c_id, > + .probe =3D axp2xx_i2c_probe, > + .remove =3D axp2xx_i2c_remove, > + .id_table =3D axp2xx_i2c_id, > }; > =20 > -module_i2c_driver(axp20x_i2c_driver); > +module_i2c_driver(axp2xx_i2c_driver); > =20 > -MODULE_DESCRIPTION("PMIC MFD core driver for AXP20X"); > +MODULE_DESCRIPTION("PMIC MFD core driver for AXP2XX"); > MODULE_AUTHOR("Carlo Caione "); > MODULE_LICENSE("GPL"); > diff --git a/include/linux/mfd/axp2xx.h b/include/linux/mfd/axp2xx.h > index d0e31a2..672f048 100644 > --- a/include/linux/mfd/axp2xx.h > +++ b/include/linux/mfd/axp2xx.h > @@ -14,6 +14,8 @@ > enum { > AXP202_ID =3D 0, > AXP209_ID, > + AXP288_ID, > + NR_AXP288_VARIANTS, Can't that be a more generic name? Something like NR_AXP2XX instead? Also, could you put me in CC in the later iterations of the patches? Thanks! Maxime --=20 Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com --jaTU8Y2VLE5tlY1O Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJUDq5LAAoJEBx+YmzsjxAg8JAQAMI055ObsX0oqrHNyTUwYpKU 3mNJ4HgYU92qwIeWleG9x6wgubrcD18iZuCAAb+FTL1EWZ+Y6oo+OeezGjNKq9pu z2uf8t7tlHj67FM4QxXAZtRyxYK/ZoJPApQLDcnas1eN7vy9WHJJhHxTEGzVhzgv ynfbZmk6Tif/zJxILxjeF9q1PSmrK9fUnSUnmXA3zbaqW5hJxluVnVZg2KfDy0f+ saXVGDWb03dN7Cv97M1bmer0sqf/RhjzcT7NgUCtZEP/l9GDQpYLXS4XjFKzb5x1 cqCqnZebSWD0unU6yxfcpBpWNKJsdnR31fVm6dg6EsOA+VZh2uL5tIexiAvWzM3k FsvUMYVU5g/9tgvq0Dx4SH9Zzrdra6mXz/j79BIwcLCC3RKHNz7g5ZwTvo0BZizC 38vWbRJPDw4rGpdxl+z3sd/uhXW/+Cu7gZJ0SmnUhlQRoMlq0/P6tovoROdSgIjN V+HP0gHCM4tXx2TW2LWxKUq5bhvn1TlLY0C/459UWtOjzdPCH34zqFznrroUF+n+ JRRJ5BKV2CfCIxJHOFfS1rqndbOwssHVQXureWIh52MBQZfYOryHVv94U2U0vhTi UOiBhAMI2YAuHps97pxL1Y/xOeq7UYn+C6V8BHnEPl0DbflKX42hUJRdU9DUnpI2 4uZuLvJIJ6t/dmBHOavM =kTqS -----END PGP SIGNATURE----- --jaTU8Y2VLE5tlY1O--