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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 25 Sep 2023 13:16:07 +1000

Hi all,

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

  drivers/phy/qualcomm/phy-qcom-qmp-usb.c

between commit:

  c599dc5cca4d ("phy: qcom-qmp-usb: split PCS_USB init table for sc8280xp and sa8775p")

from the phy tree and commits:

  7233090aba54 ("phy: qcom-qmp-usb: simplify clock handling")
  fcf63482f6a9 ("phy: qcom-qmp-usb: rework reset handling")

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-qmp-usb.c
index c69577601ae0,2a094f2345f0..000000000000
--- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
@@@ -1389,12 -1378,6 +1384,10 @@@ static const struct qmp_phy_cfg sa8775p
  	.rx_tbl_num		= ARRAY_SIZE(sc8280xp_usb3_uniphy_rx_tbl),
  	.pcs_tbl		= sa8775p_usb3_uniphy_pcs_tbl,
  	.pcs_tbl_num		= ARRAY_SIZE(sa8775p_usb3_uniphy_pcs_tbl),
 +	.pcs_usb_tbl		= sa8775p_usb3_uniphy_pcs_usb_tbl,
 +	.pcs_usb_tbl_num	= ARRAY_SIZE(sa8775p_usb3_uniphy_pcs_usb_tbl),
 +	.clk_list		= qmp_v4_phy_clk_l,
 +	.num_clks		= ARRAY_SIZE(qmp_v4_phy_clk_l),
- 	.reset_list		= qcm2290_usb3phy_reset_l,
- 	.num_resets		= ARRAY_SIZE(qcm2290_usb3phy_reset_l),
  	.vreg_list		= qmp_phy_vreg_l,
  	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),
  	.regs			= qmp_v5_usb3phy_regs_layout,
@@@ -1413,12 -1396,6 +1406,10 @@@ static const struct qmp_phy_cfg sc8280x
  	.rx_tbl_num		= ARRAY_SIZE(sc8280xp_usb3_uniphy_rx_tbl),
  	.pcs_tbl		= sc8280xp_usb3_uniphy_pcs_tbl,
  	.pcs_tbl_num		= ARRAY_SIZE(sc8280xp_usb3_uniphy_pcs_tbl),
 +	.pcs_usb_tbl		= sc8280xp_usb3_uniphy_pcs_usb_tbl,
 +	.pcs_usb_tbl_num	= ARRAY_SIZE(sc8280xp_usb3_uniphy_pcs_usb_tbl),
 +	.clk_list		= qmp_v4_phy_clk_l,
 +	.num_clks		= ARRAY_SIZE(qmp_v4_phy_clk_l),
- 	.reset_list		= qcm2290_usb3phy_reset_l,
- 	.num_resets		= ARRAY_SIZE(qcm2290_usb3phy_reset_l),
  	.vreg_list		= qmp_phy_vreg_l,
  	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),
  	.regs			= qmp_v5_usb3phy_regs_layout,