Skip to contentSkip to conversation

Add GMAC_AHB_RESET to ipq8064 ethernet resets

PATCH RESEND In review Matthew Hagan 2 participants 4 messages Jun 9, 2021 – Jun 18, 2021

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

cover Add GMAC_AHB_RESET to ipq8064 ethernet resets

These two additional patches were dropped at v2, v3 by error and should have been included with "net: stmmac: explicitly deassert GMAC_AHB_RESET". These add GMAC_AHB_RESET to the ipq8064 ethernet reset definitions and documentation.

Apologies for the oversight.

Matthew Hagan (2):
ARM: dts: qcom: add ahb reset to ipq806x-gmac
dt-bindings: net: stmmac: add ahb reset to example

 .../devicetree/bindings/net/ipq806x-dwmac.txt |  5 +++--
 arch/arm/boot/dts/qcom-ipq8064.dtsi           | 20 +++++++++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)
Signature · 1 line
2.26.3
#1 lore raw

PATCH RESEND 1/2 ARM: dts: qcom: add ahb reset to ipq806x-gmac

Add GMAC_AHB_RESET to the resets property of each GMAC node.

---
 arch/arm/boot/dts/qcom-ipq8064.dtsi | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
arch/arm/boot/dts/qcom-ipq8064.dtsi +12 -8
index 98995ead4413..1dbceaf3454b 100644
@@ -643,8 +643,9 @@ gmac0: ethernet@37000000 {
 			clocks = <&gcc GMAC_CORE1_CLK>;
 			clock-names = "stmmaceth";
 
-			resets = <&gcc GMAC_CORE1_RESET>;
-			reset-names = "stmmaceth";
+			resets = <&gcc GMAC_CORE1_RESET>,
+				 <&gcc GMAC_AHB_RESET>;
+			reset-names = "stmmaceth", "ahb";
 
 			status = "disabled";
 		};
@@ -666,8 +667,9 @@ gmac1: ethernet@37200000 {
 			clocks = <&gcc GMAC_CORE2_CLK>;
 			clock-names = "stmmaceth";
 
-			resets = <&gcc GMAC_CORE2_RESET>;
-			reset-names = "stmmaceth";
+			resets = <&gcc GMAC_CORE2_RESET>,
+				 <&gcc GMAC_AHB_RESET>;
+			reset-names = "stmmaceth", "ahb";
 
 			status = "disabled";
 		};
@@ -689,8 +691,9 @@ gmac2: ethernet@37400000 {
 			clocks = <&gcc GMAC_CORE3_CLK>;
 			clock-names = "stmmaceth";
 
-			resets = <&gcc GMAC_CORE3_RESET>;
-			reset-names = "stmmaceth";
+			resets = <&gcc GMAC_CORE3_RESET>,
+				 <&gcc GMAC_AHB_RESET>;
+			reset-names = "stmmaceth", "ahb";
 
 			status = "disabled";
 		};
@@ -712,8 +715,9 @@ gmac3: ethernet@37600000 {
 			clocks = <&gcc GMAC_CORE4_CLK>;
 			clock-names = "stmmaceth";
 
-			resets = <&gcc GMAC_CORE4_RESET>;
-			reset-names = "stmmaceth";
+			resets = <&gcc GMAC_CORE4_RESET>,
+				 <&gcc GMAC_AHB_RESET>;
+			reset-names = "stmmaceth", "ahb";
 
 			status = "disabled";
 		};
Signature · 1 line
2.26.3
#2 lore raw

PATCH RESEND 2/2 dt-bindings: net: stmmac: add ahb reset to example

In reply to Matthew Hagan

Add ahb reset to the reset properties within the example GMAC node.

---
 Documentation/devicetree/bindings/net/ipq806x-dwmac.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/net/ipq806x-dwmac.txt +3 -2
index 6d7ab4e524d4..ef5fd9f0b156 100644
@@ -30,6 +30,7 @@ Example:
 		clocks = <&gcc GMAC_CORE1_CLK>;
 		clock-names = "stmmaceth";
 
-		resets = <&gcc GMAC_CORE1_RESET>;
-		reset-names = "stmmaceth";
+		resets = <&gcc GMAC_CORE1_RESET>,
+			 <&gcc GMAC_AHB_RESET>;
+		reset-names = "stmmaceth", "ahb";
 	};
Signature · 1 line
2.26.3
maintainer Acked-by on v1 2/2
#3 lore raw

Re: [PATCH RESEND 2/2] dt-bindings: net: stmmac: add ahb reset to example

Quoted 7 lines · Matthew Hagan

Add ahb reset to the reset properties within the example GMAC node.

---
 Documentation/devicetree/bindings/net/ipq806x-dwmac.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)