mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
771691ec83
Add backports of the following patches: "net: stmmac: explicitly deassert GMAC_AHB_RESET" and "ARM: dts: qcom: add ahb reset to ipq806x-gmac" Required for Meraki MR42/MR52. Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
65 lines
1.8 KiB
Diff
65 lines
1.8 KiB
Diff
From f95c4c56d65225a537a2d88735fde7ec4d37641d Mon Sep 17 00:00:00 2001
|
|
From: Matthew Hagan <mnhagan88@gmail.com>
|
|
Date: Sat, 5 Jun 2021 18:35:38 +0100
|
|
Subject: ARM: dts: qcom: add ahb reset to ipq806x-gmac
|
|
|
|
Add GMAC_AHB_RESET to the resets property of each gmac node.
|
|
|
|
Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
|
|
Link: https://lore.kernel.org/r/20210605173546.4102455-2-mnhagan88@gmail.com
|
|
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
|
|
---
|
|
arch/arm/boot/dts/qcom-ipq8064.dtsi | 20 ++++++++++++--------
|
|
1 file changed, 12 insertions(+), 8 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
|
+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
|
@@ -1335,8 +1335,9 @@
|
|
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";
|
|
};
|
|
@@ -1358,8 +1359,9 @@
|
|
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";
|
|
};
|
|
@@ -1381,8 +1383,9 @@
|
|
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";
|
|
};
|
|
@@ -1404,8 +1407,9 @@
|
|
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";
|
|
};
|