From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752441AbcHIPFN (ORCPT ); Tue, 9 Aug 2016 11:05:13 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:37089 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752592AbcHIPFJ (ORCPT ); Tue, 9 Aug 2016 11:05:09 -0400 Date: Tue, 9 Aug 2016 16:06:09 +0100 From: Lee Jones To: Bin Gao Cc: Bin Gao , Chandra Sekhar Anagani , linux-kernel@vger.kernel.org Subject: Re: [PATCH] mfd: intel_soc_pmic_bxtwc: add bxt_wcove_usbc device Message-ID: <20160809150609.GR5243@dell> References: <20160721003356.GB211765@worksta> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20160721003356.GB211765@worksta> User-Agent: Mutt/1.6.2 (2016-07-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 20 Jul 2016, Bin Gao wrote: > The Intel Whiskey Cove PMIC includes several function units, e.g. > ADC, thermal, USB Type-C, GPIO, etc. The corresponding device has > to be created in the mfd driver(intel_soc_pmic_bxtwc.c). This change > adds the USB Type-c device. > > Signed-off-by: Bin Gao > --- > drivers/mfd/intel_soc_pmic_bxtwc.c | 23 ++++++++++++++++++++++- > 1 file changed, 22 insertions(+), 1 deletion(-) Applied, thanks. > diff --git a/drivers/mfd/intel_soc_pmic_bxtwc.c b/drivers/mfd/intel_soc_pmic_bxtwc.c > index b942876..43e54b7 100644 > --- a/drivers/mfd/intel_soc_pmic_bxtwc.c > +++ b/drivers/mfd/intel_soc_pmic_bxtwc.c > @@ -47,6 +47,8 @@ > #define BXTWC_MIRQLVL1 0x4E0E > #define BXTWC_MPWRTNIRQ 0x4E0F > > +#define BXTWC_MIRQLVL1_MCHGR BIT(5) > + > #define BXTWC_MTHRM0IRQ 0x4E12 > #define BXTWC_MTHRM1IRQ 0x4E13 > #define BXTWC_MTHRM2IRQ 0x4E14 > @@ -109,7 +111,7 @@ static const struct regmap_irq bxtwc_regmap_irqs_level2[] = { > REGMAP_IRQ_REG(BXTWC_THRM2_IRQ, 2, 0xff), > REGMAP_IRQ_REG(BXTWC_BCU_IRQ, 3, 0x1f), > REGMAP_IRQ_REG(BXTWC_ADC_IRQ, 4, 0xff), > - REGMAP_IRQ_REG(BXTWC_CHGR0_IRQ, 5, 0x1f), > + REGMAP_IRQ_REG(BXTWC_CHGR0_IRQ, 5, 0x3f), > REGMAP_IRQ_REG(BXTWC_CHGR1_IRQ, 6, 0x1f), > REGMAP_IRQ_REG(BXTWC_GPIO0_IRQ, 7, 0xff), > REGMAP_IRQ_REG(BXTWC_GPIO1_IRQ, 8, 0x3f), > @@ -143,6 +145,10 @@ static struct resource adc_resources[] = { > DEFINE_RES_IRQ_NAMED(BXTWC_ADC_IRQ, "ADC"), > }; > > +static struct resource usbc_resources[] = { > + DEFINE_RES_IRQ_NAMED(BXTWC_CHGR0_IRQ, "USBC"), > +}; > + > static struct resource charger_resources[] = { > DEFINE_RES_IRQ_NAMED(BXTWC_CHGR0_IRQ, "CHARGER"), > DEFINE_RES_IRQ_NAMED(BXTWC_CHGR1_IRQ, "CHARGER1"), > @@ -170,6 +176,11 @@ static struct mfd_cell bxt_wc_dev[] = { > .resources = thermal_resources, > }, > { > + .name = "bxt_wcove_usbc", > + .num_resources = ARRAY_SIZE(usbc_resources), > + .resources = usbc_resources, > + }, > + { > .name = "bxt_wcove_ext_charger", > .num_resources = ARRAY_SIZE(charger_resources), > .resources = charger_resources, > @@ -403,6 +414,16 @@ static int bxtwc_probe(struct platform_device *pdev) > goto err_sysfs; > } > > + /* > + * There is known hw bug. Upon reset BIT 5 of register > + * BXTWC_CHGR_LVL1_IRQ is 0 which is the expected value. However, > + * later it's set to 1(masked) automatically by hardware. So we > + * have the software workaround here to unmaksed it in order to let > + * charger interrutp work. > + */ > + regmap_update_bits(pmic->regmap, BXTWC_MIRQLVL1, > + BXTWC_MIRQLVL1_MCHGR, 0); > + > return 0; > > err_sysfs: -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog