Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32;
Date:   Mon, 25 Sep 2023 13:10:22 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Kishon Vijay Abraham I <kishon@kernel.org>,
        Vinod Koul <vkoul@kernel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Nitheesh Sekar <quic_nsekar@quicinc.com>,
        Varadarajan Narayanan <quic_varada@quicinc.com>,
        Yang Yingliang <yangyingliang@huawei.com>
Subject: linux-next: manual merge of the phy-next tree with the phy tree
Message-ID: <20230925131022.24514a20@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/0wkbNgTbgeFWE5oiS0GhEkf";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/0wkbNgTbgeFWE5oiS0GhEkf
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the phy-next tree got a conflict in:

  drivers/phy/qualcomm/phy-qcom-m31.c

between commits:

  5f7cd740a6b6 ("phy: qcom: phy-qcom-m31: fix wrong pointer pass to PTR_ERR=
()")
  426e05ce126e ("phy: qcom: phy-qcom-m31: change m31_ipq5332_regs to static=
")

from the phy tree and commits:

  90f7af497a78 ("phy: qcom: m31: Fix indentation issues")
  68320e35f8cb ("phy: qcom-m31: Add compatible, phy init sequence for IPQ50=
18")

from the phy-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/phy/qualcomm/phy-qcom-m31.c
index 5cb7e79b99b3,d5af4dde6960..000000000000
--- a/drivers/phy/qualcomm/phy-qcom-m31.c
+++ b/drivers/phy/qualcomm/phy-qcom-m31.c
@@@ -82,7 -82,51 +82,51 @@@ struct m31_priv_data=20
  	unsigned int			nregs;
  };
 =20
+ static const struct m31_phy_regs m31_ipq5018_regs[] =3D {
+ 	{
+ 		.off =3D USB_PHY_CFG0,
+ 		.val =3D UTMI_PHY_OVERRIDE_EN
+ 	},
+ 	{
+ 		.off =3D USB_PHY_UTMI_CTRL5,
+ 		.val =3D POR_EN,
+ 		.delay =3D 15
+ 	},
+ 	{
+ 		.off =3D USB_PHY_FSEL_SEL,
+ 		.val =3D FREQ_SEL
+ 	},
+ 	{
+ 		.off =3D USB_PHY_HS_PHY_CTRL_COMMON0,
+ 		.val =3D COMMONONN | FSEL | RETENABLEN
+ 	},
+ 	{
+ 		.off =3D USB_PHY_REFCLK_CTRL,
+ 		.val =3D CLKCORE
+ 	},
+ 	{
+ 		.off =3D USB_PHY_UTMI_CTRL5,
+ 		.val =3D POR_EN
+ 	},
+ 	{
+ 		.off =3D USB_PHY_HS_PHY_CTRL2,
+ 		.val =3D USB2_SUSPEND_N_SEL | USB2_SUSPEND_N | USB2_UTMI_CLK_EN
+ 	},
+ 	{
+ 		.off =3D USB_PHY_UTMI_CTRL5,
+ 		.val =3D 0x0
+ 	},
+ 	{
+ 		.off =3D USB_PHY_HS_PHY_CTRL2,
+ 		.val =3D USB2_SUSPEND_N | USB2_UTMI_CLK_EN
+ 	},
+ 	{
+ 		.off =3D USB_PHY_CFG0,
+ 		.val =3D 0x0
+ 	},
+ };
+=20
 -struct m31_phy_regs m31_ipq5332_regs[] =3D {
 +static struct m31_phy_regs m31_ipq5332_regs[] =3D {
  	{
  		USB_PHY_CFG0,
  		UTMI_PHY_OVERRIDE_EN,
@@@ -255,8 -300,8 +299,8 @@@ static int m31usb_phy_probe(struct plat
 =20
  	qphy->vreg =3D devm_regulator_get(dev, "vdda-phy");
  	if (IS_ERR(qphy->vreg))
 -		return dev_err_probe(dev, PTR_ERR(qphy->phy),
 +		return dev_err_probe(dev, PTR_ERR(qphy->vreg),
- 						"failed to get vreg\n");
+ 				     "failed to get vreg\n");
 =20
  	phy_set_drvdata(qphy->phy, qphy);
 =20

--Sig_/0wkbNgTbgeFWE5oiS0GhEkf
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUQ+h4ACgkQAVBC80lX
0Gw2YQgAnIA6YZw/L0WV/2R6KAyIftzDe0JQ8+jKvxyLpb5nG11KrAmlqGLz2bVO
YY3s5jzaTc3cqfnkddrIZ05P4DD+Wex041iXIdWKEV2MWYvcXHue+8wLHrbQyN0+
M9MP1KI+TWxtci+uO4YdO8pfeWyd1i6h6HMXyN27HPgXDzLGkW6tgFCQH8QZIKQo
0l+G5acgoEQg08HvYxMyT51Ttzlf00tSo8iJxC2/p/zud87xJsmGrcsCgJoQxaUv
0/MVcM8P5YtM3t+CmkAC986yHhr4emq8+KitGkavMfXulTR5UtmZWSFhPG77i94J
aPli9UIdYvNcKCokJwiVZnrjI9yWMg==
=Dt8D
-----END PGP SIGNATURE-----

--Sig_/0wkbNgTbgeFWE5oiS0GhEkf--