shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

phy: rockchip: naneng-combphy: Fix support for pipe clock settings

Browse Source 
pipe clock settings were done before PCIe's and SATA's catch-all
pipe settings. So it would be covered by con1_for_pcie and
con1_for_sata. Fix this by moving pipe clock settings to the end.

Change-Id: I19a8943b6a99d8e4ef198345ec3f62bdac491c58
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
This commit is contained in:
Shawn Lin
2020-12-02 17:10:29 +08:00
committed by Tao Huang
parent c321f37fe1
commit 9dc5ea5543
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
View File

@@ -320,34 +320,6 @@ static int rk3568_combphy_cfg(struct rockchip_combphy_priv *priv)
return -EINVAL;
}
rate = clk_get_rate(refclk);
switch (rate) {
case 24000000:
if (priv->mode == PHY_TYPE_USB3) {
/* Set ssc_cnt[9:0]=0101111101 & 31.5KHz */
val = readl(priv->mmio + (0x0e << 2));
val &= ~GENMASK(7, 6);
val |= 0x01 << 6;
writel(val, priv->mmio + (0x0e << 2));
val = readl(priv->mmio + (0x0f << 2));
val &= ~GENMASK(7, 0);
val |= 0x5f;
writel(val, priv->mmio + (0x0f << 2));
}
break;
case 25000000:
param_write(priv->phy_grf, &cfg->pipe_clk_25m, true);
break;
case 100000000:
param_write(priv->phy_grf, &cfg->pipe_clk_100m, true);
break;
default:
dev_err(priv->dev, "Unsupported rate: %lu\n", rate);
return -EINVAL;
}
switch (priv->mode) {
case PHY_TYPE_PCIE:
param_write(priv->phy_grf, &cfg->con0_for_pcie, true);
@@ -397,6 +369,34 @@ static int rk3568_combphy_cfg(struct rockchip_combphy_priv *priv)
return -EINVAL;
}
rate = clk_get_rate(refclk);
switch (rate) {
case 24000000:
if (priv->mode == PHY_TYPE_USB3) {
/* Set ssc_cnt[9:0]=0101111101 & 31.5KHz */
val = readl(priv->mmio + (0x0e << 2));
val &= ~GENMASK(7, 6);
val |= 0x01 << 6;
writel(val, priv->mmio + (0x0e << 2));
val = readl(priv->mmio + (0x0f << 2));
val &= ~GENMASK(7, 0);
val |= 0x5f;
writel(val, priv->mmio + (0x0f << 2));
}
break;
case 25000000:
param_write(priv->phy_grf, &cfg->pipe_clk_25m, true);
break;
case 100000000:
param_write(priv->phy_grf, &cfg->pipe_clk_100m, true);
break;
default:
dev_err(priv->dev, "Unsupported rate: %lu\n", rate);
return -EINVAL;
}
return 0;
}