On 2025/7/31 07:52, Jonas Karlman wrote:
From: Jianwei Zheng <jianwei.zh...@rock-chips.com>

Add support for the PCIe/USB3 combo PHY used in the RK3528 SoC.

Config values are taken from vendor U-Boot linux-6.1-stan-rkr5 tag.

Signed-off-by: Jianwei Zheng <jianwei.zh...@rock-chips.com>
Signed-off-by: Jonas Karlman <jo...@kwiboo.se>
Reviewed-by: Kever Yang <kever.y...@rock-chips.com>

Thanks,
- Kever
---
  .../rockchip/phy-rockchip-naneng-combphy.c    | 102 ++++++++++++++++++
  1 file changed, 102 insertions(+)

diff --git a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c 
b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
index 81195de60bc6..432a8f8e03a0 100644
--- a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
+++ b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
@@ -37,6 +37,7 @@ struct rockchip_combphy_grfcfg {
        struct combphy_reg pipe_rxterm_set;
        struct combphy_reg pipe_txelec_set;
        struct combphy_reg pipe_txcomp_set;
+       struct combphy_reg pipe_clk_24m;
        struct combphy_reg pipe_clk_25m;
        struct combphy_reg pipe_clk_100m;
        struct combphy_reg pipe_phymode_sel;
@@ -245,6 +246,103 @@ static int rockchip_combphy_probe(struct udevice *udev)
        return rockchip_combphy_parse_dt(udev, priv);
  }
+static int rk3528_combphy_cfg(struct rockchip_combphy_priv *priv)
+{
+       const struct rockchip_combphy_grfcfg *cfg = priv->cfg->grfcfg;
+       u32 val;
+
+       switch (priv->mode) {
+       case PHY_TYPE_PCIE:
+               /* Set SSC downward spread spectrum */
+               val = readl(priv->mmio + 0x18);
+               val &= ~GENMASK(5, 4);
+               val |= 0x01 << 4;
+               writel(val, priv->mmio + 0x18);
+
+               param_write(priv->phy_grf, &cfg->con0_for_pcie, true);
+               param_write(priv->phy_grf, &cfg->con1_for_pcie, true);
+               param_write(priv->phy_grf, &cfg->con2_for_pcie, true);
+               param_write(priv->phy_grf, &cfg->con3_for_pcie, true);
+               break;
+       case PHY_TYPE_USB3:
+               /* Set SSC downward spread spectrum */
+               val = readl(priv->mmio + 0x18);
+               val &= ~GENMASK(5, 4);
+               val |= 0x01 << 4;
+               writel(val, priv->mmio + 0x18);
+
+               /* Enable adaptive CTLE for USB3.0 Rx */
+               val = readl(priv->mmio + 0x200);
+               val &= ~GENMASK(17, 17);
+               val |= 0x01 << 17;
+               writel(val, priv->mmio + 0x200);
+
+               /* Set Rx squelch input filler bandwidth */
+               val = readl(priv->mmio + 0x20c);
+               val &= ~GENMASK(2, 0);
+               val |= 0x06;
+               writel(val, priv->mmio + 0x20c);
+
+               param_write(priv->phy_grf, &cfg->pipe_txcomp_sel, false);
+               param_write(priv->phy_grf, &cfg->pipe_txelec_sel, false);
+               param_write(priv->phy_grf, &cfg->usb_mode_set, true);
+               param_write(priv->pipe_grf, &cfg->u3otg0_port_en, true);
+               break;
+       default:
+               dev_err(priv->dev, "incompatible PHY type\n");
+               return -EINVAL;
+       }
+
+       param_write(priv->phy_grf, &cfg->pipe_clk_100m, true);
+
+       if (priv->mode == PHY_TYPE_PCIE) {
+               /* PLL KVCO tuning fine */
+               val = readl(priv->mmio + 0x18);
+               val &= ~(0x7 << 10);
+               val |= 0x2 << 10;
+               writel(val, priv->mmio + 0x18);
+
+               /* su_trim[6:4]=111, [10:7]=1001, [2:0]=000 */
+               val = readl(priv->mmio + 0x108);
+               val &= ~(0x7f7);
+               val |= 0x4f0;
+               writel(val, priv->mmio + 0x108);
+       }
+
+       return 0;
+}
+
+static const struct rockchip_combphy_grfcfg rk3528_combphy_grfcfgs = {
+       /* pipe-phy-grf */
+       .pcie_mode_set          = { 0x0000, 5, 0, 0x00, 0x11 },
+       .usb_mode_set           = { 0x0000, 5, 0, 0x00, 0x04 },
+       .pipe_rxterm_set        = { 0x0000, 12, 12, 0x00, 0x01 },
+       .pipe_txelec_set        = { 0x0004, 1, 1, 0x00, 0x01 },
+       .pipe_txcomp_set        = { 0x0004, 4, 4, 0x00, 0x01 },
+       .pipe_clk_24m           = { 0x0004, 14, 13, 0x00, 0x00 },
+       .pipe_clk_100m          = { 0x0004, 14, 13, 0x00, 0x02 },
+       .pipe_rxterm_sel        = { 0x0008, 8, 8, 0x00, 0x01 },
+       .pipe_txelec_sel        = { 0x0008, 12, 12, 0x00, 0x01 },
+       .pipe_txcomp_sel        = { 0x0008, 15, 15, 0x00, 0x01 },
+       .pipe_clk_ext           = { 0x000c, 9, 8, 0x02, 0x01 },
+       .pipe_phy_status        = { 0x0034, 6, 6, 0x01, 0x00 },
+       .con0_for_pcie          = { 0x0000, 15, 0, 0x00, 0x110 },
+       .con1_for_pcie          = { 0x0004, 15, 0, 0x00, 0x00 },
+       .con2_for_pcie          = { 0x0008, 15, 0, 0x00, 0x101 },
+       .con3_for_pcie          = { 0x000c, 15, 0, 0x00, 0x0200 },
+       /* pipe-grf */
+       .u3otg0_port_en         = { 0x0044, 15, 0, 0x0181, 0x1100 },
+};
+
+static const struct rockchip_combphy_cfg rk3528_combphy_cfgs = {
+       .num_phys = 1,
+       .phy_ids = {
+               0xffdc0000,
+       },
+       .grfcfg         = &rk3528_combphy_grfcfgs,
+       .combphy_cfg    = rk3528_combphy_cfg,
+};
+
  static int rk3568_combphy_cfg(struct rockchip_combphy_priv *priv)
  {
        const struct rockchip_combphy_grfcfg *cfg = priv->cfg->grfcfg;
@@ -503,6 +601,10 @@ static const struct rockchip_combphy_cfg 
rk3588_combphy_cfgs = {
  };
static const struct udevice_id rockchip_combphy_ids[] = {
+       {
+               .compatible = "rockchip,rk3528-naneng-combphy",
+               .data = (ulong)&rk3528_combphy_cfgs
+       },
        {
                .compatible = "rockchip,rk3568-naneng-combphy",
                .data = (ulong)&rk3568_combphy_cfgs

Reply via email to