From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753153AbdDKOEV (ORCPT ); Tue, 11 Apr 2017 10:04:21 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:33337 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753064AbdDKOEQ (ORCPT ); Tue, 11 Apr 2017 10:04:16 -0400 Date: Tue, 11 Apr 2017 15:04:12 +0100 From: Lee Jones To: Icenowy Zheng Cc: Rob Herring , Chen-Yu Tsai , Maxime Ripard , Liam Girdwood , devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v2 04/11] mfd: axp20x: support AXP803 variant Message-ID: <20170411140412.b2ncflm2iluuuai5@dell> References: <20170407183441.58750-1-icenowy@aosc.io> <20170407183441.58750-5-icenowy@aosc.io> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20170407183441.58750-5-icenowy@aosc.io> User-Agent: Mutt/1.6.2-neo (2016-08-21) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, 08 Apr 2017, Icenowy Zheng wrote: > AXP803 is a new PMIC chip produced by X-Powers, usually paired with A64 > via RSB bus. The PMIC itself is like AXP288, but with RSB support and > dedicated VBUS and ACIN. > > Add support for it in the axp20x mfd driver. > > Currently only power key function is supported. > > Signed-off-by: Icenowy Zheng > --- > Changes in v2: > - Share regmap configs with AXP288. > - Place AXP803 bits before AXP806/809. > > drivers/mfd/axp20x-rsb.c | 1 + > drivers/mfd/axp20x.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++ > include/linux/mfd/axp20x.h | 40 ++++++++++++++++++++++- > 3 files changed, 119 insertions(+), 1 deletion(-) Applied, thanks. > diff --git a/drivers/mfd/axp20x-rsb.c b/drivers/mfd/axp20x-rsb.c > index a732cb50bcff..fd5c7267b136 100644 > --- a/drivers/mfd/axp20x-rsb.c > +++ b/drivers/mfd/axp20x-rsb.c > @@ -61,6 +61,7 @@ static int axp20x_rsb_remove(struct sunxi_rsb_device *rdev) > > static const struct of_device_id axp20x_rsb_of_match[] = { > { .compatible = "x-powers,axp223", .data = (void *)AXP223_ID }, > + { .compatible = "x-powers,axp803", .data = (void *)AXP803_ID }, > { .compatible = "x-powers,axp806", .data = (void *)AXP806_ID }, > { .compatible = "x-powers,axp809", .data = (void *)AXP809_ID }, > { }, > diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c > index 5ba3b04cc9b1..2268a6a9aa2c 100644 > --- a/drivers/mfd/axp20x.c > +++ b/drivers/mfd/axp20x.c > @@ -41,6 +41,7 @@ static const char * const axp20x_model_names[] = { > "AXP221", > "AXP223", > "AXP288", > + "AXP803", > "AXP806", > "AXP809", > }; > @@ -117,6 +118,7 @@ static const struct regmap_access_table axp22x_volatile_table = { > .n_yes_ranges = ARRAY_SIZE(axp22x_volatile_ranges), > }; > > +/* AXP288 ranges are shared with the AXP803, as they cover the same range */ > 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), > @@ -264,6 +266,20 @@ static struct resource axp288_fuel_gauge_resources[] = { > }, > }; > > +static struct resource axp803_pek_resources[] = { > + { > + .name = "PEK_DBR", > + .start = AXP803_IRQ_PEK_RIS_EDGE, > + .end = AXP803_IRQ_PEK_RIS_EDGE, > + .flags = IORESOURCE_IRQ, > + }, { > + .name = "PEK_DBF", > + .start = AXP803_IRQ_PEK_FAL_EDGE, > + .end = AXP803_IRQ_PEK_FAL_EDGE, > + .flags = IORESOURCE_IRQ, > + }, > +}; > + > static struct resource axp809_pek_resources[] = { > { > .name = "PEK_DBR", > @@ -457,6 +473,43 @@ static const struct regmap_irq axp288_regmap_irqs[] = { > INIT_REGMAP_IRQ(AXP288, BC_USB_CHNG, 5, 1), > }; > > +static const struct regmap_irq axp803_regmap_irqs[] = { > + INIT_REGMAP_IRQ(AXP803, ACIN_OVER_V, 0, 7), > + INIT_REGMAP_IRQ(AXP803, ACIN_PLUGIN, 0, 6), > + INIT_REGMAP_IRQ(AXP803, ACIN_REMOVAL, 0, 5), > + INIT_REGMAP_IRQ(AXP803, VBUS_OVER_V, 0, 4), > + INIT_REGMAP_IRQ(AXP803, VBUS_PLUGIN, 0, 3), > + INIT_REGMAP_IRQ(AXP803, VBUS_REMOVAL, 0, 2), > + INIT_REGMAP_IRQ(AXP803, BATT_PLUGIN, 1, 7), > + INIT_REGMAP_IRQ(AXP803, BATT_REMOVAL, 1, 6), > + INIT_REGMAP_IRQ(AXP803, BATT_ENT_ACT_MODE, 1, 5), > + INIT_REGMAP_IRQ(AXP803, BATT_EXIT_ACT_MODE, 1, 4), > + INIT_REGMAP_IRQ(AXP803, CHARG, 1, 3), > + INIT_REGMAP_IRQ(AXP803, CHARG_DONE, 1, 2), > + INIT_REGMAP_IRQ(AXP803, BATT_CHG_TEMP_HIGH, 2, 7), > + INIT_REGMAP_IRQ(AXP803, BATT_CHG_TEMP_HIGH_END, 2, 6), > + INIT_REGMAP_IRQ(AXP803, BATT_CHG_TEMP_LOW, 2, 5), > + INIT_REGMAP_IRQ(AXP803, BATT_CHG_TEMP_LOW_END, 2, 4), > + INIT_REGMAP_IRQ(AXP803, BATT_ACT_TEMP_HIGH, 2, 3), > + INIT_REGMAP_IRQ(AXP803, BATT_ACT_TEMP_HIGH_END, 2, 2), > + INIT_REGMAP_IRQ(AXP803, BATT_ACT_TEMP_LOW, 2, 1), > + INIT_REGMAP_IRQ(AXP803, BATT_ACT_TEMP_LOW_END, 2, 0), > + INIT_REGMAP_IRQ(AXP803, DIE_TEMP_HIGH, 3, 7), > + INIT_REGMAP_IRQ(AXP803, GPADC, 3, 2), > + INIT_REGMAP_IRQ(AXP803, LOW_PWR_LVL1, 3, 1), > + INIT_REGMAP_IRQ(AXP803, LOW_PWR_LVL2, 3, 0), > + INIT_REGMAP_IRQ(AXP803, TIMER, 4, 7), > + INIT_REGMAP_IRQ(AXP803, PEK_RIS_EDGE, 4, 6), > + INIT_REGMAP_IRQ(AXP803, PEK_FAL_EDGE, 4, 5), > + INIT_REGMAP_IRQ(AXP803, PEK_SHORT, 4, 4), > + INIT_REGMAP_IRQ(AXP803, PEK_LONG, 4, 3), > + INIT_REGMAP_IRQ(AXP803, PEK_OVER_OFF, 4, 2), > + INIT_REGMAP_IRQ(AXP803, GPIO1_INPUT, 4, 1), > + INIT_REGMAP_IRQ(AXP803, GPIO0_INPUT, 4, 0), > + INIT_REGMAP_IRQ(AXP803, BC_USB_CHNG, 5, 1), > + INIT_REGMAP_IRQ(AXP803, MV_CHNG, 5, 0), > +}; > + > static const struct regmap_irq axp806_regmap_irqs[] = { > INIT_REGMAP_IRQ(AXP806, DIE_TEMP_HIGH_LV1, 0, 0), > INIT_REGMAP_IRQ(AXP806, DIE_TEMP_HIGH_LV2, 0, 1), > @@ -557,6 +610,18 @@ static const struct regmap_irq_chip axp288_regmap_irq_chip = { > > }; > > +static const struct regmap_irq_chip axp803_regmap_irq_chip = { > + .name = "axp803", > + .status_base = AXP20X_IRQ1_STATE, > + .ack_base = AXP20X_IRQ1_STATE, > + .mask_base = AXP20X_IRQ1_EN, > + .mask_invert = true, > + .init_ack_masked = true, > + .irqs = axp803_regmap_irqs, > + .num_irqs = ARRAY_SIZE(axp803_regmap_irqs), > + .num_regs = 6, > +}; > + > static const struct regmap_irq_chip axp806_regmap_irq_chip = { > .name = "axp806", > .status_base = AXP20X_IRQ1_STATE, > @@ -769,6 +834,14 @@ static struct mfd_cell axp288_cells[] = { > }, > }; > > +static struct mfd_cell axp803_cells[] = { > + { > + .name = "axp20x-pek", > + .num_resources = ARRAY_SIZE(axp803_pek_resources), > + .resources = axp803_pek_resources, > + } > +}; > + > static struct mfd_cell axp806_cells[] = { > { > .id = 2, > @@ -855,6 +928,12 @@ int axp20x_match_device(struct axp20x_dev *axp20x) > axp20x->regmap_irq_chip = &axp288_regmap_irq_chip; > axp20x->irq_flags = IRQF_TRIGGER_LOW; > break; > + case AXP803_ID: > + axp20x->nr_cells = ARRAY_SIZE(axp803_cells); > + axp20x->cells = axp803_cells; > + axp20x->regmap_cfg = &axp288_regmap_config; > + axp20x->regmap_irq_chip = &axp803_regmap_irq_chip; > + break; > case AXP806_ID: > axp20x->nr_cells = ARRAY_SIZE(axp806_cells); > axp20x->cells = axp806_cells; > diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h > index dc8798cf2a24..cde56cfe8446 100644 > --- a/include/linux/mfd/axp20x.h > +++ b/include/linux/mfd/axp20x.h > @@ -20,6 +20,7 @@ enum axp20x_variants { > AXP221_ID, > AXP223_ID, > AXP288_ID, > + AXP803_ID, > AXP806_ID, > AXP809_ID, > NR_AXP20X_VARIANTS, > @@ -234,7 +235,7 @@ enum axp20x_variants { > #define AXP22X_TS_ADC_L 0x59 > #define AXP22X_BATLOW_THRES1 0xe6 > > -/* AXP288 specific registers */ > +/* AXP288/AXP803 specific registers */ > #define AXP288_POWER_REASON 0x02 > #define AXP288_BC_GLOBAL 0x2c > #define AXP288_BC_VBUS_CNTL 0x2d > @@ -475,6 +476,43 @@ enum axp288_irqs { > AXP288_IRQ_BC_USB_CHNG, > }; > > +enum axp803_irqs { > + AXP803_IRQ_ACIN_OVER_V = 1, > + AXP803_IRQ_ACIN_PLUGIN, > + AXP803_IRQ_ACIN_REMOVAL, > + AXP803_IRQ_VBUS_OVER_V, > + AXP803_IRQ_VBUS_PLUGIN, > + AXP803_IRQ_VBUS_REMOVAL, > + AXP803_IRQ_BATT_PLUGIN, > + AXP803_IRQ_BATT_REMOVAL, > + AXP803_IRQ_BATT_ENT_ACT_MODE, > + AXP803_IRQ_BATT_EXIT_ACT_MODE, > + AXP803_IRQ_CHARG, > + AXP803_IRQ_CHARG_DONE, > + AXP803_IRQ_BATT_CHG_TEMP_HIGH, > + AXP803_IRQ_BATT_CHG_TEMP_HIGH_END, > + AXP803_IRQ_BATT_CHG_TEMP_LOW, > + AXP803_IRQ_BATT_CHG_TEMP_LOW_END, > + AXP803_IRQ_BATT_ACT_TEMP_HIGH, > + AXP803_IRQ_BATT_ACT_TEMP_HIGH_END, > + AXP803_IRQ_BATT_ACT_TEMP_LOW, > + AXP803_IRQ_BATT_ACT_TEMP_LOW_END, > + AXP803_IRQ_DIE_TEMP_HIGH, > + AXP803_IRQ_GPADC, > + AXP803_IRQ_LOW_PWR_LVL1, > + AXP803_IRQ_LOW_PWR_LVL2, > + AXP803_IRQ_TIMER, > + AXP803_IRQ_PEK_RIS_EDGE, > + AXP803_IRQ_PEK_FAL_EDGE, > + AXP803_IRQ_PEK_SHORT, > + AXP803_IRQ_PEK_LONG, > + AXP803_IRQ_PEK_OVER_OFF, > + AXP803_IRQ_GPIO1_INPUT, > + AXP803_IRQ_GPIO0_INPUT, > + AXP803_IRQ_BC_USB_CHNG, > + AXP803_IRQ_MV_CHNG, > +}; > + > enum axp806_irqs { > AXP806_IRQ_DIE_TEMP_HIGH_LV1, > AXP806_IRQ_DIE_TEMP_HIGH_LV2, -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lee Jones Subject: Re: [PATCH v2 04/11] mfd: axp20x: support AXP803 variant Date: Tue, 11 Apr 2017 15:04:12 +0100 Message-ID: <20170411140412.b2ncflm2iluuuai5@dell> References: <20170407183441.58750-1-icenowy@aosc.io> <20170407183441.58750-5-icenowy@aosc.io> Reply-To: lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Return-path: Sender: linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org Content-Disposition: inline In-Reply-To: <20170407183441.58750-5-icenowy-h8G6r0blFSE@public.gmane.org> List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , To: Icenowy Zheng Cc: Rob Herring , Chen-Yu Tsai , Maxime Ripard , Liam Girdwood , devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org List-Id: devicetree@vger.kernel.org On Sat, 08 Apr 2017, Icenowy Zheng wrote: > AXP803 is a new PMIC chip produced by X-Powers, usually paired with A64 > via RSB bus. The PMIC itself is like AXP288, but with RSB support and > dedicated VBUS and ACIN. >=20 > Add support for it in the axp20x mfd driver. >=20 > Currently only power key function is supported. >=20 > Signed-off-by: Icenowy Zheng > --- > Changes in v2: > - Share regmap configs with AXP288. > - Place AXP803 bits before AXP806/809. >=20 > drivers/mfd/axp20x-rsb.c | 1 + > drivers/mfd/axp20x.c | 79 ++++++++++++++++++++++++++++++++++++++++= ++++++ > include/linux/mfd/axp20x.h | 40 ++++++++++++++++++++++- > 3 files changed, 119 insertions(+), 1 deletion(-) Applied, thanks. > diff --git a/drivers/mfd/axp20x-rsb.c b/drivers/mfd/axp20x-rsb.c > index a732cb50bcff..fd5c7267b136 100644 > --- a/drivers/mfd/axp20x-rsb.c > +++ b/drivers/mfd/axp20x-rsb.c > @@ -61,6 +61,7 @@ static int axp20x_rsb_remove(struct sunxi_rsb_device *r= dev) > =20 > static const struct of_device_id axp20x_rsb_of_match[] =3D { > { .compatible =3D "x-powers,axp223", .data =3D (void *)AXP223_ID }, > + { .compatible =3D "x-powers,axp803", .data =3D (void *)AXP803_ID }, > { .compatible =3D "x-powers,axp806", .data =3D (void *)AXP806_ID }, > { .compatible =3D "x-powers,axp809", .data =3D (void *)AXP809_ID }, > { }, > diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c > index 5ba3b04cc9b1..2268a6a9aa2c 100644 > --- a/drivers/mfd/axp20x.c > +++ b/drivers/mfd/axp20x.c > @@ -41,6 +41,7 @@ static const char * const axp20x_model_names[] =3D { > "AXP221", > "AXP223", > "AXP288", > + "AXP803", > "AXP806", > "AXP809", > }; > @@ -117,6 +118,7 @@ static const struct regmap_access_table axp22x_volati= le_table =3D { > .n_yes_ranges =3D ARRAY_SIZE(axp22x_volatile_ranges), > }; > =20 > +/* AXP288 ranges are shared with the AXP803, as they cover the same rang= e */ > 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), > @@ -264,6 +266,20 @@ static struct resource axp288_fuel_gauge_resources[]= =3D { > }, > }; > =20 > +static struct resource axp803_pek_resources[] =3D { > + { > + .name =3D "PEK_DBR", > + .start =3D AXP803_IRQ_PEK_RIS_EDGE, > + .end =3D AXP803_IRQ_PEK_RIS_EDGE, > + .flags =3D IORESOURCE_IRQ, > + }, { > + .name =3D "PEK_DBF", > + .start =3D AXP803_IRQ_PEK_FAL_EDGE, > + .end =3D AXP803_IRQ_PEK_FAL_EDGE, > + .flags =3D IORESOURCE_IRQ, > + }, > +}; > + > static struct resource axp809_pek_resources[] =3D { > { > .name =3D "PEK_DBR", > @@ -457,6 +473,43 @@ static const struct regmap_irq axp288_regmap_irqs[] = =3D { > INIT_REGMAP_IRQ(AXP288, BC_USB_CHNG, 5, 1), > }; > =20 > +static const struct regmap_irq axp803_regmap_irqs[] =3D { > + INIT_REGMAP_IRQ(AXP803, ACIN_OVER_V, 0, 7), > + INIT_REGMAP_IRQ(AXP803, ACIN_PLUGIN, 0, 6), > + INIT_REGMAP_IRQ(AXP803, ACIN_REMOVAL, 0, 5), > + INIT_REGMAP_IRQ(AXP803, VBUS_OVER_V, 0, 4), > + INIT_REGMAP_IRQ(AXP803, VBUS_PLUGIN, 0, 3), > + INIT_REGMAP_IRQ(AXP803, VBUS_REMOVAL, 0, 2), > + INIT_REGMAP_IRQ(AXP803, BATT_PLUGIN, 1, 7), > + INIT_REGMAP_IRQ(AXP803, BATT_REMOVAL, 1, 6), > + INIT_REGMAP_IRQ(AXP803, BATT_ENT_ACT_MODE, 1, 5), > + INIT_REGMAP_IRQ(AXP803, BATT_EXIT_ACT_MODE, 1, 4), > + INIT_REGMAP_IRQ(AXP803, CHARG, 1, 3), > + INIT_REGMAP_IRQ(AXP803, CHARG_DONE, 1, 2), > + INIT_REGMAP_IRQ(AXP803, BATT_CHG_TEMP_HIGH, 2, 7), > + INIT_REGMAP_IRQ(AXP803, BATT_CHG_TEMP_HIGH_END, 2, 6), > + INIT_REGMAP_IRQ(AXP803, BATT_CHG_TEMP_LOW, 2, 5), > + INIT_REGMAP_IRQ(AXP803, BATT_CHG_TEMP_LOW_END, 2, 4), > + INIT_REGMAP_IRQ(AXP803, BATT_ACT_TEMP_HIGH, 2, 3), > + INIT_REGMAP_IRQ(AXP803, BATT_ACT_TEMP_HIGH_END, 2, 2), > + INIT_REGMAP_IRQ(AXP803, BATT_ACT_TEMP_LOW, 2, 1), > + INIT_REGMAP_IRQ(AXP803, BATT_ACT_TEMP_LOW_END, 2, 0), > + INIT_REGMAP_IRQ(AXP803, DIE_TEMP_HIGH, 3, 7), > + INIT_REGMAP_IRQ(AXP803, GPADC, 3, 2), > + INIT_REGMAP_IRQ(AXP803, LOW_PWR_LVL1, 3, 1), > + INIT_REGMAP_IRQ(AXP803, LOW_PWR_LVL2, 3, 0), > + INIT_REGMAP_IRQ(AXP803, TIMER, 4, 7), > + INIT_REGMAP_IRQ(AXP803, PEK_RIS_EDGE, 4, 6), > + INIT_REGMAP_IRQ(AXP803, PEK_FAL_EDGE, 4, 5), > + INIT_REGMAP_IRQ(AXP803, PEK_SHORT, 4, 4), > + INIT_REGMAP_IRQ(AXP803, PEK_LONG, 4, 3), > + INIT_REGMAP_IRQ(AXP803, PEK_OVER_OFF, 4, 2), > + INIT_REGMAP_IRQ(AXP803, GPIO1_INPUT, 4, 1), > + INIT_REGMAP_IRQ(AXP803, GPIO0_INPUT, 4, 0), > + INIT_REGMAP_IRQ(AXP803, BC_USB_CHNG, 5, 1), > + INIT_REGMAP_IRQ(AXP803, MV_CHNG, 5, 0), > +}; > + > static const struct regmap_irq axp806_regmap_irqs[] =3D { > INIT_REGMAP_IRQ(AXP806, DIE_TEMP_HIGH_LV1, 0, 0), > INIT_REGMAP_IRQ(AXP806, DIE_TEMP_HIGH_LV2, 0, 1), > @@ -557,6 +610,18 @@ static const struct regmap_irq_chip axp288_regmap_ir= q_chip =3D { > =20 > }; > =20 > +static const struct regmap_irq_chip axp803_regmap_irq_chip =3D { > + .name =3D "axp803", > + .status_base =3D AXP20X_IRQ1_STATE, > + .ack_base =3D AXP20X_IRQ1_STATE, > + .mask_base =3D AXP20X_IRQ1_EN, > + .mask_invert =3D true, > + .init_ack_masked =3D true, > + .irqs =3D axp803_regmap_irqs, > + .num_irqs =3D ARRAY_SIZE(axp803_regmap_irqs), > + .num_regs =3D 6, > +}; > + > static const struct regmap_irq_chip axp806_regmap_irq_chip =3D { > .name =3D "axp806", > .status_base =3D AXP20X_IRQ1_STATE, > @@ -769,6 +834,14 @@ static struct mfd_cell axp288_cells[] =3D { > }, > }; > =20 > +static struct mfd_cell axp803_cells[] =3D { > + { > + .name =3D "axp20x-pek", > + .num_resources =3D ARRAY_SIZE(axp803_pek_resources), > + .resources =3D axp803_pek_resources, > + } > +}; > + > static struct mfd_cell axp806_cells[] =3D { > { > .id =3D 2, > @@ -855,6 +928,12 @@ int axp20x_match_device(struct axp20x_dev *axp20x) > axp20x->regmap_irq_chip =3D &axp288_regmap_irq_chip; > axp20x->irq_flags =3D IRQF_TRIGGER_LOW; > break; > + case AXP803_ID: > + axp20x->nr_cells =3D ARRAY_SIZE(axp803_cells); > + axp20x->cells =3D axp803_cells; > + axp20x->regmap_cfg =3D &axp288_regmap_config; > + axp20x->regmap_irq_chip =3D &axp803_regmap_irq_chip; > + break; > case AXP806_ID: > axp20x->nr_cells =3D ARRAY_SIZE(axp806_cells); > axp20x->cells =3D axp806_cells; > diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h > index dc8798cf2a24..cde56cfe8446 100644 > --- a/include/linux/mfd/axp20x.h > +++ b/include/linux/mfd/axp20x.h > @@ -20,6 +20,7 @@ enum axp20x_variants { > AXP221_ID, > AXP223_ID, > AXP288_ID, > + AXP803_ID, > AXP806_ID, > AXP809_ID, > NR_AXP20X_VARIANTS, > @@ -234,7 +235,7 @@ enum axp20x_variants { > #define AXP22X_TS_ADC_L 0x59 > #define AXP22X_BATLOW_THRES1 0xe6 > =20 > -/* AXP288 specific registers */ > +/* AXP288/AXP803 specific registers */ > #define AXP288_POWER_REASON 0x02 > #define AXP288_BC_GLOBAL 0x2c > #define AXP288_BC_VBUS_CNTL 0x2d > @@ -475,6 +476,43 @@ enum axp288_irqs { > AXP288_IRQ_BC_USB_CHNG, > }; > =20 > +enum axp803_irqs { > + AXP803_IRQ_ACIN_OVER_V =3D 1, > + AXP803_IRQ_ACIN_PLUGIN, > + AXP803_IRQ_ACIN_REMOVAL, > + AXP803_IRQ_VBUS_OVER_V, > + AXP803_IRQ_VBUS_PLUGIN, > + AXP803_IRQ_VBUS_REMOVAL, > + AXP803_IRQ_BATT_PLUGIN, > + AXP803_IRQ_BATT_REMOVAL, > + AXP803_IRQ_BATT_ENT_ACT_MODE, > + AXP803_IRQ_BATT_EXIT_ACT_MODE, > + AXP803_IRQ_CHARG, > + AXP803_IRQ_CHARG_DONE, > + AXP803_IRQ_BATT_CHG_TEMP_HIGH, > + AXP803_IRQ_BATT_CHG_TEMP_HIGH_END, > + AXP803_IRQ_BATT_CHG_TEMP_LOW, > + AXP803_IRQ_BATT_CHG_TEMP_LOW_END, > + AXP803_IRQ_BATT_ACT_TEMP_HIGH, > + AXP803_IRQ_BATT_ACT_TEMP_HIGH_END, > + AXP803_IRQ_BATT_ACT_TEMP_LOW, > + AXP803_IRQ_BATT_ACT_TEMP_LOW_END, > + AXP803_IRQ_DIE_TEMP_HIGH, > + AXP803_IRQ_GPADC, > + AXP803_IRQ_LOW_PWR_LVL1, > + AXP803_IRQ_LOW_PWR_LVL2, > + AXP803_IRQ_TIMER, > + AXP803_IRQ_PEK_RIS_EDGE, > + AXP803_IRQ_PEK_FAL_EDGE, > + AXP803_IRQ_PEK_SHORT, > + AXP803_IRQ_PEK_LONG, > + AXP803_IRQ_PEK_OVER_OFF, > + AXP803_IRQ_GPIO1_INPUT, > + AXP803_IRQ_GPIO0_INPUT, > + AXP803_IRQ_BC_USB_CHNG, > + AXP803_IRQ_MV_CHNG, > +}; > + > enum axp806_irqs { > AXP806_IRQ_DIE_TEMP_HIGH_LV1, > AXP806_IRQ_DIE_TEMP_HIGH_LV2, --=20 Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org =E2=94=82 Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog --=20 You received this message because you are subscribed to the Google Groups "= linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an e= mail to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org For more options, visit https://groups.google.com/d/optout. From mboxrd@z Thu Jan 1 00:00:00 1970 From: lee.jones@linaro.org (Lee Jones) Date: Tue, 11 Apr 2017 15:04:12 +0100 Subject: [PATCH v2 04/11] mfd: axp20x: support AXP803 variant In-Reply-To: <20170407183441.58750-5-icenowy@aosc.io> References: <20170407183441.58750-1-icenowy@aosc.io> <20170407183441.58750-5-icenowy@aosc.io> Message-ID: <20170411140412.b2ncflm2iluuuai5@dell> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Sat, 08 Apr 2017, Icenowy Zheng wrote: > AXP803 is a new PMIC chip produced by X-Powers, usually paired with A64 > via RSB bus. The PMIC itself is like AXP288, but with RSB support and > dedicated VBUS and ACIN. > > Add support for it in the axp20x mfd driver. > > Currently only power key function is supported. > > Signed-off-by: Icenowy Zheng > --- > Changes in v2: > - Share regmap configs with AXP288. > - Place AXP803 bits before AXP806/809. > > drivers/mfd/axp20x-rsb.c | 1 + > drivers/mfd/axp20x.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++ > include/linux/mfd/axp20x.h | 40 ++++++++++++++++++++++- > 3 files changed, 119 insertions(+), 1 deletion(-) Applied, thanks. > diff --git a/drivers/mfd/axp20x-rsb.c b/drivers/mfd/axp20x-rsb.c > index a732cb50bcff..fd5c7267b136 100644 > --- a/drivers/mfd/axp20x-rsb.c > +++ b/drivers/mfd/axp20x-rsb.c > @@ -61,6 +61,7 @@ static int axp20x_rsb_remove(struct sunxi_rsb_device *rdev) > > static const struct of_device_id axp20x_rsb_of_match[] = { > { .compatible = "x-powers,axp223", .data = (void *)AXP223_ID }, > + { .compatible = "x-powers,axp803", .data = (void *)AXP803_ID }, > { .compatible = "x-powers,axp806", .data = (void *)AXP806_ID }, > { .compatible = "x-powers,axp809", .data = (void *)AXP809_ID }, > { }, > diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c > index 5ba3b04cc9b1..2268a6a9aa2c 100644 > --- a/drivers/mfd/axp20x.c > +++ b/drivers/mfd/axp20x.c > @@ -41,6 +41,7 @@ static const char * const axp20x_model_names[] = { > "AXP221", > "AXP223", > "AXP288", > + "AXP803", > "AXP806", > "AXP809", > }; > @@ -117,6 +118,7 @@ static const struct regmap_access_table axp22x_volatile_table = { > .n_yes_ranges = ARRAY_SIZE(axp22x_volatile_ranges), > }; > > +/* AXP288 ranges are shared with the AXP803, as they cover the same range */ > 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), > @@ -264,6 +266,20 @@ static struct resource axp288_fuel_gauge_resources[] = { > }, > }; > > +static struct resource axp803_pek_resources[] = { > + { > + .name = "PEK_DBR", > + .start = AXP803_IRQ_PEK_RIS_EDGE, > + .end = AXP803_IRQ_PEK_RIS_EDGE, > + .flags = IORESOURCE_IRQ, > + }, { > + .name = "PEK_DBF", > + .start = AXP803_IRQ_PEK_FAL_EDGE, > + .end = AXP803_IRQ_PEK_FAL_EDGE, > + .flags = IORESOURCE_IRQ, > + }, > +}; > + > static struct resource axp809_pek_resources[] = { > { > .name = "PEK_DBR", > @@ -457,6 +473,43 @@ static const struct regmap_irq axp288_regmap_irqs[] = { > INIT_REGMAP_IRQ(AXP288, BC_USB_CHNG, 5, 1), > }; > > +static const struct regmap_irq axp803_regmap_irqs[] = { > + INIT_REGMAP_IRQ(AXP803, ACIN_OVER_V, 0, 7), > + INIT_REGMAP_IRQ(AXP803, ACIN_PLUGIN, 0, 6), > + INIT_REGMAP_IRQ(AXP803, ACIN_REMOVAL, 0, 5), > + INIT_REGMAP_IRQ(AXP803, VBUS_OVER_V, 0, 4), > + INIT_REGMAP_IRQ(AXP803, VBUS_PLUGIN, 0, 3), > + INIT_REGMAP_IRQ(AXP803, VBUS_REMOVAL, 0, 2), > + INIT_REGMAP_IRQ(AXP803, BATT_PLUGIN, 1, 7), > + INIT_REGMAP_IRQ(AXP803, BATT_REMOVAL, 1, 6), > + INIT_REGMAP_IRQ(AXP803, BATT_ENT_ACT_MODE, 1, 5), > + INIT_REGMAP_IRQ(AXP803, BATT_EXIT_ACT_MODE, 1, 4), > + INIT_REGMAP_IRQ(AXP803, CHARG, 1, 3), > + INIT_REGMAP_IRQ(AXP803, CHARG_DONE, 1, 2), > + INIT_REGMAP_IRQ(AXP803, BATT_CHG_TEMP_HIGH, 2, 7), > + INIT_REGMAP_IRQ(AXP803, BATT_CHG_TEMP_HIGH_END, 2, 6), > + INIT_REGMAP_IRQ(AXP803, BATT_CHG_TEMP_LOW, 2, 5), > + INIT_REGMAP_IRQ(AXP803, BATT_CHG_TEMP_LOW_END, 2, 4), > + INIT_REGMAP_IRQ(AXP803, BATT_ACT_TEMP_HIGH, 2, 3), > + INIT_REGMAP_IRQ(AXP803, BATT_ACT_TEMP_HIGH_END, 2, 2), > + INIT_REGMAP_IRQ(AXP803, BATT_ACT_TEMP_LOW, 2, 1), > + INIT_REGMAP_IRQ(AXP803, BATT_ACT_TEMP_LOW_END, 2, 0), > + INIT_REGMAP_IRQ(AXP803, DIE_TEMP_HIGH, 3, 7), > + INIT_REGMAP_IRQ(AXP803, GPADC, 3, 2), > + INIT_REGMAP_IRQ(AXP803, LOW_PWR_LVL1, 3, 1), > + INIT_REGMAP_IRQ(AXP803, LOW_PWR_LVL2, 3, 0), > + INIT_REGMAP_IRQ(AXP803, TIMER, 4, 7), > + INIT_REGMAP_IRQ(AXP803, PEK_RIS_EDGE, 4, 6), > + INIT_REGMAP_IRQ(AXP803, PEK_FAL_EDGE, 4, 5), > + INIT_REGMAP_IRQ(AXP803, PEK_SHORT, 4, 4), > + INIT_REGMAP_IRQ(AXP803, PEK_LONG, 4, 3), > + INIT_REGMAP_IRQ(AXP803, PEK_OVER_OFF, 4, 2), > + INIT_REGMAP_IRQ(AXP803, GPIO1_INPUT, 4, 1), > + INIT_REGMAP_IRQ(AXP803, GPIO0_INPUT, 4, 0), > + INIT_REGMAP_IRQ(AXP803, BC_USB_CHNG, 5, 1), > + INIT_REGMAP_IRQ(AXP803, MV_CHNG, 5, 0), > +}; > + > static const struct regmap_irq axp806_regmap_irqs[] = { > INIT_REGMAP_IRQ(AXP806, DIE_TEMP_HIGH_LV1, 0, 0), > INIT_REGMAP_IRQ(AXP806, DIE_TEMP_HIGH_LV2, 0, 1), > @@ -557,6 +610,18 @@ static const struct regmap_irq_chip axp288_regmap_irq_chip = { > > }; > > +static const struct regmap_irq_chip axp803_regmap_irq_chip = { > + .name = "axp803", > + .status_base = AXP20X_IRQ1_STATE, > + .ack_base = AXP20X_IRQ1_STATE, > + .mask_base = AXP20X_IRQ1_EN, > + .mask_invert = true, > + .init_ack_masked = true, > + .irqs = axp803_regmap_irqs, > + .num_irqs = ARRAY_SIZE(axp803_regmap_irqs), > + .num_regs = 6, > +}; > + > static const struct regmap_irq_chip axp806_regmap_irq_chip = { > .name = "axp806", > .status_base = AXP20X_IRQ1_STATE, > @@ -769,6 +834,14 @@ static struct mfd_cell axp288_cells[] = { > }, > }; > > +static struct mfd_cell axp803_cells[] = { > + { > + .name = "axp20x-pek", > + .num_resources = ARRAY_SIZE(axp803_pek_resources), > + .resources = axp803_pek_resources, > + } > +}; > + > static struct mfd_cell axp806_cells[] = { > { > .id = 2, > @@ -855,6 +928,12 @@ int axp20x_match_device(struct axp20x_dev *axp20x) > axp20x->regmap_irq_chip = &axp288_regmap_irq_chip; > axp20x->irq_flags = IRQF_TRIGGER_LOW; > break; > + case AXP803_ID: > + axp20x->nr_cells = ARRAY_SIZE(axp803_cells); > + axp20x->cells = axp803_cells; > + axp20x->regmap_cfg = &axp288_regmap_config; > + axp20x->regmap_irq_chip = &axp803_regmap_irq_chip; > + break; > case AXP806_ID: > axp20x->nr_cells = ARRAY_SIZE(axp806_cells); > axp20x->cells = axp806_cells; > diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h > index dc8798cf2a24..cde56cfe8446 100644 > --- a/include/linux/mfd/axp20x.h > +++ b/include/linux/mfd/axp20x.h > @@ -20,6 +20,7 @@ enum axp20x_variants { > AXP221_ID, > AXP223_ID, > AXP288_ID, > + AXP803_ID, > AXP806_ID, > AXP809_ID, > NR_AXP20X_VARIANTS, > @@ -234,7 +235,7 @@ enum axp20x_variants { > #define AXP22X_TS_ADC_L 0x59 > #define AXP22X_BATLOW_THRES1 0xe6 > > -/* AXP288 specific registers */ > +/* AXP288/AXP803 specific registers */ > #define AXP288_POWER_REASON 0x02 > #define AXP288_BC_GLOBAL 0x2c > #define AXP288_BC_VBUS_CNTL 0x2d > @@ -475,6 +476,43 @@ enum axp288_irqs { > AXP288_IRQ_BC_USB_CHNG, > }; > > +enum axp803_irqs { > + AXP803_IRQ_ACIN_OVER_V = 1, > + AXP803_IRQ_ACIN_PLUGIN, > + AXP803_IRQ_ACIN_REMOVAL, > + AXP803_IRQ_VBUS_OVER_V, > + AXP803_IRQ_VBUS_PLUGIN, > + AXP803_IRQ_VBUS_REMOVAL, > + AXP803_IRQ_BATT_PLUGIN, > + AXP803_IRQ_BATT_REMOVAL, > + AXP803_IRQ_BATT_ENT_ACT_MODE, > + AXP803_IRQ_BATT_EXIT_ACT_MODE, > + AXP803_IRQ_CHARG, > + AXP803_IRQ_CHARG_DONE, > + AXP803_IRQ_BATT_CHG_TEMP_HIGH, > + AXP803_IRQ_BATT_CHG_TEMP_HIGH_END, > + AXP803_IRQ_BATT_CHG_TEMP_LOW, > + AXP803_IRQ_BATT_CHG_TEMP_LOW_END, > + AXP803_IRQ_BATT_ACT_TEMP_HIGH, > + AXP803_IRQ_BATT_ACT_TEMP_HIGH_END, > + AXP803_IRQ_BATT_ACT_TEMP_LOW, > + AXP803_IRQ_BATT_ACT_TEMP_LOW_END, > + AXP803_IRQ_DIE_TEMP_HIGH, > + AXP803_IRQ_GPADC, > + AXP803_IRQ_LOW_PWR_LVL1, > + AXP803_IRQ_LOW_PWR_LVL2, > + AXP803_IRQ_TIMER, > + AXP803_IRQ_PEK_RIS_EDGE, > + AXP803_IRQ_PEK_FAL_EDGE, > + AXP803_IRQ_PEK_SHORT, > + AXP803_IRQ_PEK_LONG, > + AXP803_IRQ_PEK_OVER_OFF, > + AXP803_IRQ_GPIO1_INPUT, > + AXP803_IRQ_GPIO0_INPUT, > + AXP803_IRQ_BC_USB_CHNG, > + AXP803_IRQ_MV_CHNG, > +}; > + > enum axp806_irqs { > AXP806_IRQ_DIE_TEMP_HIGH_LV1, > AXP806_IRQ_DIE_TEMP_HIGH_LV2, -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog