Skip to content

Commit

Permalink
phy: ti: phy-j721e-wiz.c: Add usxgmii support in wiz driver
Browse files Browse the repository at this point in the history
Changes the wiz_p_mac_div_sel() and wiz_mode_select() to
configure serdes for USXGMII.

Adds the support to configure mac_src_sel, refclk_sel and
rxfclk_sel in the LANECTL register and configures the serdes for
usxgmii.

[rogerq] Fix MAC_SRC_SEL to 0x3 for USXGMII as per CSL code.

Signed-off-by: Tanmay Patil <t-patil@ti.com>
Signed-off-by: Roger Quadros <rogerq@kernel.org>
Link: https://lore.kernel.org/r/20220628122255.24265-4-rogerq@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
  • Loading branch information
Tanmay Patil authored and Vinod Koul committed Aug 30, 2022
1 parent 288440d commit b64a85f
Showing 1 changed file with 50 additions and 1 deletion.
51 changes: 50 additions & 1 deletion drivers/phy/ti/phy-j721e-wiz.c
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,26 @@ static const struct reg_field p0_fullrt_div[WIZ_MAX_LANES] = {
REG_FIELD(WIZ_LANECTL(3), 22, 23),
};

static const struct reg_field p0_mac_src_sel[WIZ_MAX_LANES] = {
REG_FIELD(WIZ_LANECTL(0), 20, 21),
REG_FIELD(WIZ_LANECTL(1), 20, 21),
REG_FIELD(WIZ_LANECTL(2), 20, 21),
REG_FIELD(WIZ_LANECTL(3), 20, 21),
};

static const struct reg_field p0_rxfclk_sel[WIZ_MAX_LANES] = {
REG_FIELD(WIZ_LANECTL(0), 6, 7),
REG_FIELD(WIZ_LANECTL(1), 6, 7),
REG_FIELD(WIZ_LANECTL(2), 6, 7),
REG_FIELD(WIZ_LANECTL(3), 6, 7),
};

static const struct reg_field p0_refclk_sel[WIZ_MAX_LANES] = {
REG_FIELD(WIZ_LANECTL(0), 18, 19),
REG_FIELD(WIZ_LANECTL(1), 18, 19),
REG_FIELD(WIZ_LANECTL(2), 18, 19),
REG_FIELD(WIZ_LANECTL(3), 18, 19),
};
static const struct reg_field p_mac_div_sel0[WIZ_MAX_LANES] = {
REG_FIELD(WIZ_LANEDIV(0), 16, 22),
REG_FIELD(WIZ_LANEDIV(1), 16, 22),
Expand Down Expand Up @@ -280,6 +300,9 @@ struct wiz {
struct regmap_field *p_mac_div_sel0[WIZ_MAX_LANES];
struct regmap_field *p_mac_div_sel1[WIZ_MAX_LANES];
struct regmap_field *p0_fullrt_div[WIZ_MAX_LANES];
struct regmap_field *p0_mac_src_sel[WIZ_MAX_LANES];
struct regmap_field *p0_rxfclk_sel[WIZ_MAX_LANES];
struct regmap_field *p0_refclk_sel[WIZ_MAX_LANES];
struct regmap_field *pma_cmn_refclk_int_mode;
struct regmap_field *pma_cmn_refclk_mode;
struct regmap_field *pma_cmn_refclk_dig_div;
Expand Down Expand Up @@ -326,7 +349,8 @@ static int wiz_p_mac_div_sel(struct wiz *wiz)

for (i = 0; i < num_lanes; i++) {
if (wiz->lane_phy_type[i] == PHY_TYPE_SGMII ||
wiz->lane_phy_type[i] == PHY_TYPE_QSGMII) {
wiz->lane_phy_type[i] == PHY_TYPE_QSGMII ||
wiz->lane_phy_type[i] == PHY_TYPE_USXGMII) {
ret = regmap_field_write(wiz->p_mac_div_sel0[i], 1);
if (ret)
return ret;
Expand Down Expand Up @@ -355,6 +379,13 @@ static int wiz_mode_select(struct wiz *wiz)
else
continue;

if (wiz->lane_phy_type[i] == PHY_TYPE_USXGMII) {
ret = regmap_field_write(wiz->p0_mac_src_sel[i], 0x3);
ret = regmap_field_write(wiz->p0_rxfclk_sel[i], 0x3);
ret = regmap_field_write(wiz->p0_refclk_sel[i], 0x3);
mode = LANE_MODE_GEN1;
}

ret = regmap_field_write(wiz->p_standard_mode[i], mode);
if (ret)
return ret;
Expand Down Expand Up @@ -524,6 +555,24 @@ static int wiz_regfield_init(struct wiz *wiz)
return PTR_ERR(wiz->p0_fullrt_div[i]);
}

wiz->p0_mac_src_sel[i] = devm_regmap_field_alloc(dev, regmap, p0_mac_src_sel[i]);
if (IS_ERR(wiz->p0_mac_src_sel[i])) {
dev_err(dev, "P%d_MAC_SRC_SEL reg field init failed\n", i);
return PTR_ERR(wiz->p0_mac_src_sel[i]);
}

wiz->p0_rxfclk_sel[i] = devm_regmap_field_alloc(dev, regmap, p0_rxfclk_sel[i]);
if (IS_ERR(wiz->p0_rxfclk_sel[i])) {
dev_err(dev, "P%d_RXFCLK_SEL reg field init failed\n", i);
return PTR_ERR(wiz->p0_rxfclk_sel[i]);
}

wiz->p0_refclk_sel[i] = devm_regmap_field_alloc(dev, regmap, p0_refclk_sel[i]);
if (IS_ERR(wiz->p0_refclk_sel[i])) {
dev_err(dev, "P%d_REFCLK_SEL reg field init failed\n", i);
return PTR_ERR(wiz->p0_refclk_sel[i]);
}

wiz->p_mac_div_sel0[i] =
devm_regmap_field_alloc(dev, regmap, p_mac_div_sel0[i]);
if (IS_ERR(wiz->p_mac_div_sel0[i])) {
Expand Down

0 comments on commit b64a85f

Please sign in to comment.