Commit 331085a4 authored by Dinh Nguyen's avatar Dinh Nguyen

arm64: dts: socfpga: change the reset-name of "stmmaceth-ocp" to "ahb"

The "stmmaceth-ocp" reset line on the SoCFPGA stmmac ethernet driver is
the same as the "ahb" reset on a standard stmmac ethernet.

commit ("843f6037 dt-bindings: net: snps,dwmac: Add 'ahb'
reset/reset-name") documented the second reset signal as 'ahb' instead
of 'stmmaceth-ocp'. Change the reset-names of the SoCFPGA DWMAC driver to
'ahb'. In order not to break ABI, we will keep support in thedwmac-socfpga
driver to still make use of "stmmaceth-ocp".

This also fixes the dtbs_check warning:
ethernet@ff802000: reset-names:1: 'ahb' was expected
Signed-off-by: default avatarDinh Nguyen <dinguyen@kernel.org>
---
v2: update commit message to further describe the reason for the change
parent 774acd59
...@@ -440,7 +440,7 @@ gmac0: ethernet@ff800000 { ...@@ -440,7 +440,7 @@ gmac0: ethernet@ff800000 {
clocks = <&l4_mp_clk>, <&peri_emac_ptp_clk>; clocks = <&l4_mp_clk>, <&peri_emac_ptp_clk>;
clock-names = "stmmaceth", "ptp_ref"; clock-names = "stmmaceth", "ptp_ref";
resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>; resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>;
reset-names = "stmmaceth", "stmmaceth-ocp"; reset-names = "stmmaceth", "ahb";
snps,axi-config = <&socfpga_axi_setup>; snps,axi-config = <&socfpga_axi_setup>;
status = "disabled"; status = "disabled";
}; };
...@@ -460,7 +460,7 @@ gmac1: ethernet@ff802000 { ...@@ -460,7 +460,7 @@ gmac1: ethernet@ff802000 {
clocks = <&l4_mp_clk>, <&peri_emac_ptp_clk>; clocks = <&l4_mp_clk>, <&peri_emac_ptp_clk>;
clock-names = "stmmaceth", "ptp_ref"; clock-names = "stmmaceth", "ptp_ref";
resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>; resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>;
reset-names = "stmmaceth", "stmmaceth-ocp"; reset-names = "stmmaceth", "ahb";
snps,axi-config = <&socfpga_axi_setup>; snps,axi-config = <&socfpga_axi_setup>;
status = "disabled"; status = "disabled";
}; };
...@@ -480,7 +480,7 @@ gmac2: ethernet@ff804000 { ...@@ -480,7 +480,7 @@ gmac2: ethernet@ff804000 {
clocks = <&l4_mp_clk>, <&peri_emac_ptp_clk>; clocks = <&l4_mp_clk>, <&peri_emac_ptp_clk>;
clock-names = "stmmaceth", "ptp_ref"; clock-names = "stmmaceth", "ptp_ref";
resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>; resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>;
reset-names = "stmmaceth", "stmmaceth-ocp"; reset-names = "stmmaceth", "ahb";
snps,axi-config = <&socfpga_axi_setup>; snps,axi-config = <&socfpga_axi_setup>;
status = "disabled"; status = "disabled";
}; };
......
...@@ -153,7 +153,7 @@ gmac0: ethernet@ff800000 { ...@@ -153,7 +153,7 @@ gmac0: ethernet@ff800000 {
interrupt-names = "macirq"; interrupt-names = "macirq";
mac-address = [00 00 00 00 00 00]; mac-address = [00 00 00 00 00 00];
resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>; resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>;
reset-names = "stmmaceth", "stmmaceth-ocp"; reset-names = "stmmaceth", "ahb";
clocks = <&clkmgr STRATIX10_EMAC0_CLK>, <&clkmgr STRATIX10_EMAC_PTP_CLK>; clocks = <&clkmgr STRATIX10_EMAC0_CLK>, <&clkmgr STRATIX10_EMAC_PTP_CLK>;
clock-names = "stmmaceth", "ptp_ref"; clock-names = "stmmaceth", "ptp_ref";
tx-fifo-depth = <16384>; tx-fifo-depth = <16384>;
...@@ -171,7 +171,7 @@ gmac1: ethernet@ff802000 { ...@@ -171,7 +171,7 @@ gmac1: ethernet@ff802000 {
interrupt-names = "macirq"; interrupt-names = "macirq";
mac-address = [00 00 00 00 00 00]; mac-address = [00 00 00 00 00 00];
resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>; resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>;
reset-names = "stmmaceth", "stmmaceth-ocp"; reset-names = "stmmaceth", "ahb";
clocks = <&clkmgr STRATIX10_EMAC1_CLK>, <&clkmgr STRATIX10_EMAC_PTP_CLK>; clocks = <&clkmgr STRATIX10_EMAC1_CLK>, <&clkmgr STRATIX10_EMAC_PTP_CLK>;
clock-names = "stmmaceth", "ptp_ref"; clock-names = "stmmaceth", "ptp_ref";
tx-fifo-depth = <16384>; tx-fifo-depth = <16384>;
...@@ -189,7 +189,7 @@ gmac2: ethernet@ff804000 { ...@@ -189,7 +189,7 @@ gmac2: ethernet@ff804000 {
interrupt-names = "macirq"; interrupt-names = "macirq";
mac-address = [00 00 00 00 00 00]; mac-address = [00 00 00 00 00 00];
resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>; resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>;
reset-names = "stmmaceth", "stmmaceth-ocp"; reset-names = "stmmaceth", "ahb";
clocks = <&clkmgr STRATIX10_EMAC2_CLK>, <&clkmgr STRATIX10_EMAC_PTP_CLK>; clocks = <&clkmgr STRATIX10_EMAC2_CLK>, <&clkmgr STRATIX10_EMAC_PTP_CLK>;
clock-names = "stmmaceth", "ptp_ref"; clock-names = "stmmaceth", "ptp_ref";
tx-fifo-depth = <16384>; tx-fifo-depth = <16384>;
......
...@@ -158,7 +158,7 @@ gmac0: ethernet@ff800000 { ...@@ -158,7 +158,7 @@ gmac0: ethernet@ff800000 {
interrupt-names = "macirq"; interrupt-names = "macirq";
mac-address = [00 00 00 00 00 00]; mac-address = [00 00 00 00 00 00];
resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>; resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>;
reset-names = "stmmaceth", "stmmaceth-ocp"; reset-names = "stmmaceth", "ahb";
tx-fifo-depth = <16384>; tx-fifo-depth = <16384>;
rx-fifo-depth = <16384>; rx-fifo-depth = <16384>;
snps,multicast-filter-bins = <256>; snps,multicast-filter-bins = <256>;
...@@ -176,7 +176,7 @@ gmac1: ethernet@ff802000 { ...@@ -176,7 +176,7 @@ gmac1: ethernet@ff802000 {
interrupt-names = "macirq"; interrupt-names = "macirq";
mac-address = [00 00 00 00 00 00]; mac-address = [00 00 00 00 00 00];
resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>; resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>;
reset-names = "stmmaceth", "stmmaceth-ocp"; reset-names = "stmmaceth", "ahb";
tx-fifo-depth = <16384>; tx-fifo-depth = <16384>;
rx-fifo-depth = <16384>; rx-fifo-depth = <16384>;
snps,multicast-filter-bins = <256>; snps,multicast-filter-bins = <256>;
...@@ -194,7 +194,7 @@ gmac2: ethernet@ff804000 { ...@@ -194,7 +194,7 @@ gmac2: ethernet@ff804000 {
interrupt-names = "macirq"; interrupt-names = "macirq";
mac-address = [00 00 00 00 00 00]; mac-address = [00 00 00 00 00 00];
resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>; resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>;
reset-names = "stmmaceth", "stmmaceth-ocp"; reset-names = "stmmaceth", "ahb";
tx-fifo-depth = <16384>; tx-fifo-depth = <16384>;
rx-fifo-depth = <16384>; rx-fifo-depth = <16384>;
snps,multicast-filter-bins = <256>; snps,multicast-filter-bins = <256>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment