kevin/linux
1
Fork 0
Code

phy: ti: j721e-wiz: Add support to enable LN23 Type-C swap

Browse Source 
The WIZ acts as a wrapper for SerDes and has Lanes 0 and 2 reserved
for USB for type-C lane swap if Lane 1 and Lane 3 are linked to the
USB PHY that is integrated into the SerDes IP. The WIZ control register
has to be configured to support this lane swap feature.

The support for swapping lanes 2 and 3 is missing and therefore
add support to configure the control register to swap between
lanes 2 and 3 if PHY type is USB.

Signed-off-by: Sinthu Raja <sinthu.raja@ti.com>
Reviewed-by: Roger Quadros <rogerq@kernel.org>
Link: https://lore.kernel.org/r/20230113150615.19375-3-sinthu.raja@ti.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Sinthu Raja 2023-01-13 20:36:15 +05:30 committed by Vinod Koul
parent 9a8a54b9a9
commit 494de1dd83
1 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,6 +58,14 @@ enum wiz_lane_standard_mode {
LANE_MODE_GEN4, LANE_MODE_GEN4,
}; };
/*
* List of master lanes used for lane swapping
*/
enum wiz_typec_master_lane {
LANE0 = 0,
LANE2 = 2,
};
enum wiz_refclk_mux_sel { enum wiz_refclk_mux_sel {
PLL0_REFCLK, PLL0_REFCLK,
PLL1_REFCLK, PLL1_REFCLK,
@ -194,6 +202,9 @@ static const struct reg_field p_mac_div_sel1[WIZ_MAX_LANES] = {
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);
static const struct reg_field typec_ln23_swap =
REG_FIELD(WIZ_SERDES_TYPEC, 31, 31);
struct wiz_clk_mux { struct wiz_clk_mux {
struct clk_hw hw; struct clk_hw hw;
struct regmap_field *field; struct regmap_field *field;
@ -367,6 +378,7 @@ struct wiz {
struct regmap_field *mux_sel_field[WIZ_MUX_NUM_CLOCKS]; struct regmap_field *mux_sel_field[WIZ_MUX_NUM_CLOCKS];
struct regmap_field *div_sel_field[WIZ_DIV_NUM_CLOCKS_16G]; struct regmap_field *div_sel_field[WIZ_DIV_NUM_CLOCKS_16G];
struct regmap_field *typec_ln10_swap; struct regmap_field *typec_ln10_swap;
struct regmap_field *typec_ln23_swap;
struct regmap_field *sup_legacy_clk_override; struct regmap_field *sup_legacy_clk_override;
struct device *dev; struct device *dev;
@ -676,6 +688,13 @@ static int wiz_regfield_init(struct wiz *wiz)
return PTR_ERR(wiz->typec_ln10_swap); return PTR_ERR(wiz->typec_ln10_swap);
} }
wiz->typec_ln23_swap = devm_regmap_field_alloc(dev, regmap,
typec_ln23_swap);
if (IS_ERR(wiz->typec_ln23_swap)) {
dev_err(dev, "LN23_SWAP reg field init failed\n");
return PTR_ERR(wiz->typec_ln23_swap);
}
wiz->phy_en_refclk = devm_regmap_field_alloc(dev, regmap, phy_en_refclk); wiz->phy_en_refclk = devm_regmap_field_alloc(dev, regmap, phy_en_refclk);
if (IS_ERR(wiz->phy_en_refclk)) { if (IS_ERR(wiz->phy_en_refclk)) {
dev_err(dev, "PHY_EN_REFCLK reg field init failed\n"); dev_err(dev, "PHY_EN_REFCLK reg field init failed\n");
@ -1246,17 +1265,26 @@ static int wiz_phy_reset_deassert(struct reset_controller_dev *rcdev,
else else
regmap_field_write(wiz->typec_ln10_swap, 0); regmap_field_write(wiz->typec_ln10_swap, 0);
} else { } else {
/* if no typec-dir gpio was specified and PHY type is /* if no typec-dir gpio is specified and PHY type is USB3
* USB3 with master lane number is '0', set LN10 SWAP * with master lane number is '0' or '2', then set LN10 or
* bit to '1' * LN23 SWAP bit to '1' respectively.
*/ */
u32 num_lanes = wiz->num_lanes; u32 num_lanes = wiz->num_lanes;
int i; int i;
for (i = 0; i < num_lanes; i++) { for (i = 0; i < num_lanes; i++) {
if (wiz->lane_phy_type[i] == PHY_TYPE_USB3) if (wiz->lane_phy_type[i] == PHY_TYPE_USB3) {
if (wiz->master_lane_num[i] == 0) switch (wiz->master_lane_num[i]) {
case LANE0:
regmap_field_write(wiz->typec_ln10_swap, 1); regmap_field_write(wiz->typec_ln10_swap, 1);
break;
case LANE2:
regmap_field_write(wiz->typec_ln23_swap, 1);
break;
default:
break;
}
}
} }
} }
} }