LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH 1/2] dt-bindings: phy: qcom,qmp-usb3-dp: Add support for sc8180x
@ 2021-07-21 22:56 Bjorn Andersson
  2021-07-21 22:56 ` [PATCH 2/2] phy: qcom: qmp: Add SC8180x USB/DP combo Bjorn Andersson
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Bjorn Andersson @ 2021-07-21 22:56 UTC (permalink / raw)
  To: Andy Gross, Bjorn Andersson, Kishon Vijay Abraham I, Vinod Koul,
	Rob Herring, Manu Gautam
  Cc: linux-arm-msm, linux-phy, devicetree, linux-kernel

The SC8180x has two instances of the QMP USB/DP combo PHYs, add a
compatible for these.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
 Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml b/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
index 217aa6c91893..1d49cc3d4eae 100644
--- a/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
@@ -14,6 +14,7 @@ properties:
   compatible:
     enum:
       - qcom,sc7180-qmp-usb3-dp-phy
+      - qcom,sc8180x-qmp-usb3-dp-phy
       - qcom,sdm845-qmp-usb3-dp-phy
       - qcom,sm8250-qmp-usb3-dp-phy
   reg:
-- 
2.29.2


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 2/2] phy: qcom: qmp: Add SC8180x USB/DP combo
  2021-07-21 22:56 [PATCH 1/2] dt-bindings: phy: qcom,qmp-usb3-dp: Add support for sc8180x Bjorn Andersson
@ 2021-07-21 22:56 ` Bjorn Andersson
  2021-07-29 20:01 ` [PATCH 1/2] dt-bindings: phy: qcom,qmp-usb3-dp: Add support for sc8180x Rob Herring
  2021-08-06 12:07 ` Vinod Koul
  2 siblings, 0 replies; 4+ messages in thread
From: Bjorn Andersson @ 2021-07-21 22:56 UTC (permalink / raw)
  To: Andy Gross, Bjorn Andersson, Kishon Vijay Abraham I, Vinod Koul,
	Manu Gautam
  Cc: Rob Herring, linux-arm-msm, linux-phy, devicetree, linux-kernel

The two USB QMPs are USB/DP compbo PHYs, add the compatible for this
combination to allow DP output.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
 drivers/phy/qualcomm/phy-qcom-qmp.c | 47 +++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
index 2195f8ac393b..5e302830d061 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
@@ -3536,6 +3536,46 @@ static const struct qmp_phy_cfg sc8180x_pciephy_cfg = {
 	.pwrdn_delay_max	= 1005,		/* us */
 };
 
+static const struct qmp_phy_cfg sc8180x_dpphy_cfg = {
+	.type			= PHY_TYPE_DP,
+	.nlanes			= 1,
+
+	.serdes_tbl		= qmp_v4_dp_serdes_tbl,
+	.serdes_tbl_num		= ARRAY_SIZE(qmp_v4_dp_serdes_tbl),
+	.tx_tbl			= qmp_v4_dp_tx_tbl,
+	.tx_tbl_num		= ARRAY_SIZE(qmp_v4_dp_tx_tbl),
+
+	.serdes_tbl_rbr		= qmp_v4_dp_serdes_tbl_rbr,
+	.serdes_tbl_rbr_num	= ARRAY_SIZE(qmp_v4_dp_serdes_tbl_rbr),
+	.serdes_tbl_hbr		= qmp_v4_dp_serdes_tbl_hbr,
+	.serdes_tbl_hbr_num	= ARRAY_SIZE(qmp_v4_dp_serdes_tbl_hbr),
+	.serdes_tbl_hbr2	= qmp_v4_dp_serdes_tbl_hbr2,
+	.serdes_tbl_hbr2_num	= ARRAY_SIZE(qmp_v4_dp_serdes_tbl_hbr2),
+	.serdes_tbl_hbr3	= qmp_v4_dp_serdes_tbl_hbr3,
+	.serdes_tbl_hbr3_num	= ARRAY_SIZE(qmp_v4_dp_serdes_tbl_hbr3),
+
+	.clk_list		= qmp_v3_phy_clk_l,
+	.num_clks		= ARRAY_SIZE(qmp_v3_phy_clk_l),
+	.reset_list		= sc7180_usb3phy_reset_l,
+	.num_resets		= ARRAY_SIZE(sc7180_usb3phy_reset_l),
+	.vreg_list		= qmp_phy_vreg_l,
+	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),
+	.regs			= qmp_v3_usb3phy_regs_layout,
+
+	.has_phy_dp_com_ctrl	= true,
+	.is_dual_lane_phy	= true,
+
+	.dp_aux_init = qcom_qmp_v4_phy_dp_aux_init,
+	.configure_dp_tx = qcom_qmp_v4_phy_configure_dp_tx,
+	.configure_dp_phy = qcom_qmp_v4_phy_configure_dp_phy,
+	.calibrate_dp_phy = qcom_qmp_v4_dp_phy_calibrate,
+};
+
+static const struct qmp_phy_combo_cfg sc8180x_usb3dpphy_cfg = {
+	.usb_cfg		= &sm8150_usb3phy_cfg,
+	.dp_cfg			= &sc8180x_dpphy_cfg,
+};
+
 static const struct qmp_phy_cfg sm8150_usb3_uniphy_cfg = {
 	.type			= PHY_TYPE_USB3,
 	.nlanes			= 1,
@@ -5377,6 +5417,9 @@ static const struct of_device_id qcom_qmp_phy_of_match_table[] = {
 	}, {
 		.compatible = "qcom,sc8180x-qmp-usb3-phy",
 		.data = &sm8150_usb3phy_cfg,
+	}, {
+		.compatible = "qcom,sc8180x-qmp-usb3-dp-phy",
+		/* It's a combo phy */
 	}, {
 		.compatible = "qcom,sdm845-qhp-pcie-phy",
 		.data = &sdm845_qhp_pciephy_cfg,
@@ -5454,6 +5497,10 @@ static const struct of_device_id qcom_qmp_combo_phy_of_match_table[] = {
 		.compatible = "qcom,sm8250-qmp-usb3-dp-phy",
 		.data = &sm8250_usb3dpphy_cfg,
 	},
+	{
+		.compatible = "qcom,sc8180x-qmp-usb3-dp-phy",
+		.data = &sc8180x_usb3dpphy_cfg,
+	},
 	{ }
 };
 
-- 
2.29.2


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] dt-bindings: phy: qcom,qmp-usb3-dp: Add support for sc8180x
  2021-07-21 22:56 [PATCH 1/2] dt-bindings: phy: qcom,qmp-usb3-dp: Add support for sc8180x Bjorn Andersson
  2021-07-21 22:56 ` [PATCH 2/2] phy: qcom: qmp: Add SC8180x USB/DP combo Bjorn Andersson
@ 2021-07-29 20:01 ` Rob Herring
  2021-08-06 12:07 ` Vinod Koul
  2 siblings, 0 replies; 4+ messages in thread
From: Rob Herring @ 2021-07-29 20:01 UTC (permalink / raw)
  To: Bjorn Andersson
  Cc: Manu Gautam, Vinod Koul, Andy Gross, devicetree,
	Kishon Vijay Abraham I, linux-phy, Rob Herring, linux-arm-msm,
	linux-kernel

On Wed, 21 Jul 2021 15:56:29 -0700, Bjorn Andersson wrote:
> The SC8180x has two instances of the QMP USB/DP combo PHYs, add a
> compatible for these.
> 
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---
>  Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml | 1 +
>  1 file changed, 1 insertion(+)
> 

Acked-by: Rob Herring <robh@kernel.org>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] dt-bindings: phy: qcom,qmp-usb3-dp: Add support for sc8180x
  2021-07-21 22:56 [PATCH 1/2] dt-bindings: phy: qcom,qmp-usb3-dp: Add support for sc8180x Bjorn Andersson
  2021-07-21 22:56 ` [PATCH 2/2] phy: qcom: qmp: Add SC8180x USB/DP combo Bjorn Andersson
  2021-07-29 20:01 ` [PATCH 1/2] dt-bindings: phy: qcom,qmp-usb3-dp: Add support for sc8180x Rob Herring
@ 2021-08-06 12:07 ` Vinod Koul
  2 siblings, 0 replies; 4+ messages in thread
From: Vinod Koul @ 2021-08-06 12:07 UTC (permalink / raw)
  To: Bjorn Andersson
  Cc: Andy Gross, Kishon Vijay Abraham I, Rob Herring, Manu Gautam,
	linux-arm-msm, linux-phy, devicetree, linux-kernel

On 21-07-21, 15:56, Bjorn Andersson wrote:
> The SC8180x has two instances of the QMP USB/DP combo PHYs, add a
> compatible for these.

Applied all, thanks

-- 
~Vinod

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-08-06 12:07 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-21 22:56 [PATCH 1/2] dt-bindings: phy: qcom,qmp-usb3-dp: Add support for sc8180x Bjorn Andersson
2021-07-21 22:56 ` [PATCH 2/2] phy: qcom: qmp: Add SC8180x USB/DP combo Bjorn Andersson
2021-07-29 20:01 ` [PATCH 1/2] dt-bindings: phy: qcom,qmp-usb3-dp: Add support for sc8180x Rob Herring
2021-08-06 12:07 ` Vinod Koul

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).