| Message ID | 20220406043945.9031-1-t.scherer@eckelmann.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] ARM: dts: ci4x10: Adapt to changes in imx6qdl.dtsi regarding fec clocks | expand |
Hello Thorsten, On Wed, Apr 06, 2022 at 06:39:45AM +0200, Thorsten Scherer wrote: > Commit f3e7dae323ab ("ARM: dts: imx6qdl: add enet_out clk > support") added another item to the list of clocks for the fec > device. As imx6dl-eckelmann-ci4x10.dts only overwrites clocks, > but not clock-names this resulted in an inconsistency with > clocks having one item more than clock-names. > > Also overwrite clock-names with the same value as in > imx6qdl.dtsi. This is a no-op today, but prevents similar > inconsistencies if the soc file will be changed in a similar way > in the future. What an elaborate wording :-) > Signed-off-by: Thorsten Scherer <t.scherer@eckelmann.de> Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- > @Shawn: Please feel free to add a Fixes: line, if you will. s/will/want/ (If I had to guess, I'd say Thorsten is a German. :-) The Fixes line would be: Fixes: f3e7dae323ab ("ARM: dts: imx6qdl: add enet_out clk support") Best regards Uwe
On Wed, Apr 06, 2022 at 06:39:45AM +0200, Thorsten Scherer wrote: > Commit f3e7dae323ab ("ARM: dts: imx6qdl: add enet_out clk > support") added another item to the list of clocks for the fec > device. As imx6dl-eckelmann-ci4x10.dts only overwrites clocks, > but not clock-names this resulted in an inconsistency with > clocks having one item more than clock-names. > > Also overwrite clock-names with the same value as in > imx6qdl.dtsi. This is a no-op today, but prevents similar > inconsistencies if the soc file will be changed in a similar way > in the future. > > Signed-off-by: Thorsten Scherer <t.scherer@eckelmann.de> Applied, thanks!
diff --git a/arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts b/arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts index b4a9523e325b..864dc5018451 100644 --- a/arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts +++ b/arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts @@ -297,7 +297,11 @@ &fec { phy-mode = "rmii"; phy-reset-gpios = <&gpio1 18 GPIO_ACTIVE_LOW>; phy-handle = <&phy>; - clocks = <&clks IMX6QDL_CLK_ENET>, <&clks IMX6QDL_CLK_ENET>, <&rmii_clk>; + clocks = <&clks IMX6QDL_CLK_ENET>, + <&clks IMX6QDL_CLK_ENET>, + <&rmii_clk>, + <&clks IMX6QDL_CLK_ENET_REF>; + clock-names = "ipg", "ahb", "ptp", "enet_out"; status = "okay"; mdio {
Commit f3e7dae323ab ("ARM: dts: imx6qdl: add enet_out clk support") added another item to the list of clocks for the fec device. As imx6dl-eckelmann-ci4x10.dts only overwrites clocks, but not clock-names this resulted in an inconsistency with clocks having one item more than clock-names. Also overwrite clock-names with the same value as in imx6qdl.dtsi. This is a no-op today, but prevents similar inconsistencies if the soc file will be changed in a similar way in the future. Signed-off-by: Thorsten Scherer <t.scherer@eckelmann.de> --- @Shawn: Please feel free to add a Fixes: line, if you will. arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)