UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

phy: qcom-qmp-pcie: fix resource mapping for SDM845 QHP PHY 

On SDM845 one of PCIe PHYs (the QHP one) has the same region for TX and
RX registers. Since the commit 4be26f695f ("phy: qcom-qmp-pcie: fix
memleak on probe deferral") added checking that resources are not
allocated beforehand, this PHY can not be probed anymore. Fix this by
skipping the map of ->rx resource on the QHP PHY and assign it manually.

Fixes: 4be26f695f ("phy: qcom-qmp-pcie: fix memleak on probe deferral")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20220926172514.880776-1-dmitry.baryshkov@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Dmitry Baryshkov 2022-09-26 20:25:14 +03:00 committed by Vinod Koul
parent 37d40a2147
commit 0a40891b83
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
View File

@ -2210,7 +2210,10 @@ static int qmp_pcie_create(struct device *dev, struct device_node *np, int id,
if (IS_ERR(qphy->tx)) if (IS_ERR(qphy->tx))
return PTR_ERR(qphy->tx); return PTR_ERR(qphy->tx);
qphy->rx = devm_of_iomap(dev, np, 1, NULL); if (of_device_is_compatible(dev->of_node, "qcom,sdm845-qhp-pcie-phy"))
qphy->rx = qphy->tx;
else
qphy->rx = devm_of_iomap(dev, np, 1, NULL);
if (IS_ERR(qphy->rx)) if (IS_ERR(qphy->rx))
return PTR_ERR(qphy->rx); return PTR_ERR(qphy->rx);