linux-next: manual merge of the phy-next tree with the phy tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

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 IPQ5018")

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.

-- 
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 
  	unsigned int			nregs;
  };
  
+ static const struct m31_phy_regs m31_ipq5018_regs[] = {
+ 	{
+ 		.off = USB_PHY_CFG0,
+ 		.val = UTMI_PHY_OVERRIDE_EN
+ 	},
+ 	{
+ 		.off = USB_PHY_UTMI_CTRL5,
+ 		.val = POR_EN,
+ 		.delay = 15
+ 	},
+ 	{
+ 		.off = USB_PHY_FSEL_SEL,
+ 		.val = FREQ_SEL
+ 	},
+ 	{
+ 		.off = USB_PHY_HS_PHY_CTRL_COMMON0,
+ 		.val = COMMONONN | FSEL | RETENABLEN
+ 	},
+ 	{
+ 		.off = USB_PHY_REFCLK_CTRL,
+ 		.val = CLKCORE
+ 	},
+ 	{
+ 		.off = USB_PHY_UTMI_CTRL5,
+ 		.val = POR_EN
+ 	},
+ 	{
+ 		.off = USB_PHY_HS_PHY_CTRL2,
+ 		.val = USB2_SUSPEND_N_SEL | USB2_SUSPEND_N | USB2_UTMI_CLK_EN
+ 	},
+ 	{
+ 		.off = USB_PHY_UTMI_CTRL5,
+ 		.val = 0x0
+ 	},
+ 	{
+ 		.off = USB_PHY_HS_PHY_CTRL2,
+ 		.val = USB2_SUSPEND_N | USB2_UTMI_CLK_EN
+ 	},
+ 	{
+ 		.off = USB_PHY_CFG0,
+ 		.val = 0x0
+ 	},
+ };
+ 
 -struct m31_phy_regs m31_ipq5332_regs[] = {
 +static struct m31_phy_regs m31_ipq5332_regs[] = {
  	{
  		USB_PHY_CFG0,
  		UTMI_PHY_OVERRIDE_EN,
@@@ -255,8 -300,8 +299,8 @@@ static int m31usb_phy_probe(struct plat
  
  	qphy->vreg = 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");
  
  	phy_set_drvdata(qphy->phy, qphy);

Attachment: pgpEdv6JXvfWc.pgp
Description: OpenPGP digital signature