* [PATCH v2 1/2] dt-bindings: phy: rockchip: add rk3576 compatible @ 2024-10-16 2:35 Frank Wang 2024-10-16 2:35 ` [PATCH v2 2/2] phy: rockchip-naneng-combo: Support rk3576 Frank Wang 0 siblings, 1 reply; 4+ messages in thread From: Frank Wang @ 2024-10-16 2:35 UTC (permalink / raw) To: vkoul, kishon, robh, krzk+dt, conor+dt, heiko Cc: linux-phy, devicetree, linux-arm-kernel, linux-kernel, linux-rockchip, william.wu, tim.chen, Frank Wang From: Frank Wang <frank.wang@rock-chips.com> Adds the compatible line to support RK3576 SoC. Signed-off-by: Frank Wang <frank.wang@rock-chips.com> Reviewed-by: Heiko Stuebner <heiko@sntech.de> Acked-by: Rob Herring (Arm) <robh@kernel.org> --- Changelog: v2: - add Reviewed and Acked tag. v1: - https://patchwork.kernel.org/project/linux-phy/patch/20241015013351.4884-1-frawang.cn@gmail.com/ .../devicetree/bindings/phy/phy-rockchip-naneng-combphy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/phy/phy-rockchip-naneng-combphy.yaml b/Documentation/devicetree/bindings/phy/phy-rockchip-naneng-combphy.yaml index d3cd7997879f7..1b3de6678c087 100644 --- a/Documentation/devicetree/bindings/phy/phy-rockchip-naneng-combphy.yaml +++ b/Documentation/devicetree/bindings/phy/phy-rockchip-naneng-combphy.yaml @@ -13,6 +13,7 @@ properties: compatible: enum: - rockchip,rk3568-naneng-combphy + - rockchip,rk3576-naneng-combphy - rockchip,rk3588-naneng-combphy reg: -- 2.25.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 2/2] phy: rockchip-naneng-combo: Support rk3576 2024-10-16 2:35 [PATCH v2 1/2] dt-bindings: phy: rockchip: add rk3576 compatible Frank Wang @ 2024-10-16 2:35 ` Frank Wang 2024-10-17 14:34 ` Vinod Koul 0 siblings, 1 reply; 4+ messages in thread From: Frank Wang @ 2024-10-16 2:35 UTC (permalink / raw) To: vkoul, kishon, robh, krzk+dt, conor+dt, heiko Cc: linux-phy, devicetree, linux-arm-kernel, linux-kernel, linux-rockchip, william.wu, tim.chen, Kever Yang, Frank Wang From: Kever Yang <kever.yang@rock-chips.com> phy0: pcie, sata phy1: pcie, sata, usb3 Signed-off-by: Kever Yang <kever.yang@rock-chips.com> Signed-off-by: William Wu <william.wu@rock-chips.com> Signed-off-by: Frank Wang <frank.wang@rock-chips.com> --- Changelog: v2: - using constants macro instead of magic values. - add more comments for PHY tuning operations. v1: - https://patchwork.kernel.org/project/linux-phy/patch/20241015013351.4884-2-frawang.cn@gmail.com/ .../rockchip/phy-rockchip-naneng-combphy.c | 274 ++++++++++++++++++ 1 file changed, 274 insertions(+) diff --git a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c index 0a9989e41237f..25aa8d1981abc 100644 --- a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c +++ b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c @@ -37,6 +37,10 @@ #define PHYREG8 0x1C #define PHYREG8_SSC_EN BIT(4) +#define PHYREG10 0x24 +#define PHYREG10_SSC_PCM_MASK GENMASK(3, 0) +#define PHYREG10_SSC_PCM_3500PPM 7 + #define PHYREG11 0x28 #define PHYREG11_SU_TRIM_0_7 0xF0 @@ -61,12 +65,19 @@ #define PHYREG16 0x3C #define PHYREG16_SSC_CNT_VALUE 0x5f +#define PHYREG17 0x40 + #define PHYREG18 0x44 #define PHYREG18_PLL_LOOP 0x32 +#define PHYREG21 0x50 +#define PHYREG21_RX_SQUELCH_VAL 0x0D + #define PHYREG27 0x6C #define PHYREG27_RX_TRIM_RK3588 0x4C +#define PHYREG30 0x74 + #define PHYREG32 0x7C #define PHYREG32_SSC_MASK GENMASK(7, 4) #define PHYREG32_SSC_DIR_SHIFT 4 @@ -79,6 +90,7 @@ #define PHYREG33_PLL_KVCO_MASK GENMASK(4, 2) #define PHYREG33_PLL_KVCO_SHIFT 2 #define PHYREG33_PLL_KVCO_VALUE 2 +#define PHYREG33_PLL_KVCO_VALUE_RK3576 4 struct rockchip_combphy_priv; @@ -98,6 +110,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; @@ -584,6 +597,263 @@ static const struct rockchip_combphy_cfg rk3568_combphy_cfgs = { .combphy_cfg = rk3568_combphy_cfg, }; +static int rk3576_combphy_cfg(struct rockchip_combphy_priv *priv) +{ + const struct rockchip_combphy_grfcfg *cfg = priv->cfg->grfcfg; + unsigned long rate; + u32 val; + + switch (priv->type) { + case PHY_TYPE_PCIE: + /* Set SSC downward spread spectrum */ + rockchip_combphy_updatel(priv, PHYREG32_SSC_MASK, + PHYREG32_SSC_DOWNWARD << PHYREG32_SSC_DIR_SHIFT, + PHYREG32); + + rockchip_combphy_param_write(priv->phy_grf, &cfg->con0_for_pcie, true); + rockchip_combphy_param_write(priv->phy_grf, &cfg->con1_for_pcie, true); + rockchip_combphy_param_write(priv->phy_grf, &cfg->con2_for_pcie, true); + rockchip_combphy_param_write(priv->phy_grf, &cfg->con3_for_pcie, true); + break; + case PHY_TYPE_USB3: + /* Set SSC downward spread spectrum */ + rockchip_combphy_updatel(priv, PHYREG32_SSC_MASK, + PHYREG32_SSC_DOWNWARD << PHYREG32_SSC_DIR_SHIFT, + PHYREG32); + + /* Enable adaptive CTLE for USB3.0 Rx */ + val = readl(priv->mmio + PHYREG15); + val |= PHYREG15_CTLE_EN; + writel(val, priv->mmio + PHYREG15); + + /* Set PLL KVCO fine tuning signals */ + rockchip_combphy_updatel(priv, PHYREG33_PLL_KVCO_MASK, BIT(3), PHYREG33); + + /* Set PLL LPF R1 to su_trim[10:7]=1001 */ + writel(PHYREG12_PLL_LPF_ADJ_VALUE, priv->mmio + PHYREG12); + + /* Set PLL input clock divider 1/2 */ + rockchip_combphy_updatel(priv, PHYREG6_PLL_DIV_MASK, + PHYREG6_PLL_DIV_2 << PHYREG6_PLL_DIV_SHIFT, + PHYREG6); + + /* Set PLL loop divider */ + writel(PHYREG18_PLL_LOOP, priv->mmio + PHYREG18); + + /* Set PLL KVCO to min and set PLL charge pump current to max */ + writel(PHYREG11_SU_TRIM_0_7, priv->mmio + PHYREG11); + + /* Set Rx squelch input filler bandwidth */ + writel(PHYREG21_RX_SQUELCH_VAL, priv->mmio + PHYREG21); + + rockchip_combphy_param_write(priv->phy_grf, &cfg->pipe_txcomp_sel, false); + rockchip_combphy_param_write(priv->phy_grf, &cfg->pipe_txelec_sel, false); + rockchip_combphy_param_write(priv->phy_grf, &cfg->usb_mode_set, true); + break; + case PHY_TYPE_SATA: + /* Enable adaptive CTLE for SATA Rx */ + val = readl(priv->mmio + PHYREG15); + val |= PHYREG15_CTLE_EN; + writel(val, priv->mmio + PHYREG15); + + /* Set tx_rterm = 50 ohm and rx_rterm = 43.5 ohm */ + val = PHYREG7_TX_RTERM_50OHM << PHYREG7_TX_RTERM_SHIFT; + val |= PHYREG7_RX_RTERM_44OHM << PHYREG7_RX_RTERM_SHIFT; + writel(val, priv->mmio + PHYREG7); + + rockchip_combphy_param_write(priv->phy_grf, &cfg->con0_for_sata, true); + rockchip_combphy_param_write(priv->phy_grf, &cfg->con1_for_sata, true); + rockchip_combphy_param_write(priv->phy_grf, &cfg->con2_for_sata, true); + rockchip_combphy_param_write(priv->phy_grf, &cfg->con3_for_sata, true); + rockchip_combphy_param_write(priv->pipe_grf, &cfg->pipe_con0_for_sata, true); + rockchip_combphy_param_write(priv->pipe_grf, &cfg->pipe_con1_for_sata, true); + break; + default: + dev_err(priv->dev, "incompatible PHY type\n"); + return -EINVAL; + } + + rate = clk_get_rate(priv->refclk); + + switch (rate) { + case REF_CLOCK_24MHz: + rockchip_combphy_param_write(priv->phy_grf, &cfg->pipe_clk_24m, true); + if (priv->type == PHY_TYPE_USB3 || priv->type == PHY_TYPE_SATA) { + /* Set ssc_cnt[9:0]=0101111101 & 31.5KHz */ + val = PHYREG15_SSC_CNT_VALUE << PHYREG15_SSC_CNT_SHIFT; + rockchip_combphy_updatel(priv, PHYREG15_SSC_CNT_MASK, + val, PHYREG15); + + writel(PHYREG16_SSC_CNT_VALUE, priv->mmio + PHYREG16); + + } else if (priv->type == PHY_TYPE_PCIE) { + /* PLL KVCO tuning fine */ + val = PHYREG33_PLL_KVCO_VALUE_RK3576 << PHYREG33_PLL_KVCO_SHIFT; + rockchip_combphy_updatel(priv, PHYREG33_PLL_KVCO_MASK, + val, PHYREG33); + + /* Set up rx_pck invert and rx msb to disable */ + writel(0x00, priv->mmio + PHYREG27); + + /* + * Set up SU adjust signal: + * su_trim[7:0], PLL KVCO adjust bits[2:0] to min + * su_trim[15:8], PLL LPF R1 adujst bits[9:7]=3'b011 + * su_trim[31:24], CKDRV adjust + */ + writel(0x90, priv->mmio + PHYREG11); + writel(0x02, priv->mmio + PHYREG12); + writel(0x57, priv->mmio + PHYREG14); + + writel(PHYREG16_SSC_CNT_VALUE, priv->mmio + PHYREG16); + } + break; + case REF_CLOCK_25MHz: + rockchip_combphy_param_write(priv->phy_grf, &cfg->pipe_clk_25m, true); + break; + case REF_CLOCK_100MHz: + rockchip_combphy_param_write(priv->phy_grf, &cfg->pipe_clk_100m, true); + if (priv->type == PHY_TYPE_PCIE) { + /* gate_tx_pck_sel length select work for L1SS */ + writel(0xc0, priv->mmio + PHYREG30); + + /* PLL KVCO tuning fine */ + val = PHYREG33_PLL_KVCO_VALUE_RK3576 << PHYREG33_PLL_KVCO_SHIFT; + rockchip_combphy_updatel(priv, PHYREG33_PLL_KVCO_MASK, + val, PHYREG33); + + /* Set up rx_trim: PLL LPF C1 85pf R1 1.25kohm */ + writel(0x4c, priv->mmio + PHYREG27); + + /* + * Set up SU adjust signal: + * su_trim[7:0], PLL KVCO adjust bits[2:0] to min + * su_trim[15:8], bypass PLL loop divider code, and + * PLL LPF R1 adujst bits[9:7]=3'b101 + * su_trim[23:16], CKRCV adjust + * su_trim[31:24], CKDRV adjust + */ + writel(0x90, priv->mmio + PHYREG11); + writel(0x43, priv->mmio + PHYREG12); + writel(0x88, priv->mmio + PHYREG13); + writel(0x56, priv->mmio + PHYREG14); + } else if (priv->type == PHY_TYPE_SATA) { + /* downward spread spectrum +500ppm */ + val = PHYREG32_SSC_DOWNWARD << PHYREG32_SSC_DIR_SHIFT; + val |= PHYREG32_SSC_OFFSET_500PPM << PHYREG32_SSC_OFFSET_SHIFT; + rockchip_combphy_updatel(priv, PHYREG32_SSC_MASK, val, PHYREG32); + + /* ssc ppm adjust to 3500ppm */ + rockchip_combphy_updatel(priv, PHYREG10_SSC_PCM_MASK, + PHYREG10_SSC_PCM_3500PPM, + PHYREG10); + } + break; + default: + dev_err(priv->dev, "Unsupported rate: %lu\n", rate); + return -EINVAL; + } + + if (priv->ext_refclk) { + rockchip_combphy_param_write(priv->phy_grf, &cfg->pipe_clk_ext, true); + if (priv->type == PHY_TYPE_PCIE && rate == REF_CLOCK_100MHz) { + val = PHYREG33_PLL_KVCO_VALUE_RK3576 << PHYREG33_PLL_KVCO_SHIFT; + rockchip_combphy_updatel(priv, PHYREG33_PLL_KVCO_MASK, + val, PHYREG33); + + /* Set up rx_trim: PLL LPF C1 85pf R1 2.5kohm */ + writel(0x0c, priv->mmio + PHYREG27); + + /* + * Set up SU adjust signal: + * su_trim[7:0], PLL KVCO adjust bits[2:0] to min + * su_trim[15:8], bypass PLL loop divider code, and + * PLL LPF R1 adujst bits[9:7]=3'b101. + * su_trim[23:16], CKRCV adjust + * su_trim[31:24], CKDRV adjust + */ + writel(0x90, priv->mmio + PHYREG11); + writel(0x43, priv->mmio + PHYREG12); + writel(0x88, priv->mmio + PHYREG13); + writel(0x56, priv->mmio + PHYREG14); + } + } + + if (priv->enable_ssc) { + val = readl(priv->mmio + PHYREG8); + val |= PHYREG8_SSC_EN; + writel(val, priv->mmio + PHYREG8); + + if (priv->type == PHY_TYPE_PCIE && rate == REF_CLOCK_24MHz) { + /* Set PLL loop divider */ + writel(0x00, priv->mmio + PHYREG17); + writel(PHYREG18_PLL_LOOP, priv->mmio + PHYREG18); + + /* Set up rx_pck invert and rx msb to disable */ + writel(0x00, priv->mmio + PHYREG27); + + /* + * Set up SU adjust signal: + * su_trim[7:0], PLL KVCO adjust bits[2:0] to min + * su_trim[15:8], PLL LPF R1 adujst bits[9:7]=3'b101 + * su_trim[23:16], CKRCV adjust + * su_trim[31:24], CKDRV adjust + */ + writel(0x90, priv->mmio + PHYREG11); + writel(0x02, priv->mmio + PHYREG12); + writel(0x08, priv->mmio + PHYREG13); + writel(0x57, priv->mmio + PHYREG14); + writel(0x40, priv->mmio + PHYREG15); + + writel(PHYREG16_SSC_CNT_VALUE, priv->mmio + PHYREG16); + writel(PHYREG33_PLL_KVCO_VALUE_RK3576 << PHYREG33_PLL_KVCO_SHIFT, + priv->mmio + PHYREG33); + } + } + + return 0; +} + +static const struct rockchip_combphy_grfcfg rk3576_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_25m = { 0x0004, 14, 13, 0x00, 0x01 }, + .pipe_clk_100m = { 0x0004, 14, 13, 0x00, 0x02 }, + .pipe_phymode_sel = { 0x0008, 1, 1, 0x00, 0x01 }, + .pipe_rate_sel = { 0x0008, 2, 2, 0x00, 0x01 }, + .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, 0x1000 }, + .con1_for_pcie = { 0x0004, 15, 0, 0x00, 0x0000 }, + .con2_for_pcie = { 0x0008, 15, 0, 0x00, 0x0101 }, + .con3_for_pcie = { 0x000c, 15, 0, 0x00, 0x0200 }, + .con0_for_sata = { 0x0000, 15, 0, 0x00, 0x0129 }, + .con1_for_sata = { 0x0004, 15, 0, 0x00, 0x0000 }, + .con2_for_sata = { 0x0008, 15, 0, 0x00, 0x80c1 }, + .con3_for_sata = { 0x000c, 15, 0, 0x00, 0x0407 }, + /* php-grf */ + .pipe_con0_for_sata = { 0x001C, 2, 0, 0x00, 0x2 }, + .pipe_con1_for_sata = { 0x0020, 2, 0, 0x00, 0x2 }, +}; + +static const struct rockchip_combphy_cfg rk3576_combphy_cfgs = { + .num_phys = 2, + .phy_ids = { + 0x2b050000, + 0x2b060000 + }, + .grfcfg = &rk3576_combphy_grfcfgs, + .combphy_cfg = rk3576_combphy_cfg, +}; + static int rk3588_combphy_cfg(struct rockchip_combphy_priv *priv) { const struct rockchip_combphy_grfcfg *cfg = priv->cfg->grfcfg; @@ -775,6 +1045,10 @@ static const struct of_device_id rockchip_combphy_of_match[] = { .compatible = "rockchip,rk3568-naneng-combphy", .data = &rk3568_combphy_cfgs, }, + { + .compatible = "rockchip,rk3576-naneng-combphy", + .data = &rk3576_combphy_cfgs, + }, { .compatible = "rockchip,rk3588-naneng-combphy", .data = &rk3588_combphy_cfgs, -- 2.25.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 2/2] phy: rockchip-naneng-combo: Support rk3576 2024-10-16 2:35 ` [PATCH v2 2/2] phy: rockchip-naneng-combo: Support rk3576 Frank Wang @ 2024-10-17 14:34 ` Vinod Koul 2024-10-18 1:36 ` Frank Wang 0 siblings, 1 reply; 4+ messages in thread From: Vinod Koul @ 2024-10-17 14:34 UTC (permalink / raw) To: Frank Wang Cc: kishon, robh, krzk+dt, conor+dt, heiko, linux-phy, devicetree, linux-arm-kernel, linux-kernel, linux-rockchip, william.wu, tim.chen, Kever Yang, Frank Wang On 16-10-24, 10:35, Frank Wang wrote: > From: Kever Yang <kever.yang@rock-chips.com> > > phy0: pcie, sata > phy1: pcie, sata, usb3 Can this be more verbose to explain what is being added in the patch below? > > Signed-off-by: Kever Yang <kever.yang@rock-chips.com> > Signed-off-by: William Wu <william.wu@rock-chips.com> > Signed-off-by: Frank Wang <frank.wang@rock-chips.com> > --- > Changelog: > v2: > - using constants macro instead of magic values. > - add more comments for PHY tuning operations. > > v1: > - https://patchwork.kernel.org/project/linux-phy/patch/20241015013351.4884-2-frawang.cn@gmail.com/ > > .../rockchip/phy-rockchip-naneng-combphy.c | 274 ++++++++++++++++++ > 1 file changed, 274 insertions(+) > > diff --git a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c > index 0a9989e41237f..25aa8d1981abc 100644 > --- a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c > +++ b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c > @@ -37,6 +37,10 @@ > #define PHYREG8 0x1C > #define PHYREG8_SSC_EN BIT(4) > > +#define PHYREG10 0x24 > +#define PHYREG10_SSC_PCM_MASK GENMASK(3, 0) > +#define PHYREG10_SSC_PCM_3500PPM 7 > + > #define PHYREG11 0x28 > #define PHYREG11_SU_TRIM_0_7 0xF0 > > @@ -61,12 +65,19 @@ > #define PHYREG16 0x3C > #define PHYREG16_SSC_CNT_VALUE 0x5f > > +#define PHYREG17 0x40 > + > #define PHYREG18 0x44 > #define PHYREG18_PLL_LOOP 0x32 > > +#define PHYREG21 0x50 > +#define PHYREG21_RX_SQUELCH_VAL 0x0D > + > #define PHYREG27 0x6C > #define PHYREG27_RX_TRIM_RK3588 0x4C > > +#define PHYREG30 0x74 > + > #define PHYREG32 0x7C > #define PHYREG32_SSC_MASK GENMASK(7, 4) > #define PHYREG32_SSC_DIR_SHIFT 4 > @@ -79,6 +90,7 @@ > #define PHYREG33_PLL_KVCO_MASK GENMASK(4, 2) > #define PHYREG33_PLL_KVCO_SHIFT 2 > #define PHYREG33_PLL_KVCO_VALUE 2 > +#define PHYREG33_PLL_KVCO_VALUE_RK3576 4 > > struct rockchip_combphy_priv; > > @@ -98,6 +110,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; > @@ -584,6 +597,263 @@ static const struct rockchip_combphy_cfg rk3568_combphy_cfgs = { > .combphy_cfg = rk3568_combphy_cfg, > }; > > +static int rk3576_combphy_cfg(struct rockchip_combphy_priv *priv) > +{ > + const struct rockchip_combphy_grfcfg *cfg = priv->cfg->grfcfg; > + unsigned long rate; > + u32 val; > + > + switch (priv->type) { > + case PHY_TYPE_PCIE: > + /* Set SSC downward spread spectrum */ > + rockchip_combphy_updatel(priv, PHYREG32_SSC_MASK, > + PHYREG32_SSC_DOWNWARD << PHYREG32_SSC_DIR_SHIFT, > + PHYREG32); If we use FIELD_GET|PREP, we can get rid of SHIFT defines > + > + rockchip_combphy_param_write(priv->phy_grf, &cfg->con0_for_pcie, true); > + rockchip_combphy_param_write(priv->phy_grf, &cfg->con1_for_pcie, true); > + rockchip_combphy_param_write(priv->phy_grf, &cfg->con2_for_pcie, true); > + rockchip_combphy_param_write(priv->phy_grf, &cfg->con3_for_pcie, true); > + break; Break here and before each case please > + case PHY_TYPE_USB3: > + /* Set SSC downward spread spectrum */ > + rockchip_combphy_updatel(priv, PHYREG32_SSC_MASK, > + PHYREG32_SSC_DOWNWARD << PHYREG32_SSC_DIR_SHIFT, > + PHYREG32); > + > + /* Enable adaptive CTLE for USB3.0 Rx */ > + val = readl(priv->mmio + PHYREG15); > + val |= PHYREG15_CTLE_EN; > + writel(val, priv->mmio + PHYREG15); > + > + /* Set PLL KVCO fine tuning signals */ > + rockchip_combphy_updatel(priv, PHYREG33_PLL_KVCO_MASK, BIT(3), PHYREG33); > + > + /* Set PLL LPF R1 to su_trim[10:7]=1001 */ > + writel(PHYREG12_PLL_LPF_ADJ_VALUE, priv->mmio + PHYREG12); > + > + /* Set PLL input clock divider 1/2 */ > + rockchip_combphy_updatel(priv, PHYREG6_PLL_DIV_MASK, > + PHYREG6_PLL_DIV_2 << PHYREG6_PLL_DIV_SHIFT, > + PHYREG6); > + > + /* Set PLL loop divider */ > + writel(PHYREG18_PLL_LOOP, priv->mmio + PHYREG18); > + > + /* Set PLL KVCO to min and set PLL charge pump current to max */ > + writel(PHYREG11_SU_TRIM_0_7, priv->mmio + PHYREG11); > + > + /* Set Rx squelch input filler bandwidth */ > + writel(PHYREG21_RX_SQUELCH_VAL, priv->mmio + PHYREG21); > + > + rockchip_combphy_param_write(priv->phy_grf, &cfg->pipe_txcomp_sel, false); > + rockchip_combphy_param_write(priv->phy_grf, &cfg->pipe_txelec_sel, false); > + rockchip_combphy_param_write(priv->phy_grf, &cfg->usb_mode_set, true); > + break; > + case PHY_TYPE_SATA: > + /* Enable adaptive CTLE for SATA Rx */ > + val = readl(priv->mmio + PHYREG15); > + val |= PHYREG15_CTLE_EN; > + writel(val, priv->mmio + PHYREG15); > + > + /* Set tx_rterm = 50 ohm and rx_rterm = 43.5 ohm */ > + val = PHYREG7_TX_RTERM_50OHM << PHYREG7_TX_RTERM_SHIFT; > + val |= PHYREG7_RX_RTERM_44OHM << PHYREG7_RX_RTERM_SHIFT; > + writel(val, priv->mmio + PHYREG7); > + > + rockchip_combphy_param_write(priv->phy_grf, &cfg->con0_for_sata, true); > + rockchip_combphy_param_write(priv->phy_grf, &cfg->con1_for_sata, true); > + rockchip_combphy_param_write(priv->phy_grf, &cfg->con2_for_sata, true); > + rockchip_combphy_param_write(priv->phy_grf, &cfg->con3_for_sata, true); > + rockchip_combphy_param_write(priv->pipe_grf, &cfg->pipe_con0_for_sata, true); > + rockchip_combphy_param_write(priv->pipe_grf, &cfg->pipe_con1_for_sata, true); > + break; > + default: > + dev_err(priv->dev, "incompatible PHY type\n"); > + return -EINVAL; > + } > + > + rate = clk_get_rate(priv->refclk); > + > + switch (rate) { > + case REF_CLOCK_24MHz: > + rockchip_combphy_param_write(priv->phy_grf, &cfg->pipe_clk_24m, true); > + if (priv->type == PHY_TYPE_USB3 || priv->type == PHY_TYPE_SATA) { > + /* Set ssc_cnt[9:0]=0101111101 & 31.5KHz */ > + val = PHYREG15_SSC_CNT_VALUE << PHYREG15_SSC_CNT_SHIFT; > + rockchip_combphy_updatel(priv, PHYREG15_SSC_CNT_MASK, > + val, PHYREG15); > + > + writel(PHYREG16_SSC_CNT_VALUE, priv->mmio + PHYREG16); > + > + } else if (priv->type == PHY_TYPE_PCIE) { > + /* PLL KVCO tuning fine */ > + val = PHYREG33_PLL_KVCO_VALUE_RK3576 << PHYREG33_PLL_KVCO_SHIFT; > + rockchip_combphy_updatel(priv, PHYREG33_PLL_KVCO_MASK, > + val, PHYREG33); > + > + /* Set up rx_pck invert and rx msb to disable */ > + writel(0x00, priv->mmio + PHYREG27); > + > + /* > + * Set up SU adjust signal: > + * su_trim[7:0], PLL KVCO adjust bits[2:0] to min > + * su_trim[15:8], PLL LPF R1 adujst bits[9:7]=3'b011 > + * su_trim[31:24], CKDRV adjust > + */ > + writel(0x90, priv->mmio + PHYREG11); > + writel(0x02, priv->mmio + PHYREG12); > + writel(0x57, priv->mmio + PHYREG14); > + > + writel(PHYREG16_SSC_CNT_VALUE, priv->mmio + PHYREG16); > + } > + break; > + case REF_CLOCK_25MHz: > + rockchip_combphy_param_write(priv->phy_grf, &cfg->pipe_clk_25m, true); > + break; > + case REF_CLOCK_100MHz: > + rockchip_combphy_param_write(priv->phy_grf, &cfg->pipe_clk_100m, true); > + if (priv->type == PHY_TYPE_PCIE) { > + /* gate_tx_pck_sel length select work for L1SS */ > + writel(0xc0, priv->mmio + PHYREG30); > + > + /* PLL KVCO tuning fine */ > + val = PHYREG33_PLL_KVCO_VALUE_RK3576 << PHYREG33_PLL_KVCO_SHIFT; > + rockchip_combphy_updatel(priv, PHYREG33_PLL_KVCO_MASK, > + val, PHYREG33); > + > + /* Set up rx_trim: PLL LPF C1 85pf R1 1.25kohm */ > + writel(0x4c, priv->mmio + PHYREG27); > + > + /* > + * Set up SU adjust signal: > + * su_trim[7:0], PLL KVCO adjust bits[2:0] to min > + * su_trim[15:8], bypass PLL loop divider code, and > + * PLL LPF R1 adujst bits[9:7]=3'b101 > + * su_trim[23:16], CKRCV adjust > + * su_trim[31:24], CKDRV adjust > + */ > + writel(0x90, priv->mmio + PHYREG11); > + writel(0x43, priv->mmio + PHYREG12); > + writel(0x88, priv->mmio + PHYREG13); > + writel(0x56, priv->mmio + PHYREG14); > + } else if (priv->type == PHY_TYPE_SATA) { > + /* downward spread spectrum +500ppm */ > + val = PHYREG32_SSC_DOWNWARD << PHYREG32_SSC_DIR_SHIFT; > + val |= PHYREG32_SSC_OFFSET_500PPM << PHYREG32_SSC_OFFSET_SHIFT; > + rockchip_combphy_updatel(priv, PHYREG32_SSC_MASK, val, PHYREG32); > + > + /* ssc ppm adjust to 3500ppm */ > + rockchip_combphy_updatel(priv, PHYREG10_SSC_PCM_MASK, > + PHYREG10_SSC_PCM_3500PPM, > + PHYREG10); > + } > + break; > + default: > + dev_err(priv->dev, "Unsupported rate: %lu\n", rate); > + return -EINVAL; > + } > + > + if (priv->ext_refclk) { > + rockchip_combphy_param_write(priv->phy_grf, &cfg->pipe_clk_ext, true); > + if (priv->type == PHY_TYPE_PCIE && rate == REF_CLOCK_100MHz) { > + val = PHYREG33_PLL_KVCO_VALUE_RK3576 << PHYREG33_PLL_KVCO_SHIFT; > + rockchip_combphy_updatel(priv, PHYREG33_PLL_KVCO_MASK, > + val, PHYREG33); > + > + /* Set up rx_trim: PLL LPF C1 85pf R1 2.5kohm */ > + writel(0x0c, priv->mmio + PHYREG27); > + > + /* > + * Set up SU adjust signal: > + * su_trim[7:0], PLL KVCO adjust bits[2:0] to min > + * su_trim[15:8], bypass PLL loop divider code, and > + * PLL LPF R1 adujst bits[9:7]=3'b101. > + * su_trim[23:16], CKRCV adjust > + * su_trim[31:24], CKDRV adjust > + */ > + writel(0x90, priv->mmio + PHYREG11); > + writel(0x43, priv->mmio + PHYREG12); > + writel(0x88, priv->mmio + PHYREG13); > + writel(0x56, priv->mmio + PHYREG14); > + } > + } > + > + if (priv->enable_ssc) { > + val = readl(priv->mmio + PHYREG8); > + val |= PHYREG8_SSC_EN; > + writel(val, priv->mmio + PHYREG8); > + > + if (priv->type == PHY_TYPE_PCIE && rate == REF_CLOCK_24MHz) { > + /* Set PLL loop divider */ > + writel(0x00, priv->mmio + PHYREG17); > + writel(PHYREG18_PLL_LOOP, priv->mmio + PHYREG18); > + > + /* Set up rx_pck invert and rx msb to disable */ > + writel(0x00, priv->mmio + PHYREG27); > + > + /* > + * Set up SU adjust signal: > + * su_trim[7:0], PLL KVCO adjust bits[2:0] to min > + * su_trim[15:8], PLL LPF R1 adujst bits[9:7]=3'b101 > + * su_trim[23:16], CKRCV adjust > + * su_trim[31:24], CKDRV adjust > + */ > + writel(0x90, priv->mmio + PHYREG11); > + writel(0x02, priv->mmio + PHYREG12); > + writel(0x08, priv->mmio + PHYREG13); > + writel(0x57, priv->mmio + PHYREG14); > + writel(0x40, priv->mmio + PHYREG15); > + > + writel(PHYREG16_SSC_CNT_VALUE, priv->mmio + PHYREG16); > + writel(PHYREG33_PLL_KVCO_VALUE_RK3576 << PHYREG33_PLL_KVCO_SHIFT, > + priv->mmio + PHYREG33); > + } > + } > + > + return 0; > +} > + > +static const struct rockchip_combphy_grfcfg rk3576_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_25m = { 0x0004, 14, 13, 0x00, 0x01 }, > + .pipe_clk_100m = { 0x0004, 14, 13, 0x00, 0x02 }, > + .pipe_phymode_sel = { 0x0008, 1, 1, 0x00, 0x01 }, > + .pipe_rate_sel = { 0x0008, 2, 2, 0x00, 0x01 }, > + .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, 0x1000 }, > + .con1_for_pcie = { 0x0004, 15, 0, 0x00, 0x0000 }, > + .con2_for_pcie = { 0x0008, 15, 0, 0x00, 0x0101 }, > + .con3_for_pcie = { 0x000c, 15, 0, 0x00, 0x0200 }, > + .con0_for_sata = { 0x0000, 15, 0, 0x00, 0x0129 }, > + .con1_for_sata = { 0x0004, 15, 0, 0x00, 0x0000 }, > + .con2_for_sata = { 0x0008, 15, 0, 0x00, 0x80c1 }, > + .con3_for_sata = { 0x000c, 15, 0, 0x00, 0x0407 }, > + /* php-grf */ > + .pipe_con0_for_sata = { 0x001C, 2, 0, 0x00, 0x2 }, > + .pipe_con1_for_sata = { 0x0020, 2, 0, 0x00, 0x2 }, > +}; > + > +static const struct rockchip_combphy_cfg rk3576_combphy_cfgs = { > + .num_phys = 2, > + .phy_ids = { > + 0x2b050000, > + 0x2b060000 > + }, > + .grfcfg = &rk3576_combphy_grfcfgs, > + .combphy_cfg = rk3576_combphy_cfg, > +}; > + > static int rk3588_combphy_cfg(struct rockchip_combphy_priv *priv) > { > const struct rockchip_combphy_grfcfg *cfg = priv->cfg->grfcfg; > @@ -775,6 +1045,10 @@ static const struct of_device_id rockchip_combphy_of_match[] = { > .compatible = "rockchip,rk3568-naneng-combphy", > .data = &rk3568_combphy_cfgs, > }, > + { > + .compatible = "rockchip,rk3576-naneng-combphy", > + .data = &rk3576_combphy_cfgs, > + }, > { > .compatible = "rockchip,rk3588-naneng-combphy", > .data = &rk3588_combphy_cfgs, > -- > 2.25.1 -- ~Vinod ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 2/2] phy: rockchip-naneng-combo: Support rk3576 2024-10-17 14:34 ` Vinod Koul @ 2024-10-18 1:36 ` Frank Wang 0 siblings, 0 replies; 4+ messages in thread From: Frank Wang @ 2024-10-18 1:36 UTC (permalink / raw) To: Vinod Koul Cc: kishon, robh, krzk+dt, conor+dt, heiko, linux-phy, devicetree, linux-arm-kernel, linux-kernel, linux-rockchip, william.wu, tim.chen, Kever Yang, Frank Wang Hi Vinod, On 2024/10/17 22:34, Vinod Koul wrote: > On 16-10-24, 10:35, Frank Wang wrote: >> From: Kever Yang <kever.yang@rock-chips.com> >> >> phy0: pcie, sata >> phy1: pcie, sata, usb3 > Can this be more verbose to explain what is being added in the patch > below? Sure, I'll amend and send a new version. >> Signed-off-by: Kever Yang <kever.yang@rock-chips.com> >> Signed-off-by: William Wu <william.wu@rock-chips.com> >> Signed-off-by: Frank Wang <frank.wang@rock-chips.com> >> --- >> Changelog: >> v2: >> - using constants macro instead of magic values. >> - add more comments for PHY tuning operations. >> >> v1: >> - https://patchwork.kernel.org/project/linux-phy/patch/20241015013351.4884-2-frawang.cn@gmail.com/ >> >> .../rockchip/phy-rockchip-naneng-combphy.c | 274 ++++++++++++++++++ >> 1 file changed, 274 insertions(+) >> >> diff --git a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c >> index 0a9989e41237f..25aa8d1981abc 100644 >> --- a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c >> +++ b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c >> @@ -37,6 +37,10 @@ >> #define PHYREG8 0x1C >> #define PHYREG8_SSC_EN BIT(4) >> >> +#define PHYREG10 0x24 >> +#define PHYREG10_SSC_PCM_MASK GENMASK(3, 0) >> +#define PHYREG10_SSC_PCM_3500PPM 7 >> + >> #define PHYREG11 0x28 >> #define PHYREG11_SU_TRIM_0_7 0xF0 >> >> @@ -61,12 +65,19 @@ >> #define PHYREG16 0x3C >> #define PHYREG16_SSC_CNT_VALUE 0x5f >> >> +#define PHYREG17 0x40 >> + >> #define PHYREG18 0x44 >> #define PHYREG18_PLL_LOOP 0x32 >> >> +#define PHYREG21 0x50 >> +#define PHYREG21_RX_SQUELCH_VAL 0x0D >> + >> #define PHYREG27 0x6C >> #define PHYREG27_RX_TRIM_RK3588 0x4C >> >> +#define PHYREG30 0x74 >> + >> #define PHYREG32 0x7C >> #define PHYREG32_SSC_MASK GENMASK(7, 4) >> #define PHYREG32_SSC_DIR_SHIFT 4 >> @@ -79,6 +90,7 @@ >> #define PHYREG33_PLL_KVCO_MASK GENMASK(4, 2) >> #define PHYREG33_PLL_KVCO_SHIFT 2 >> #define PHYREG33_PLL_KVCO_VALUE 2 >> +#define PHYREG33_PLL_KVCO_VALUE_RK3576 4 >> >> struct rockchip_combphy_priv; >> >> @@ -98,6 +110,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; >> @@ -584,6 +597,263 @@ static const struct rockchip_combphy_cfg rk3568_combphy_cfgs = { >> .combphy_cfg = rk3568_combphy_cfg, >> }; >> >> +static int rk3576_combphy_cfg(struct rockchip_combphy_priv *priv) >> +{ >> + const struct rockchip_combphy_grfcfg *cfg = priv->cfg->grfcfg; >> + unsigned long rate; >> + u32 val; >> + >> + switch (priv->type) { >> + case PHY_TYPE_PCIE: >> + /* Set SSC downward spread spectrum */ >> + rockchip_combphy_updatel(priv, PHYREG32_SSC_MASK, >> + PHYREG32_SSC_DOWNWARD << PHYREG32_SSC_DIR_SHIFT, >> + PHYREG32); > If we use FIELD_GET|PREP, we can get rid of SHIFT defines got it, thanks. >> + >> + rockchip_combphy_param_write(priv->phy_grf, &cfg->con0_for_pcie, true); >> + rockchip_combphy_param_write(priv->phy_grf, &cfg->con1_for_pcie, true); >> + rockchip_combphy_param_write(priv->phy_grf, &cfg->con2_for_pcie, true); >> + rockchip_combphy_param_write(priv->phy_grf, &cfg->con3_for_pcie, true); >> + break; > Break here and before each case please Okay. >> + case PHY_TYPE_USB3: >> + /* Set SSC downward spread spectrum */ >> + rockchip_combphy_updatel(priv, PHYREG32_SSC_MASK, >> + PHYREG32_SSC_DOWNWARD << PHYREG32_SSC_DIR_SHIFT, >> + PHYREG32); >> + >> + /* Enable adaptive CTLE for USB3.0 Rx */ >> + val = readl(priv->mmio + PHYREG15); >> + val |= PHYREG15_CTLE_EN; >> + writel(val, priv->mmio + PHYREG15); >> + >> + /* Set PLL KVCO fine tuning signals */ >> + rockchip_combphy_updatel(priv, PHYREG33_PLL_KVCO_MASK, BIT(3), PHYREG33); >> + >> + /* Set PLL LPF R1 to su_trim[10:7]=1001 */ >> + writel(PHYREG12_PLL_LPF_ADJ_VALUE, priv->mmio + PHYREG12); >> + >> + /* Set PLL input clock divider 1/2 */ >> + rockchip_combphy_updatel(priv, PHYREG6_PLL_DIV_MASK, >> + PHYREG6_PLL_DIV_2 << PHYREG6_PLL_DIV_SHIFT, >> + PHYREG6); >> + >> + /* Set PLL loop divider */ >> + writel(PHYREG18_PLL_LOOP, priv->mmio + PHYREG18); >> + >> + /* Set PLL KVCO to min and set PLL charge pump current to max */ >> + writel(PHYREG11_SU_TRIM_0_7, priv->mmio + PHYREG11); >> + >> + /* Set Rx squelch input filler bandwidth */ >> + writel(PHYREG21_RX_SQUELCH_VAL, priv->mmio + PHYREG21); >> + >> + rockchip_combphy_param_write(priv->phy_grf, &cfg->pipe_txcomp_sel, false); >> + rockchip_combphy_param_write(priv->phy_grf, &cfg->pipe_txelec_sel, false); >> + rockchip_combphy_param_write(priv->phy_grf, &cfg->usb_mode_set, true); >> + break; >> + case PHY_TYPE_SATA: >> + /* Enable adaptive CTLE for SATA Rx */ >> + val = readl(priv->mmio + PHYREG15); >> + val |= PHYREG15_CTLE_EN; >> + writel(val, priv->mmio + PHYREG15); >> + >> + /* Set tx_rterm = 50 ohm and rx_rterm = 43.5 ohm */ >> + val = PHYREG7_TX_RTERM_50OHM << PHYREG7_TX_RTERM_SHIFT; >> + val |= PHYREG7_RX_RTERM_44OHM << PHYREG7_RX_RTERM_SHIFT; >> + writel(val, priv->mmio + PHYREG7); >> + >> + rockchip_combphy_param_write(priv->phy_grf, &cfg->con0_for_sata, true); >> + rockchip_combphy_param_write(priv->phy_grf, &cfg->con1_for_sata, true); >> + rockchip_combphy_param_write(priv->phy_grf, &cfg->con2_for_sata, true); >> + rockchip_combphy_param_write(priv->phy_grf, &cfg->con3_for_sata, true); >> + rockchip_combphy_param_write(priv->pipe_grf, &cfg->pipe_con0_for_sata, true); >> + rockchip_combphy_param_write(priv->pipe_grf, &cfg->pipe_con1_for_sata, true); >> + break; >> + default: >> + dev_err(priv->dev, "incompatible PHY type\n"); >> + return -EINVAL; >> + } >> + >> + rate = clk_get_rate(priv->refclk); >> + >> + switch (rate) { >> + case REF_CLOCK_24MHz: >> + rockchip_combphy_param_write(priv->phy_grf, &cfg->pipe_clk_24m, true); >> + if (priv->type == PHY_TYPE_USB3 || priv->type == PHY_TYPE_SATA) { >> + /* Set ssc_cnt[9:0]=0101111101 & 31.5KHz */ >> + val = PHYREG15_SSC_CNT_VALUE << PHYREG15_SSC_CNT_SHIFT; >> + rockchip_combphy_updatel(priv, PHYREG15_SSC_CNT_MASK, >> + val, PHYREG15); >> + >> + writel(PHYREG16_SSC_CNT_VALUE, priv->mmio + PHYREG16); >> + >> + } else if (priv->type == PHY_TYPE_PCIE) { >> + /* PLL KVCO tuning fine */ >> + val = PHYREG33_PLL_KVCO_VALUE_RK3576 << PHYREG33_PLL_KVCO_SHIFT; >> + rockchip_combphy_updatel(priv, PHYREG33_PLL_KVCO_MASK, >> + val, PHYREG33); >> + >> + /* Set up rx_pck invert and rx msb to disable */ >> + writel(0x00, priv->mmio + PHYREG27); >> + >> + /* >> + * Set up SU adjust signal: >> + * su_trim[7:0], PLL KVCO adjust bits[2:0] to min >> + * su_trim[15:8], PLL LPF R1 adujst bits[9:7]=3'b011 >> + * su_trim[31:24], CKDRV adjust >> + */ >> + writel(0x90, priv->mmio + PHYREG11); >> + writel(0x02, priv->mmio + PHYREG12); >> + writel(0x57, priv->mmio + PHYREG14); >> + >> + writel(PHYREG16_SSC_CNT_VALUE, priv->mmio + PHYREG16); >> + } >> + break; >> + case REF_CLOCK_25MHz: >> + rockchip_combphy_param_write(priv->phy_grf, &cfg->pipe_clk_25m, true); >> + break; >> + case REF_CLOCK_100MHz: >> + rockchip_combphy_param_write(priv->phy_grf, &cfg->pipe_clk_100m, true); >> + if (priv->type == PHY_TYPE_PCIE) { >> + /* gate_tx_pck_sel length select work for L1SS */ >> + writel(0xc0, priv->mmio + PHYREG30); >> + >> + /* PLL KVCO tuning fine */ >> + val = PHYREG33_PLL_KVCO_VALUE_RK3576 << PHYREG33_PLL_KVCO_SHIFT; >> + rockchip_combphy_updatel(priv, PHYREG33_PLL_KVCO_MASK, >> + val, PHYREG33); >> + >> + /* Set up rx_trim: PLL LPF C1 85pf R1 1.25kohm */ >> + writel(0x4c, priv->mmio + PHYREG27); >> + >> + /* >> + * Set up SU adjust signal: >> + * su_trim[7:0], PLL KVCO adjust bits[2:0] to min >> + * su_trim[15:8], bypass PLL loop divider code, and >> + * PLL LPF R1 adujst bits[9:7]=3'b101 >> + * su_trim[23:16], CKRCV adjust >> + * su_trim[31:24], CKDRV adjust >> + */ >> + writel(0x90, priv->mmio + PHYREG11); >> + writel(0x43, priv->mmio + PHYREG12); >> + writel(0x88, priv->mmio + PHYREG13); >> + writel(0x56, priv->mmio + PHYREG14); >> + } else if (priv->type == PHY_TYPE_SATA) { >> + /* downward spread spectrum +500ppm */ >> + val = PHYREG32_SSC_DOWNWARD << PHYREG32_SSC_DIR_SHIFT; >> + val |= PHYREG32_SSC_OFFSET_500PPM << PHYREG32_SSC_OFFSET_SHIFT; >> + rockchip_combphy_updatel(priv, PHYREG32_SSC_MASK, val, PHYREG32); >> + >> + /* ssc ppm adjust to 3500ppm */ >> + rockchip_combphy_updatel(priv, PHYREG10_SSC_PCM_MASK, >> + PHYREG10_SSC_PCM_3500PPM, >> + PHYREG10); >> + } >> + break; >> + default: >> + dev_err(priv->dev, "Unsupported rate: %lu\n", rate); >> + return -EINVAL; >> + } >> + >> + if (priv->ext_refclk) { >> + rockchip_combphy_param_write(priv->phy_grf, &cfg->pipe_clk_ext, true); >> + if (priv->type == PHY_TYPE_PCIE && rate == REF_CLOCK_100MHz) { >> + val = PHYREG33_PLL_KVCO_VALUE_RK3576 << PHYREG33_PLL_KVCO_SHIFT; >> + rockchip_combphy_updatel(priv, PHYREG33_PLL_KVCO_MASK, >> + val, PHYREG33); >> + >> + /* Set up rx_trim: PLL LPF C1 85pf R1 2.5kohm */ >> + writel(0x0c, priv->mmio + PHYREG27); >> + >> + /* >> + * Set up SU adjust signal: >> + * su_trim[7:0], PLL KVCO adjust bits[2:0] to min >> + * su_trim[15:8], bypass PLL loop divider code, and >> + * PLL LPF R1 adujst bits[9:7]=3'b101. >> + * su_trim[23:16], CKRCV adjust >> + * su_trim[31:24], CKDRV adjust >> + */ >> + writel(0x90, priv->mmio + PHYREG11); >> + writel(0x43, priv->mmio + PHYREG12); >> + writel(0x88, priv->mmio + PHYREG13); >> + writel(0x56, priv->mmio + PHYREG14); >> + } >> + } >> + >> + if (priv->enable_ssc) { >> + val = readl(priv->mmio + PHYREG8); >> + val |= PHYREG8_SSC_EN; >> + writel(val, priv->mmio + PHYREG8); >> + >> + if (priv->type == PHY_TYPE_PCIE && rate == REF_CLOCK_24MHz) { >> + /* Set PLL loop divider */ >> + writel(0x00, priv->mmio + PHYREG17); >> + writel(PHYREG18_PLL_LOOP, priv->mmio + PHYREG18); >> + >> + /* Set up rx_pck invert and rx msb to disable */ >> + writel(0x00, priv->mmio + PHYREG27); >> + >> + /* >> + * Set up SU adjust signal: >> + * su_trim[7:0], PLL KVCO adjust bits[2:0] to min >> + * su_trim[15:8], PLL LPF R1 adujst bits[9:7]=3'b101 >> + * su_trim[23:16], CKRCV adjust >> + * su_trim[31:24], CKDRV adjust >> + */ >> + writel(0x90, priv->mmio + PHYREG11); >> + writel(0x02, priv->mmio + PHYREG12); >> + writel(0x08, priv->mmio + PHYREG13); >> + writel(0x57, priv->mmio + PHYREG14); >> + writel(0x40, priv->mmio + PHYREG15); >> + >> + writel(PHYREG16_SSC_CNT_VALUE, priv->mmio + PHYREG16); >> + writel(PHYREG33_PLL_KVCO_VALUE_RK3576 << PHYREG33_PLL_KVCO_SHIFT, >> + priv->mmio + PHYREG33); >> + } >> + } >> + >> + return 0; >> +} >> + >> +static const struct rockchip_combphy_grfcfg rk3576_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_25m = { 0x0004, 14, 13, 0x00, 0x01 }, >> + .pipe_clk_100m = { 0x0004, 14, 13, 0x00, 0x02 }, >> + .pipe_phymode_sel = { 0x0008, 1, 1, 0x00, 0x01 }, >> + .pipe_rate_sel = { 0x0008, 2, 2, 0x00, 0x01 }, >> + .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, 0x1000 }, >> + .con1_for_pcie = { 0x0004, 15, 0, 0x00, 0x0000 }, >> + .con2_for_pcie = { 0x0008, 15, 0, 0x00, 0x0101 }, >> + .con3_for_pcie = { 0x000c, 15, 0, 0x00, 0x0200 }, >> + .con0_for_sata = { 0x0000, 15, 0, 0x00, 0x0129 }, >> + .con1_for_sata = { 0x0004, 15, 0, 0x00, 0x0000 }, >> + .con2_for_sata = { 0x0008, 15, 0, 0x00, 0x80c1 }, >> + .con3_for_sata = { 0x000c, 15, 0, 0x00, 0x0407 }, >> + /* php-grf */ >> + .pipe_con0_for_sata = { 0x001C, 2, 0, 0x00, 0x2 }, >> + .pipe_con1_for_sata = { 0x0020, 2, 0, 0x00, 0x2 }, >> +}; >> + >> +static const struct rockchip_combphy_cfg rk3576_combphy_cfgs = { >> + .num_phys = 2, >> + .phy_ids = { >> + 0x2b050000, >> + 0x2b060000 >> + }, >> + .grfcfg = &rk3576_combphy_grfcfgs, >> + .combphy_cfg = rk3576_combphy_cfg, >> +}; >> + >> static int rk3588_combphy_cfg(struct rockchip_combphy_priv *priv) >> { >> const struct rockchip_combphy_grfcfg *cfg = priv->cfg->grfcfg; >> @@ -775,6 +1045,10 @@ static const struct of_device_id rockchip_combphy_of_match[] = { >> .compatible = "rockchip,rk3568-naneng-combphy", >> .data = &rk3568_combphy_cfgs, >> }, >> + { >> + .compatible = "rockchip,rk3576-naneng-combphy", >> + .data = &rk3576_combphy_cfgs, >> + }, >> { >> .compatible = "rockchip,rk3588-naneng-combphy", >> .data = &rk3588_combphy_cfgs, >> -- >> 2.25.1 ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-10-18 1:36 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-10-16 2:35 [PATCH v2 1/2] dt-bindings: phy: rockchip: add rk3576 compatible Frank Wang 2024-10-16 2:35 ` [PATCH v2 2/2] phy: rockchip-naneng-combo: Support rk3576 Frank Wang 2024-10-17 14:34 ` Vinod Koul 2024-10-18 1:36 ` Frank Wang
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).