From: Lee Jones <lee.jones@linaro.org>
To: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: Greg KH <gregkh@linuxfoundation.org>,
Guenter Roeck <linux@roeck-us.net>,
Oliver Neukum <oneukum@suse.com>,
Felipe Balbi <felipe.balbi@linux.intel.com>,
Bin Gao <bin.gao@linux.intel.com>,
Vincent Palatin <vpalatin@chromium.org>,
linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org
Subject: Re: [PATCHv6 3/3] mfd: intel_soc_pmic_bxtwc: add support for USB Type-C PHY on WhiskeyCove
Date: Tue, 30 Aug 2016 14:35:01 +0100 [thread overview]
Message-ID: <20160830133501.GJ10121@dell> (raw)
In-Reply-To: <20160830085903.GC1661@dell>
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@linux.intel.com>
> > Cc: Lee Jones <lee.jones@linaro.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
next prev parent reply other threads:[~2016-08-30 13:33 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-29 12:36 [PATCHv6 0/3] USB Type-C Connector class Heikki Krogerus
2016-08-29 12:36 ` [PATCHv6 1/3] usb: USB Type-C connector class Heikki Krogerus
2016-08-29 13:06 ` Vincent Palatin
2016-08-30 9:32 ` Oliver Neukum
2016-08-30 10:04 ` Heikki Krogerus
2016-08-30 11:16 ` Oliver Neukum
2016-08-30 11:49 ` Heikki Krogerus
2016-08-30 13:11 ` Heikki Krogerus
2016-08-30 13:47 ` Guenter Roeck
2016-08-31 11:09 ` Heikki Krogerus
2016-08-31 13:18 ` Guenter Roeck
2016-08-30 13:46 ` Guenter Roeck
2016-08-30 14:13 ` Heikki Krogerus
2016-08-30 15:40 ` Guenter Roeck
2016-08-29 12:36 ` [PATCHv6 2/3] usb: typec: add driver for Intel Whiskey Cove PMIC USB Type-C PHY Heikki Krogerus
2016-08-29 12:36 ` [PATCHv6 3/3] mfd: intel_soc_pmic_bxtwc: add support for USB Type-C PHY on WhiskeyCove Heikki Krogerus
2016-08-30 8:59 ` Lee Jones
2016-08-30 13:35 ` Lee Jones [this message]
2016-08-29 13:06 ` [PATCHv6 0/3] USB Type-C Connector class Guenter Roeck
2016-08-29 13:43 ` Heikki Krogerus
-- strict thread matches above, loose matches on Subject: below --
2016-08-22 12:05 Heikki Krogerus
2016-08-22 12:06 ` [PATCHv6 3/3] mfd: intel_soc_pmic_bxtwc: add support for USB Type-C PHY on WhiskeyCove Heikki Krogerus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160830133501.GJ10121@dell \
--to=lee.jones@linaro.org \
--cc=bin.gao@linux.intel.com \
--cc=felipe.balbi@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=oneukum@suse.com \
--cc=vpalatin@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).