From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the usb-gadget tree with the usb.current tree Date: Mon, 8 Sep 2014 17:09:34 +1000 Message-ID: <20140908170934.34b1e4cf@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/kjHVBc/l42B4OmzqX3jFXDc"; protocol="application/pgp-signature" Return-path: Received: from ozlabs.org ([103.22.144.67]:47785 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751983AbaIHHJn (ORCPT ); Mon, 8 Sep 2014 03:09:43 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: Felipe Balbi , Greg KH Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Chen , Stefan Agner --Sig_/kjHVBc/l42B4OmzqX3jFXDc Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable 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). --=20 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, }; =20 +static const struct mxs_phy_data imx6sx_phy_data =3D { + .flags =3D MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS | + MXS_PHY_NEED_IP_FIX, +}; + + static const struct mxs_phy_data vf610_phy_data =3D { + .flags =3D MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS | + MXS_PHY_NEED_IP_FIX, + }; +=20 static const struct of_device_id mxs_phy_dt_ids[] =3D { + { .compatible =3D "fsl,imx6sx-usbphy", .data =3D &imx6sx_phy_data, }, { .compatible =3D "fsl,imx6sl-usbphy", .data =3D &imx6sl_phy_data, }, { .compatible =3D "fsl,imx6q-usbphy", .data =3D &imx6q_phy_data, }, { .compatible =3D "fsl,imx23-usbphy", .data =3D &imx23_phy_data, }, --Sig_/kjHVBc/l42B4OmzqX3jFXDc Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJUDVY0AAoJEMDTa8Ir7ZwVCIAP/iSqdZ9mFOP1E45gPWj/mE1y zSyYTGneDVwbNUh247lSQsuXY9++8tAVM+wcjalNG9Ls6vuWN+ItCMCH25EYcGto GNFlrX1M26pibGn9bfBvo7gjBe/PVDMC1z311EjH6d0Rpd6C46nvo7pHGru6V0QS eXmoU43NPFLjqSfdZuZQqoA5AI5EeGFN0hp2lGT+11IejNemBp9LM5TMCBcmecX8 qkVxbyVm5lIFpEcdzIHVwIy965vG0xbbbHUR5FlpGQCLEygxKgGpHL2cd5hatpkv 7SOy72PzYnBi1roMdmM3HDUAv8PNFf5BGF4+tQzJHdCU+ovRBRzgpl30LBhawER8 YIORnawS0x5QgrzkGS95lepvJqRIuNDw5ItenVOgs4HfFBjVtl/suJ2Hs9otJqJc qmV5p2yIWicjo3pJJBcmEo1Z6trQ3FEsKBy1CnDa00VBUCBuw2jwBuwIZIEW03Ds WsB/TANO1trIieBDQSgitOJHYUv2o9dLz31sK/8xe+FZGoB7mSMN0sSnYxs86foZ NdRImpSFeNSUONEs2qrhs18pR2AJXY3u7JA+eFUa/6hxayOGxE0J7jWSuCoKzFmJ jT0uLWisKVRbBrBqZIcOP1fCOHIg+E9RuEGj2dn2SbHoiL4lhJvNfF10SacfdwLA dQBWr6TwkjaP1UsCgr5e =Wo+5 -----END PGP SIGNATURE----- --Sig_/kjHVBc/l42B4OmzqX3jFXDc--