From: Vinod Koul <vkoul@kernel.org>
Date: Fri, 13 Oct 2023 09:59:08 +0000 (+0530)
Subject: Merge branch 'fixes' into next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9bcf8761190fe87808bcd2aef96c8378088731fc;p=linux.git

Merge branch 'fixes' into next

Merge fixes into next as qmp phy patches on list depend on it
---

9bcf8761190fe87808bcd2aef96c8378088731fc
diff --cc drivers/phy/qualcomm/phy-qcom-m31.c
index d5af4dde6960b,5cb7e79b99b3f..c2590579190a9
--- a/drivers/phy/qualcomm/phy-qcom-m31.c
+++ b/drivers/phy/qualcomm/phy-qcom-m31.c
@@@ -82,51 -82,7 +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,
diff --cc drivers/phy/qualcomm/phy-qcom-qmp-usb.c
index 2a094f2345f0f,c69577601ae00..02f156298e77c
--- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
@@@ -1378,6 -1389,12 +1384,8 @@@ 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,
@@@ -1396,6 -1413,12 +1404,8 @@@ 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,