Commit f74c35b6 authored by Mantas Pucka's avatar Mantas Pucka Committed by Vinod Koul
Browse files

phy: qcom-qmp-usb: fix register offsets for ipq8074/ipq6018



Commit 2be22aae ("phy: qcom-qmp-usb: populate offsets configuration")
introduced register offsets to the driver but for ipq8074/ipq6018 they do
not match what was in the old style device tree. Example from old
ipq6018.dtsi:

<0x00078200 0x130>,     /* Tx */
<0x00078400 0x200>,     /* Rx */
<0x00078800 0x1f8>,     /* PCS */
<0x00078600 0x044>;     /* PCS misc */

which would translate to:
{.., .pcs = 0x800, .pcs_misc = 0x600, .tx = 0x200, .rx = 0x400 }

but was translated to:
{.., .pcs = 0x600, .tx = 0x200, .rx = 0x400 }

So split usb_offsets and fix USB initialization for IPQ8074 and IPQ6018.
Tested only on IPQ6018

Fixes: 2be22aae ("phy: qcom-qmp-usb: populate offsets configuration")
Signed-off-by: default avatarMantas Pucka <mantas@8devices.com>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/1706026160-17520-2-git-send-email-mantas@8devices.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 6613476e
Loading
Loading
Loading
Loading
+9 −1
Original line number Diff line number Diff line
@@ -1556,6 +1556,14 @@ static const char * const qmp_phy_vreg_l[] = {
	"vdda-phy", "vdda-pll",
};

static const struct qmp_usb_offsets qmp_usb_offsets_ipq8074 = {
	.serdes		= 0,
	.pcs		= 0x800,
	.pcs_misc	= 0x600,
	.tx		= 0x200,
	.rx		= 0x400,
};

static const struct qmp_usb_offsets qmp_usb_offsets_ipq9574 = {
	.serdes		= 0,
	.pcs		= 0x800,
@@ -1616,7 +1624,7 @@ static const struct qmp_usb_offsets qmp_usb_offsets_v7 = {
static const struct qmp_phy_cfg ipq8074_usb3phy_cfg = {
	.lanes			= 1,

	.offsets		= &qmp_usb_offsets_v3,
	.offsets		= &qmp_usb_offsets_ipq8074,

	.serdes_tbl		= ipq8074_usb3_serdes_tbl,
	.serdes_tbl_num		= ARRAY_SIZE(ipq8074_usb3_serdes_tbl),