Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 01:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

phy: ti: j721e-wiz: Configure full rate divider for AM64

Browse Source 
The frequency of the txmclk between PCIe and SERDES has
changed to 250MHz from 500MHz. Configure full rate divider
for AM64 accordingly.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Link: https://lore.kernel.org/r/20210310120840.16447-4-kishon@ti.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Kishon Vijay Abraham I 2021-03-10 17:38:37 +05:30 committed by Vinod Koul
parent 7e52a39f19
commit 6ecac2f8ff
1 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/phy/ti/phy-j721e-wiz.c
View File

@ -101,6 +101,13 @@ static const struct reg_field p_standard_mode[WIZ_MAX_LANES] = {
REG_FIELD(WIZ_LANECTL(3), 24, 25), REG_FIELD(WIZ_LANECTL(3), 24, 25),
}; };
static const struct reg_field p0_fullrt_div[WIZ_MAX_LANES] = {
REG_FIELD(WIZ_LANECTL(0), 22, 23),
REG_FIELD(WIZ_LANECTL(1), 22, 23),
REG_FIELD(WIZ_LANECTL(2), 22, 23),
REG_FIELD(WIZ_LANECTL(3), 22, 23),
};
static const struct reg_field typec_ln10_swap = static const struct reg_field typec_ln10_swap =
REG_FIELD(WIZ_SERDES_TYPEC, 30, 30); REG_FIELD(WIZ_SERDES_TYPEC, 30, 30);
@ -191,6 +198,7 @@ static const struct wiz_clk_div_sel clk_div_sel[] = {
enum wiz_type { enum wiz_type {
J721E_WIZ_16G, J721E_WIZ_16G,
J721E_WIZ_10G, J721E_WIZ_10G,
AM64_WIZ_10G,
}; };
#define WIZ_TYPEC_DIR_DEBOUNCE_MIN 100 /* ms */ #define WIZ_TYPEC_DIR_DEBOUNCE_MIN 100 /* ms */
@ -208,6 +216,7 @@ struct wiz {
struct regmap_field *p_align[WIZ_MAX_LANES]; struct regmap_field *p_align[WIZ_MAX_LANES];
struct regmap_field *p_raw_auto_start[WIZ_MAX_LANES]; struct regmap_field *p_raw_auto_start[WIZ_MAX_LANES];
struct regmap_field *p_standard_mode[WIZ_MAX_LANES]; struct regmap_field *p_standard_mode[WIZ_MAX_LANES];
struct regmap_field *p0_fullrt_div[WIZ_MAX_LANES];
struct regmap_field *pma_cmn_refclk_int_mode; struct regmap_field *pma_cmn_refclk_int_mode;
struct regmap_field *pma_cmn_refclk_mode; struct regmap_field *pma_cmn_refclk_mode;
struct regmap_field *pma_cmn_refclk_dig_div; struct regmap_field *pma_cmn_refclk_dig_div;
@ -373,7 +382,7 @@ static int wiz_regfield_init(struct wiz *wiz)
return PTR_ERR(wiz->mux_sel_field[PLL1_REFCLK]); return PTR_ERR(wiz->mux_sel_field[PLL1_REFCLK]);
} }
if (wiz->type == J721E_WIZ_10G) if (wiz->type == J721E_WIZ_10G || wiz->type == AM64_WIZ_10G)
wiz->mux_sel_field[REFCLK_DIG] = wiz->mux_sel_field[REFCLK_DIG] =
devm_regmap_field_alloc(dev, regmap, devm_regmap_field_alloc(dev, regmap,
refclk_dig_sel_10g); refclk_dig_sel_10g);
@ -417,6 +426,12 @@ static int wiz_regfield_init(struct wiz *wiz)
i); i);
return PTR_ERR(wiz->p_standard_mode[i]); return PTR_ERR(wiz->p_standard_mode[i]);
} }
wiz->p0_fullrt_div[i] = devm_regmap_field_alloc(dev, regmap, p0_fullrt_div[i]);
if (IS_ERR(wiz->p0_fullrt_div[i])) {
dev_err(dev, "P%d_FULLRT_DIV reg field init failed\n", i);
return PTR_ERR(wiz->p0_fullrt_div[i]);
}
} }
wiz->typec_ln10_swap = devm_regmap_field_alloc(dev, regmap, wiz->typec_ln10_swap = devm_regmap_field_alloc(dev, regmap,
@ -718,6 +733,17 @@ static int wiz_phy_reset_assert(struct reset_controller_dev *rcdev,
return ret; return ret;
} }
static int wiz_phy_fullrt_div(struct wiz *wiz, int lane)
{
if (wiz->type != AM64_WIZ_10G)
return 0;
if (wiz->lane_phy_type[lane] == PHY_TYPE_PCIE)
return regmap_field_write(wiz->p0_fullrt_div[lane], 0x1);
return 0;
}
static int wiz_phy_reset_deassert(struct reset_controller_dev *rcdev, static int wiz_phy_reset_deassert(struct reset_controller_dev *rcdev,
unsigned long id) unsigned long id)
{ {
@ -741,6 +767,10 @@ static int wiz_phy_reset_deassert(struct reset_controller_dev *rcdev,
return ret; return ret;
} }
ret = wiz_phy_fullrt_div(wiz, id - 1);
if (ret)
return ret;
if (wiz->lane_phy_type[id - 1] == PHY_TYPE_DP) if (wiz->lane_phy_type[id - 1] == PHY_TYPE_DP)
ret = regmap_field_write(wiz->p_enable[id - 1], P_ENABLE); ret = regmap_field_write(wiz->p_enable[id - 1], P_ENABLE);
else else
@ -768,6 +798,9 @@ static const struct of_device_id wiz_id_table[] = {
{ {
.compatible = "ti,j721e-wiz-10g", .data = (void *)J721E_WIZ_10G .compatible = "ti,j721e-wiz-10g", .data = (void *)J721E_WIZ_10G
}, },
{
.compatible = "ti,am64-wiz-10g", .data = (void *)AM64_WIZ_10G
},
{} {}
}; };
MODULE_DEVICE_TABLE(of, wiz_id_table); MODULE_DEVICE_TABLE(of, wiz_id_table);
@ -900,14 +933,14 @@ static int wiz_probe(struct platform_device *pdev)
wiz->dev = dev; wiz->dev = dev;
wiz->regmap = regmap; wiz->regmap = regmap;
wiz->num_lanes = num_lanes; wiz->num_lanes = num_lanes;
if (wiz->type == J721E_WIZ_10G) if (wiz->type == J721E_WIZ_10G || wiz->type == AM64_WIZ_10G)
wiz->clk_mux_sel = clk_mux_sel_10g; wiz->clk_mux_sel = clk_mux_sel_10g;
else else
wiz->clk_mux_sel = clk_mux_sel_16g; wiz->clk_mux_sel = clk_mux_sel_16g;
wiz->clk_div_sel = clk_div_sel; wiz->clk_div_sel = clk_div_sel;
if (wiz->type == J721E_WIZ_10G) if (wiz->type == J721E_WIZ_10G || wiz->type == AM64_WIZ_10G)
wiz->clk_div_sel_num = WIZ_DIV_NUM_CLOCKS_10G; wiz->clk_div_sel_num = WIZ_DIV_NUM_CLOCKS_10G;
else else
wiz->clk_div_sel_num = WIZ_DIV_NUM_CLOCKS_16G; wiz->clk_div_sel_num = WIZ_DIV_NUM_CLOCKS_16G;