mirror of
https://github.com/torvalds/linux
synced 2024-09-06 09:51:23 +00:00
phy: ti: phy-j721e-wiz: stop name conflict if multiple serdes are initialized
When multiple serdes instances are initialized the first will succeed but additional will conflict over clocks names and probing fails. Signed-off-by: Matt Ranostay <mranostay@ti.com> Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com> Link: https://lore.kernel.org/r/20220909200026.3422-1-mranostay@ti.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
parent
931c05a8cb
commit
1fbef61bea
|
@ -717,6 +717,8 @@ static int wiz_phy_en_refclk_register(struct wiz *wiz)
|
|||
struct device *dev = wiz->dev;
|
||||
struct clk_init_data *init;
|
||||
struct clk *clk;
|
||||
char *clk_name;
|
||||
unsigned int sz;
|
||||
|
||||
wiz_phy_en_refclk = devm_kzalloc(dev, sizeof(*wiz_phy_en_refclk), GFP_KERNEL);
|
||||
if (!wiz_phy_en_refclk)
|
||||
|
@ -726,12 +728,23 @@ static int wiz_phy_en_refclk_register(struct wiz *wiz)
|
|||
|
||||
init->ops = &wiz_phy_en_refclk_ops;
|
||||
init->flags = 0;
|
||||
init->name = output_clk_names[TI_WIZ_PHY_EN_REFCLK];
|
||||
|
||||
sz = strlen(dev_name(dev)) + strlen(output_clk_names[TI_WIZ_PHY_EN_REFCLK]) + 2;
|
||||
|
||||
clk_name = kzalloc(sz, GFP_KERNEL);
|
||||
if (!clk_name)
|
||||
return -ENOMEM;
|
||||
|
||||
snprintf(clk_name, sz, "%s_%s", dev_name(dev), output_clk_names[TI_WIZ_PHY_EN_REFCLK]);
|
||||
init->name = clk_name;
|
||||
|
||||
wiz_phy_en_refclk->phy_en_refclk = wiz->phy_en_refclk;
|
||||
wiz_phy_en_refclk->hw.init = init;
|
||||
|
||||
clk = devm_clk_register(dev, &wiz_phy_en_refclk->hw);
|
||||
|
||||
kfree(clk_name);
|
||||
|
||||
if (IS_ERR(clk))
|
||||
return PTR_ERR(clk);
|
||||
|
||||
|
|
Loading…
Reference in a new issue