Skip to contentSkip to conversation

ARM: dts: ci4x10: Reflect upstream change to fec clocks

PATCH In review Thorsten Scherer 3 participants 7 messages Mar 29, 2022 – Apr 10, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: dts: ci4x10: Reflect upstream change to fec clocks

Reflect changes of

commit f3e7dae323ab ("ARM: dts: imx6qdl: add enet_out clk support")

and overwrite clocks accordingly.

---
 arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts +4 -1
index b4a9523e325b..98a503d9be21 100644
@@ -297,7 +297,10 @@ &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>;
 	status = "okay";
 
 	mdio {
Signature · 7 lines
2.30.2


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#1 lore raw

Hello Thorsten,

from your POV f3e7dae323ab is an upstream change, but as your patch targets upstream, too, it doesn't really make sense to write "Reflect upstream change" in the Subject.

I would have written:

ARM: dts: ci4x10: Adapt to changes in imx6qdl.dtsi regarding fec clocks

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.

Maybe it would make sense to overwrite clock-names, too, to prevent a similar inconsistency in the future?! If yes:

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.

The breakage isn't bad I think (is it?), so I don't think a Fixes: line is necessary. @Shawn: Do you agree?

arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts &fec { · line 303

Quoted 13 lines · Thorsten Scherer
arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts +4 -1
index b4a9523e325b..98a503d9be21 100644
@@ -297,7 +297,10 @@ &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>;

The change is fine, but if you agree to adding clock-names needs adaption of course.

Best regards
Uwe

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#2 lore raw

Hello Uwe,

Quoted 6 lines

Hello Thorsten,

from your POV f3e7dae323ab is an upstream change, but as your patch targets upstream, too, it doesn't really make sense to write "Reflect upstream change" in the Subject.

you are right.

Quoted 9 lines

I would have written:

ARM: dts: ci4x10: Adapt to changes in imx6qdl.dtsi regarding fec clocks

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.

Thank you for suggesting a message. Would you mind, if I'd pick it up verbatim?

Quoted 8 lines

Maybe it would make sense to overwrite clock-names, too, to prevent a similar inconsistency in the future?! If yes:

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.

Overwriting clock-names sounds sensible.

Quoted 4 lines

The breakage isn't bad I think (is it?), so I don't think a Fixes: line is necessary. @Shawn: Do you agree?

On Tue, Mar 29, 2022 at 08:12:54AM +0200, Thorsten Scherer wrote:

Quoted 17 lines

arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts &fec { · line 303

Quoted 13 lines
arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts +4 -1
index b4a9523e325b..98a503d9be21 100644
@@ -297,7 +297,10 @@ &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>;

The change is fine, but if you agree to adding clock-names needs adaption of course.

After Shawn's feedback concerning the Fixes line I will send a v2.

Quoted 2 lines

Best regards
Uwe

Kind regards
Thorsten

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#3 lore raw

Hey Thorsten,

Quoted 4 lines · Thorsten Scherer
Quoted 4 lines

I would have written:

ARM: dts: ci4x10: Adapt to changes in imx6qdl.dtsi regarding fec clocks

Quoted 8 lines
Quoted 5 lines

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.

Thank you for suggesting a message. Would you mind, if I'd pick it up verbatim?

I don't mind. If you take it verbatim you can be sure to get a compliment from me for the elaborate wording :-)

Quoted 33 lines
Quoted 8 lines

Maybe it would make sense to overwrite clock-names, too, to prevent a similar inconsistency in the future?! If yes:

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.

Overwriting clock-names sounds sensible.

Quoted 4 lines

The breakage isn't bad I think (is it?), so I don't think a Fixes: line is necessary. @Shawn: Do you agree?

On Tue, Mar 29, 2022 at 08:12:54AM +0200, Thorsten Scherer wrote:

Quoted 17 lines

arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts &fec { · line 303

Quoted 13 lines
arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts +4 -1
index b4a9523e325b..98a503d9be21 100644
@@ -297,7 +297,10 @@ &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>;

The change is fine, but if you agree to adding clock-names needs adaption of course.

Quoted 1 line

After Shawn's feedback concerning the Fixes line I will send a v2.

I wouldn't wait. Just send a v2 with or without a Fixes line and mention below the --- that Shawn should add or drop it if he doesn't agree to your choice.

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#4 lore raw

PATCH v2 1/1 ARM: dts: ci4x10: Adapt to changes in imx6qdl.dtsi regarding fec clocks

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.

---
@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(-)
arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts +5 -1
index b4a9523e325b..864dc5018451 100644
@@ -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 {
Signature · 7 lines
2.30.2


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Reviewed-by on v2 1/1
#5 lore raw

Re: [PATCH v2] ARM: dts: ci4x10: Adapt to changes in imx6qdl.dtsi regarding fec clocks

Hello Thorsten,

Quoted 10 lines · Thorsten Scherer

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 :-)

Quoted 1 line
Quoted 2 lines

---
@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

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Applied
#6 lore raw

Re: [PATCH v2] ARM: dts: ci4x10: Adapt to changes in imx6qdl.dtsi regarding fec clocks

In reply to Thorsten Scherer
Quoted 6 lines · Thorsten Scherer

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.

Quoted 6 lines

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.

Applied, thanks!

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel