linux-kernel - Re: [PATCHv6 3/3] mfd: intel_soc_pmic_bxtwc: add support for USB Type-C PHY on WhiskeyCove

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20160830133501.GJ10121@dell>
Date:   Tue, 30 Aug 2016 14:35:01 +0100
From:   Lee Jones <lee.jones@...aro.org>
To:     Heikki Krogerus <heikki.krogerus@...ux.intel.com>
Cc:     Greg KH <gregkh@...uxfoundation.org>,
        Guenter Roeck <linux@...ck-us.net>,
        Oliver Neukum <oneukum@...e.com>,
        Felipe Balbi <felipe.balbi@...ux.intel.com>,
        Bin Gao <bin.gao@...ux.intel.com>,
        Vincent Palatin <vpalatin@...omium.org>,
        linux-kernel@...r.kernel.org, linux-usb@...r.kernel.org
Subject: Re: [PATCHv6 3/3] mfd: intel_soc_pmic_bxtwc: add support for USB
 Type-C PHY on WhiskeyCove

On Tue, 30 Aug 2016, Lee Jones wrote:

> On Mon, 29 Aug 2016, Heikki Krogerus wrote:
> 
> > Intel WhiskeyCove PMIC has also a USB Type-C PHY, so let's
> > create a device for it.
> > 
> > Signed-off-by: Heikki Krogerus <heikki.krogerus@...ux.intel.com>
> > Cc: Lee Jones <lee.jones@...aro.org>
> > ---
> >  drivers/mfd/intel_soc_pmic_bxtwc.c | 11 +++++++++++
> >  1 file changed, 11 insertions(+)
> 
> Applied, thanks.

This patch conflicts with ...

 "mfd: intel_soc_pmic_bxtwc: Add bxt_wcove_usbc device"

Please re-base your changes on my tree (or -next) and resubmit if this
change is still relevant.

> > diff --git a/drivers/mfd/intel_soc_pmic_bxtwc.c b/drivers/mfd/intel_soc_pmic_bxtwc.c
> > index b942876..0e61dde 100644
> > --- a/drivers/mfd/intel_soc_pmic_bxtwc.c
> > +++ b/drivers/mfd/intel_soc_pmic_bxtwc.c
> > @@ -84,6 +84,7 @@ enum bxtwc_irqs_level2 {
> >  	BXTWC_THRM2_IRQ,
> >  	BXTWC_BCU_IRQ,
> >  	BXTWC_ADC_IRQ,
> > +	BXTWC_USBC_IRQ,
> >  	BXTWC_CHGR0_IRQ,
> >  	BXTWC_CHGR1_IRQ,
> >  	BXTWC_GPIO0_IRQ,
> > @@ -109,6 +110,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_USBC_IRQ, 5, BIT(5)),
> >  	REGMAP_IRQ_REG(BXTWC_CHGR0_IRQ, 5, 0x1f),
> >  	REGMAP_IRQ_REG(BXTWC_CHGR1_IRQ, 6, 0x1f),
> >  	REGMAP_IRQ_REG(BXTWC_GPIO0_IRQ, 7, 0xff),
> > @@ -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(BXTWC_USBC_IRQ),
> > +};
> > +
> >  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,
> 

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