mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-13 14:26:51 +07:00
phy: cadence-torrent: Add separate regmap functions for torrent and DP
Added separate functions for regmap initialization of torrent PHY generic registers and DP specific registers. Signed-off-by: Swapnil Jakhade <sjakhade@cadence.com> Link: https://lore.kernel.org/r/1600280911-9214-5-git-send-email-sjakhade@cadence.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
parent
7c12b46c63
commit
2e70c84995
@ -1584,7 +1584,24 @@ static struct regmap *cdns_regmap_init(struct device *dev, void __iomem *base,
|
||||
return devm_regmap_init(dev, NULL, ctx, config);
|
||||
}
|
||||
|
||||
static int cdns_regfield_init(struct cdns_torrent_phy *cdns_phy)
|
||||
static int cdns_torrent_dp_regfield_init(struct cdns_torrent_phy *cdns_phy)
|
||||
{
|
||||
struct device *dev = cdns_phy->dev;
|
||||
struct regmap_field *field;
|
||||
struct regmap *regmap;
|
||||
|
||||
regmap = cdns_phy->regmap_dptx_phy_reg;
|
||||
field = devm_regmap_field_alloc(dev, regmap, phy_reset_ctrl);
|
||||
if (IS_ERR(field)) {
|
||||
dev_err(dev, "PHY_RESET reg field init failed\n");
|
||||
return PTR_ERR(field);
|
||||
}
|
||||
cdns_phy->phy_reset_ctrl = field;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int cdns_torrent_regfield_init(struct cdns_torrent_phy *cdns_phy)
|
||||
{
|
||||
struct device *dev = cdns_phy->dev;
|
||||
struct regmap_field *field;
|
||||
@ -1614,28 +1631,44 @@ static int cdns_regfield_init(struct cdns_torrent_phy *cdns_phy)
|
||||
}
|
||||
cdns_phy->phy_pma_pll_raw_ctrl = field;
|
||||
|
||||
regmap = cdns_phy->regmap_dptx_phy_reg;
|
||||
field = devm_regmap_field_alloc(dev, regmap, phy_reset_ctrl);
|
||||
if (IS_ERR(field)) {
|
||||
dev_err(dev, "PHY_RESET reg field init failed\n");
|
||||
return PTR_ERR(field);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int cdns_torrent_dp_regmap_init(struct cdns_torrent_phy *cdns_phy)
|
||||
{
|
||||
void __iomem *base = cdns_phy->base;
|
||||
struct device *dev = cdns_phy->dev;
|
||||
struct regmap *regmap;
|
||||
u8 reg_offset_shift;
|
||||
u32 block_offset;
|
||||
|
||||
reg_offset_shift = cdns_phy->init_data->reg_offset_shift;
|
||||
|
||||
block_offset = TORRENT_DPTX_PHY_OFFSET;
|
||||
regmap = cdns_regmap_init(dev, base, block_offset,
|
||||
reg_offset_shift,
|
||||
&cdns_torrent_dptx_phy_config);
|
||||
if (IS_ERR(regmap)) {
|
||||
dev_err(dev, "Failed to init DPTX PHY regmap\n");
|
||||
return PTR_ERR(regmap);
|
||||
}
|
||||
cdns_phy->phy_reset_ctrl = field;
|
||||
cdns_phy->regmap_dptx_phy_reg = regmap;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int cdns_regmap_init_torrent_dp(struct cdns_torrent_phy *cdns_phy,
|
||||
void __iomem *sd_base,
|
||||
void __iomem *base,
|
||||
u8 block_offset_shift,
|
||||
u8 reg_offset_shift)
|
||||
static int cdns_torrent_regmap_init(struct cdns_torrent_phy *cdns_phy)
|
||||
{
|
||||
void __iomem *sd_base = cdns_phy->sd_base;
|
||||
u8 block_offset_shift, reg_offset_shift;
|
||||
struct device *dev = cdns_phy->dev;
|
||||
struct regmap *regmap;
|
||||
u32 block_offset;
|
||||
int i;
|
||||
|
||||
block_offset_shift = cdns_phy->init_data->block_offset_shift;
|
||||
reg_offset_shift = cdns_phy->init_data->reg_offset_shift;
|
||||
|
||||
for (i = 0; i < MAX_NUM_LANES; i++) {
|
||||
block_offset = TORRENT_TX_LANE_CDB_OFFSET(i, block_offset_shift,
|
||||
reg_offset_shift);
|
||||
@ -1690,16 +1723,6 @@ static int cdns_regmap_init_torrent_dp(struct cdns_torrent_phy *cdns_phy,
|
||||
}
|
||||
cdns_phy->regmap_phy_pma_common_cdb = regmap;
|
||||
|
||||
block_offset = TORRENT_DPTX_PHY_OFFSET;
|
||||
regmap = cdns_regmap_init(dev, base, block_offset,
|
||||
reg_offset_shift,
|
||||
&cdns_torrent_dptx_phy_config);
|
||||
if (IS_ERR(regmap)) {
|
||||
dev_err(dev, "Failed to init DPTX PHY regmap\n");
|
||||
return PTR_ERR(regmap);
|
||||
}
|
||||
cdns_phy->regmap_dptx_phy_reg = regmap;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1711,6 +1734,7 @@ static int cdns_torrent_phy_probe(struct platform_device *pdev)
|
||||
const struct cdns_torrent_data *data;
|
||||
struct device_node *child;
|
||||
int ret, subnodes, node = 0, i;
|
||||
u8 init_dp_regmap = 0;
|
||||
|
||||
/* Get init data for this PHY */
|
||||
data = of_device_get_match_data(dev);
|
||||
@ -1748,6 +1772,14 @@ static int cdns_torrent_phy_probe(struct platform_device *pdev)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
ret = cdns_torrent_regmap_init(cdns_phy);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = cdns_torrent_regfield_init(cdns_phy);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
for_each_available_child_of_node(dev->of_node, child) {
|
||||
struct phy *gphy;
|
||||
|
||||
@ -1830,6 +1862,18 @@ static int cdns_torrent_phy_probe(struct platform_device *pdev)
|
||||
goto put_child;
|
||||
}
|
||||
|
||||
if (!init_dp_regmap) {
|
||||
ret = cdns_torrent_dp_regmap_init(cdns_phy);
|
||||
if (ret)
|
||||
goto put_child;
|
||||
|
||||
ret = cdns_torrent_dp_regfield_init(cdns_phy);
|
||||
if (ret)
|
||||
goto put_child;
|
||||
|
||||
init_dp_regmap++;
|
||||
}
|
||||
|
||||
dev_info(dev, "%d lanes, max bit rate %d.%03d Gbps\n",
|
||||
cdns_phy->phys[node].num_lanes,
|
||||
cdns_phy->max_bit_rate / 1000,
|
||||
@ -1846,17 +1890,6 @@ static int cdns_torrent_phy_probe(struct platform_device *pdev)
|
||||
}
|
||||
cdns_phy->nsubnodes = node;
|
||||
|
||||
ret = cdns_regmap_init_torrent_dp(cdns_phy, cdns_phy->sd_base,
|
||||
cdns_phy->base,
|
||||
data->block_offset_shift,
|
||||
data->reg_offset_shift);
|
||||
if (ret)
|
||||
goto put_lnk_rst;
|
||||
|
||||
ret = cdns_regfield_init(cdns_phy);
|
||||
if (ret)
|
||||
goto put_lnk_rst;
|
||||
|
||||
phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
|
||||
if (IS_ERR(phy_provider)) {
|
||||
ret = PTR_ERR(phy_provider);
|
||||
|
Loading…
Reference in New Issue
Block a user