phy: qcom-qmp-pcie: fix resource mapping for SDM845 QHP PHY
authorDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Mon, 26 Sep 2022 17:25:14 +0000 (20:25 +0300)
committerVinod Koul <vkoul@kernel.org>
Thu, 29 Sep 2022 06:25:01 +0000 (11:55 +0530)
On SDM845 one of PCIe PHYs (the QHP one) has the same region for TX and
RX registers. Since the commit 4be26f695ffa ("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: 4be26f695ffa ("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>
drivers/phy/qualcomm/phy-qcom-qmp-pcie.c

index 7aff3f9940a59f6fbcf29033be43f5bc74bbd8ce..5be5348fbb26b023039e254451045c6ce0af6b8e 100644 (file)
@@ -2210,7 +2210,10 @@ static int qmp_pcie_create(struct device *dev, struct device_node *np, int id,
        if (IS_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))
                return PTR_ERR(qphy->rx);