mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 10:08:59 +00:00
85844cfc5c
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.60 Removed upstreamed: generic/backport-6.6/409-mtd-spi-nor-winbond-fix-w25q128-regression.patch All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.60&id=27a58a19bd20a7afe369da2ce6d4ebea70768acd Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/glinet_gl-mt6000, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Run-tested: x86/64/AMD Cezanne, flogic/glinet_gl-mt6000, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/16892 Signed-off-by: Nick Hainke <vincent@systemli.org>
59 lines
2.2 KiB
Diff
59 lines
2.2 KiB
Diff
From 62a5df451ab911421da96655fcc4d1e269ff6e2f Mon Sep 17 00:00:00 2001
|
|
From: Mantas Pucka <mantas@8devices.com>
|
|
Date: Tue, 23 Jan 2024 18:09:20 +0200
|
|
Subject: [PATCH] phy: qcom-qmp-usb: fix serdes init sequence for IPQ6018
|
|
|
|
Commit 23fd679249df ("phy: qcom-qmp: add USB3 PHY support for IPQ6018")
|
|
noted that IPQ6018 init is identical to IPQ8074. Yet downstream uses
|
|
separate serdes init sequence for IPQ6018. Since already existing IPQ9574
|
|
serdes init sequence is identical, just reuse it and fix failing USB3 mode
|
|
in IPQ6018.
|
|
|
|
Fixes: 23fd679249df ("phy: qcom-qmp: add USB3 PHY support for IPQ6018")
|
|
Signed-off-by: Mantas Pucka <mantas@8devices.com>
|
|
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
|
|
Link: https://lore.kernel.org/r/1706026160-17520-3-git-send-email-mantas@8devices.com
|
|
Signed-off-by: Vinod Koul <vkoul@kernel.org>
|
|
---
|
|
drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 20 +++++++++++++++++++-
|
|
1 file changed, 19 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
|
|
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
|
|
@@ -1314,6 +1314,26 @@ static const struct qmp_usb_offsets qmp_
|
|
.rx = 0x1000,
|
|
};
|
|
|
|
+static const struct qmp_phy_cfg ipq6018_usb3phy_cfg = {
|
|
+ .lanes = 1,
|
|
+
|
|
+ .serdes_tbl = ipq9574_usb3_serdes_tbl,
|
|
+ .serdes_tbl_num = ARRAY_SIZE(ipq9574_usb3_serdes_tbl),
|
|
+ .tx_tbl = msm8996_usb3_tx_tbl,
|
|
+ .tx_tbl_num = ARRAY_SIZE(msm8996_usb3_tx_tbl),
|
|
+ .rx_tbl = ipq8074_usb3_rx_tbl,
|
|
+ .rx_tbl_num = ARRAY_SIZE(ipq8074_usb3_rx_tbl),
|
|
+ .pcs_tbl = ipq8074_usb3_pcs_tbl,
|
|
+ .pcs_tbl_num = ARRAY_SIZE(ipq8074_usb3_pcs_tbl),
|
|
+ .clk_list = msm8996_phy_clk_l,
|
|
+ .num_clks = ARRAY_SIZE(msm8996_phy_clk_l),
|
|
+ .reset_list = msm8996_usb3phy_reset_l,
|
|
+ .num_resets = ARRAY_SIZE(msm8996_usb3phy_reset_l),
|
|
+ .vreg_list = qmp_phy_vreg_l,
|
|
+ .num_vregs = ARRAY_SIZE(qmp_phy_vreg_l),
|
|
+ .regs = qmp_v3_usb3phy_regs_layout,
|
|
+};
|
|
+
|
|
static const struct qmp_phy_cfg ipq8074_usb3phy_cfg = {
|
|
.lanes = 1,
|
|
|
|
@@ -2239,7 +2259,7 @@ err_node_put:
|
|
static const struct of_device_id qmp_usb_of_match_table[] = {
|
|
{
|
|
.compatible = "qcom,ipq6018-qmp-usb3-phy",
|
|
- .data = &ipq8074_usb3phy_cfg,
|
|
+ .data = &ipq6018_usb3phy_cfg,
|
|
}, {
|
|
.compatible = "qcom,ipq8074-qmp-usb3-phy",
|
|
.data = &ipq8074_usb3phy_cfg,
|