From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Felipe Balbi <balbi@ti.com>, Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Peter Chen <peter.chen@freescale.com>,
Stefan Agner <stefan@agner.ch>
Subject: linux-next: manual merge of the usb-gadget tree with the usb.current tree
Date: Mon, 8 Sep 2014 17:09:34 +1000 [thread overview]
Message-ID: <20140908170934.34b1e4cf@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1359 bytes --]
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/phy/phy-mxs-usb.c between commit 43f3634ff7e2 ("usb: phy:
mxs: add imx6sx support") from the usb.current tree and commit
d0ee68b59e6a ("usb: phy: mxs: Add VF610 USB PHY support") from the
usb-gadget tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/usb/phy/phy-mxs-usb.c
index 00972eca04e7,8c2f23b75d6d..000000000000
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@@ -125,13 -125,12 +125,18 @@@ static const struct mxs_phy_data imx6sl
MXS_PHY_NEED_IP_FIX,
};
+static const struct mxs_phy_data imx6sx_phy_data = {
+ .flags = MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS |
+ MXS_PHY_NEED_IP_FIX,
+};
+
+ static const struct mxs_phy_data vf610_phy_data = {
+ .flags = MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS |
+ MXS_PHY_NEED_IP_FIX,
+ };
+
static const struct of_device_id mxs_phy_dt_ids[] = {
+ { .compatible = "fsl,imx6sx-usbphy", .data = &imx6sx_phy_data, },
{ .compatible = "fsl,imx6sl-usbphy", .data = &imx6sl_phy_data, },
{ .compatible = "fsl,imx6q-usbphy", .data = &imx6q_phy_data, },
{ .compatible = "fsl,imx23-usbphy", .data = &imx23_phy_data, },
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-09-08 7:09 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-08 7:09 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-05-28 8:36 linux-next: manual merge of the usb-gadget tree with the usb.current tree Stephen Rothwell
2015-01-16 6:23 Stephen Rothwell
2015-01-16 9:56 ` Kaukab, Yousaf
2015-01-13 4:06 Stephen Rothwell
2015-01-13 4:02 Stephen Rothwell
2014-09-08 7:02 Stephen Rothwell
2014-09-08 13:27 ` Felipe Balbi
2014-07-04 4:51 Stephen Rothwell
2013-12-18 6:09 Stephen Rothwell
2013-07-30 4:08 Stephen Rothwell
2013-07-30 5:50 ` Felipe Balbi
2013-03-22 3:31 Stephen Rothwell
2013-03-22 6:28 ` Felipe Balbi
2013-03-22 3:28 Stephen Rothwell
2013-03-22 6:28 ` Felipe Balbi
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=20140908170934.34b1e4cf@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=balbi@ti.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=peter.chen@freescale.com \
--cc=stefan@agner.ch \
/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).