| Message ID | 20240528151434.227602-1-slaveze@smartandconnective.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | clk: imx: imx6ul: fix default parent for enet*_ref_sel | expand |
On Tue, May 28, 2024 at 05:14:33PM +0200, Sebastien Laveze wrote: > The clk_set_parent for "enet1_ref_sel" and "enet2_ref_sel" are > incorrect, therefore the original requirements to have "enet_clk_ref" as > output sourced by iMX ENET PLL as a default config is not met. > > Only "enet[1,2]_ref_125m" "enet[1,2]_ref_pad" are possible parents for > "enet1_ref_sel" and "enet2_ref_sel". > > This was observed as a regression using a custom device tree which was > expecting this default config. > > This can be fixed at the device tree level but having a default config > matching the original behavior (before refclock mux) will avoid breaking > existing configs. > > Fixes: 4e197ee880c2 ("clk: imx6ul: add ethernet refclock mux support") > Link: https://lore.kernel.org/lkml/20230306020226.GC143566@dragon/T/ > Signed-off-by: Sebastien Laveze <slaveze@smartandconnective.com> Reviewed-by: Oleksij Rempel <o.rempel@pengutronix.de> Thank you. > --- > drivers/clk/imx/clk-imx6ul.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/clk/imx/clk-imx6ul.c b/drivers/clk/imx/clk-imx6ul.c > index f9394e94f69d..05c7a82b751f 100644 > --- a/drivers/clk/imx/clk-imx6ul.c > +++ b/drivers/clk/imx/clk-imx6ul.c > @@ -542,8 +542,8 @@ static void __init imx6ul_clocks_init(struct device_node *ccm_node) > > clk_set_parent(hws[IMX6UL_CLK_ENFC_SEL]->clk, hws[IMX6UL_CLK_PLL2_PFD2]->clk); > > - clk_set_parent(hws[IMX6UL_CLK_ENET1_REF_SEL]->clk, hws[IMX6UL_CLK_ENET_REF]->clk); > - clk_set_parent(hws[IMX6UL_CLK_ENET2_REF_SEL]->clk, hws[IMX6UL_CLK_ENET2_REF]->clk); > + clk_set_parent(hws[IMX6UL_CLK_ENET1_REF_SEL]->clk, hws[IMX6UL_CLK_ENET1_REF_125M]->clk); > + clk_set_parent(hws[IMX6UL_CLK_ENET2_REF_SEL]->clk, hws[IMX6UL_CLK_ENET2_REF_125M]->clk); > > imx_register_uart_clocks(); > } > -- > 2.34.1 > > >
On Tue, 28 May 2024 17:14:33 +0200, Sebastien Laveze wrote: > The clk_set_parent for "enet1_ref_sel" and "enet2_ref_sel" are > incorrect, therefore the original requirements to have "enet_clk_ref" as > output sourced by iMX ENET PLL as a default config is not met. > > Only "enet[1,2]_ref_125m" "enet[1,2]_ref_pad" are possible parents for > "enet1_ref_sel" and "enet2_ref_sel". > > [...] Applied, thanks! [1/1] clk: imx: imx6ul: fix default parent for enet*_ref_sel commit: bb2c2aa7db67d0e13adde59c823606eba7bb06a4 Best regards,
diff --git a/drivers/clk/imx/clk-imx6ul.c b/drivers/clk/imx/clk-imx6ul.c index f9394e94f69d..05c7a82b751f 100644 --- a/drivers/clk/imx/clk-imx6ul.c +++ b/drivers/clk/imx/clk-imx6ul.c @@ -542,8 +542,8 @@ static void __init imx6ul_clocks_init(struct device_node *ccm_node) clk_set_parent(hws[IMX6UL_CLK_ENFC_SEL]->clk, hws[IMX6UL_CLK_PLL2_PFD2]->clk); - clk_set_parent(hws[IMX6UL_CLK_ENET1_REF_SEL]->clk, hws[IMX6UL_CLK_ENET_REF]->clk); - clk_set_parent(hws[IMX6UL_CLK_ENET2_REF_SEL]->clk, hws[IMX6UL_CLK_ENET2_REF]->clk); + clk_set_parent(hws[IMX6UL_CLK_ENET1_REF_SEL]->clk, hws[IMX6UL_CLK_ENET1_REF_125M]->clk); + clk_set_parent(hws[IMX6UL_CLK_ENET2_REF_SEL]->clk, hws[IMX6UL_CLK_ENET2_REF_125M]->clk); imx_register_uart_clocks(); }
The clk_set_parent for "enet1_ref_sel" and "enet2_ref_sel" are incorrect, therefore the original requirements to have "enet_clk_ref" as output sourced by iMX ENET PLL as a default config is not met. Only "enet[1,2]_ref_125m" "enet[1,2]_ref_pad" are possible parents for "enet1_ref_sel" and "enet2_ref_sel". This was observed as a regression using a custom device tree which was expecting this default config. This can be fixed at the device tree level but having a default config matching the original behavior (before refclock mux) will avoid breaking existing configs. Fixes: 4e197ee880c2 ("clk: imx6ul: add ethernet refclock mux support") Link: https://lore.kernel.org/lkml/20230306020226.GC143566@dragon/T/ Signed-off-by: Sebastien Laveze <slaveze@smartandconnective.com> --- drivers/clk/imx/clk-imx6ul.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)