phy: qcom-qmp-usb: add support for updated qcm2290 / sm6115 binding

Add support for the new qcm2290 / sm6115 binding.

The USB QMP phy on these devices supports 2 lanes. Note that the
binding now does not describe every register subregion and instead
the driver holds the corresponding offsets.

While at it also include support for PCS_MISC region which was left
out earlier.

Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org>
Link: https://lore.kernel.org/r/20230516150511.2346357-3-bhupesh.sharma@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
index 6f2798bbe513c975a3c34f68a447bdb52b8190da..466f0a56c82e1da6de8d78771d1c57c66c8e9496 100644 (file)
--- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
@@ -1513,9 +1513,13 @@ static const struct qmp_phy_init_tbl sa8775p_usb3_uniphy_pcs_tbl[] = {
 struct qmp_usb_offsets {
        u16 serdes;
        u16 pcs;
+       u16 pcs_misc;
        u16 pcs_usb;
        u16 tx;
        u16 rx;
+       /* for PHYs with >= 2 lanes */
+       u16 tx2;
+       u16 rx2;
 };
 
 /* struct qmp_phy_cfg - per-PHY initialization config */
@@ -1668,6 +1672,16 @@ static const struct qmp_usb_offsets qmp_usb_offsets_ipq9574 = {
        .rx             = 0x400,
 };
 
+static const struct qmp_usb_offsets qmp_usb_offsets_v3 = {
+       .serdes         = 0,
+       .pcs            = 0xc00,
+       .pcs_misc       = 0xa00,
+       .tx             = 0x200,
+       .rx             = 0x400,
+       .tx2            = 0x600,
+       .rx2            = 0x800,
+};
+
 static const struct qmp_usb_offsets qmp_usb_offsets_v5 = {
        .serdes         = 0,
        .pcs            = 0x0200,
@@ -2076,6 +2090,8 @@ static const struct qmp_phy_cfg sm8350_usb3_uniphy_cfg = {
 static const struct qmp_phy_cfg qcm2290_usb3phy_cfg = {
        .lanes                  = 2,
 
+       .offsets                = &qmp_usb_offsets_v3,
+
        .serdes_tbl             = qcm2290_usb3_serdes_tbl,
        .serdes_tbl_num         = ARRAY_SIZE(qcm2290_usb3_serdes_tbl),
        .tx_tbl                 = qcm2290_usb3_tx_tbl,
@@ -2647,10 +2663,16 @@ static int qmp_usb_parse_dt(struct qmp_usb *qmp)
 
        qmp->serdes = base + offs->serdes;
        qmp->pcs = base + offs->pcs;
+       qmp->pcs_misc = base + offs->pcs_misc;
        qmp->pcs_usb = base + offs->pcs_usb;
        qmp->tx = base + offs->tx;
        qmp->rx = base + offs->rx;
 
+       if (cfg->lanes >= 2) {
+               qmp->tx2 = base + offs->tx2;
+               qmp->rx2 = base + offs->rx2;
+       }
+
        qmp->pipe_clk = devm_clk_get(dev, "pipe");
        if (IS_ERR(qmp->pipe_clk)) {
                return dev_err_probe(dev, PTR_ERR(qmp->pipe_clk),