Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
phy: qcom-qmp-usb: fix regs layout arrays
Drop qcm2290_usb3phy_regs_layout, it is a duplicate of
qmp_v3_usb3phy_regs_layout. Introduce qmp_v5_usb3phy_regs_layout to be
used for sm8350 and sc8280xp.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20221110192248.873973-13-dmitry.baryshkov@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
authored by
Dmitry Baryshkov
and committed by
Vinod Koul
14d98d3b
83cb72b4
+13
-11
+13
-11
drivers/phy/qualcomm/phy-qcom-qmp-usb.c
+13
-11
drivers/phy/qualcomm/phy-qcom-qmp-usb.c
···
125
125
[QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR] = QPHY_V4_PCS_USB3_LFPS_RXTERM_IRQ_CLEAR,
126
126
};
127
127
128
-
static const unsigned int qcm2290_usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = {
129
-
[QPHY_SW_RESET] = QPHY_V3_PCS_SW_RESET,
130
-
[QPHY_PCS_POWER_DOWN_CONTROL] = QPHY_V3_PCS_POWER_DOWN_CONTROL,
131
-
[QPHY_START_CTRL] = QPHY_V3_PCS_START_CONTROL,
132
-
[QPHY_PCS_AUTONOMOUS_MODE_CTRL] = QPHY_V3_PCS_AUTONOMOUS_MODE_CTRL,
133
-
[QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR] = QPHY_V3_PCS_LFPS_RXTERM_IRQ_CLEAR,
134
-
[QPHY_PCS_STATUS] = QPHY_V3_PCS_PCS_STATUS,
128
+
static const unsigned int qmp_v5_usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = {
129
+
[QPHY_SW_RESET] = QPHY_V5_PCS_SW_RESET,
130
+
[QPHY_START_CTRL] = QPHY_V5_PCS_START_CONTROL,
131
+
[QPHY_PCS_STATUS] = QPHY_V5_PCS_PCS_STATUS1,
132
+
[QPHY_PCS_POWER_DOWN_CONTROL] = QPHY_V5_PCS_POWER_DOWN_CONTROL,
133
+
134
+
/* In PCS_USB */
135
+
[QPHY_PCS_AUTONOMOUS_MODE_CTRL] = QPHY_V5_PCS_USB3_AUTONOMOUS_MODE_CTRL,
136
+
[QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR] = QPHY_V5_PCS_USB3_LFPS_RXTERM_IRQ_CLEAR,
135
137
};
136
138
137
139
static const struct qmp_phy_init_tbl ipq8074_usb3_serdes_tbl[] = {
···
1668
1666
.num_resets = ARRAY_SIZE(qcm2290_usb3phy_reset_l),
1669
1667
.vreg_list = qmp_phy_vreg_l,
1670
1668
.num_vregs = ARRAY_SIZE(qmp_phy_vreg_l),
1671
-
.regs = qmp_v4_usb3phy_regs_layout,
1669
+
.regs = qmp_v5_usb3phy_regs_layout,
1672
1670
};
1673
1671
1674
1672
static const struct qmp_phy_cfg qmp_v3_usb3_uniphy_cfg = {
···
1884
1882
.num_resets = ARRAY_SIZE(msm8996_usb3phy_reset_l),
1885
1883
.vreg_list = qmp_phy_vreg_l,
1886
1884
.num_vregs = ARRAY_SIZE(qmp_phy_vreg_l),
1887
-
.regs = qmp_v4_usb3phy_regs_layout,
1885
+
.regs = qmp_v5_usb3phy_regs_layout,
1888
1886
.pcs_usb_offset = 0x300,
1889
1887
1890
1888
.has_pwrdn_delay = true,
···
1910
1908
.num_resets = ARRAY_SIZE(msm8996_usb3phy_reset_l),
1911
1909
.vreg_list = qmp_phy_vreg_l,
1912
1910
.num_vregs = ARRAY_SIZE(qmp_phy_vreg_l),
1913
-
.regs = qmp_v4_usb3phy_regs_layout,
1911
+
.regs = qmp_v5_usb3phy_regs_layout,
1914
1912
.pcs_usb_offset = 0x1000,
1915
1913
1916
1914
.has_pwrdn_delay = true,
···
1933
1931
.num_resets = ARRAY_SIZE(qcm2290_usb3phy_reset_l),
1934
1932
.vreg_list = qmp_phy_vreg_l,
1935
1933
.num_vregs = ARRAY_SIZE(qmp_phy_vreg_l),
1936
-
.regs = qcm2290_usb3phy_regs_layout,
1934
+
.regs = qmp_v3_usb3phy_regs_layout,
1937
1935
};
1938
1936
1939
1937
static void qmp_usb_configure_lane(void __iomem *base,