Skip to content

Commit 331085a

Browse files
author
Dinh Nguyen
committed
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 ("843f603762a5 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: Dinh Nguyen <dinguyen@kernel.org> --- v2: update commit message to further describe the reason for the change
1 parent 774acd5 commit 331085a

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

arch/arm/boot/dts/intel/socfpga/socfpga_arria10.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@
440440
clocks = <&l4_mp_clk>, <&peri_emac_ptp_clk>;
441441
clock-names = "stmmaceth", "ptp_ref";
442442
resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>;
443-
reset-names = "stmmaceth", "stmmaceth-ocp";
443+
reset-names = "stmmaceth", "ahb";
444444
snps,axi-config = <&socfpga_axi_setup>;
445445
status = "disabled";
446446
};
@@ -460,7 +460,7 @@
460460
clocks = <&l4_mp_clk>, <&peri_emac_ptp_clk>;
461461
clock-names = "stmmaceth", "ptp_ref";
462462
resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>;
463-
reset-names = "stmmaceth", "stmmaceth-ocp";
463+
reset-names = "stmmaceth", "ahb";
464464
snps,axi-config = <&socfpga_axi_setup>;
465465
status = "disabled";
466466
};
@@ -480,7 +480,7 @@
480480
clocks = <&l4_mp_clk>, <&peri_emac_ptp_clk>;
481481
clock-names = "stmmaceth", "ptp_ref";
482482
resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>;
483-
reset-names = "stmmaceth", "stmmaceth-ocp";
483+
reset-names = "stmmaceth", "ahb";
484484
snps,axi-config = <&socfpga_axi_setup>;
485485
status = "disabled";
486486
};

arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
interrupt-names = "macirq";
154154
mac-address = [00 00 00 00 00 00];
155155
resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>;
156-
reset-names = "stmmaceth", "stmmaceth-ocp";
156+
reset-names = "stmmaceth", "ahb";
157157
clocks = <&clkmgr STRATIX10_EMAC0_CLK>, <&clkmgr STRATIX10_EMAC_PTP_CLK>;
158158
clock-names = "stmmaceth", "ptp_ref";
159159
tx-fifo-depth = <16384>;
@@ -171,7 +171,7 @@
171171
interrupt-names = "macirq";
172172
mac-address = [00 00 00 00 00 00];
173173
resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>;
174-
reset-names = "stmmaceth", "stmmaceth-ocp";
174+
reset-names = "stmmaceth", "ahb";
175175
clocks = <&clkmgr STRATIX10_EMAC1_CLK>, <&clkmgr STRATIX10_EMAC_PTP_CLK>;
176176
clock-names = "stmmaceth", "ptp_ref";
177177
tx-fifo-depth = <16384>;
@@ -189,7 +189,7 @@
189189
interrupt-names = "macirq";
190190
mac-address = [00 00 00 00 00 00];
191191
resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>;
192-
reset-names = "stmmaceth", "stmmaceth-ocp";
192+
reset-names = "stmmaceth", "ahb";
193193
clocks = <&clkmgr STRATIX10_EMAC2_CLK>, <&clkmgr STRATIX10_EMAC_PTP_CLK>;
194194
clock-names = "stmmaceth", "ptp_ref";
195195
tx-fifo-depth = <16384>;

arch/arm64/boot/dts/intel/socfpga_agilex.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
interrupt-names = "macirq";
159159
mac-address = [00 00 00 00 00 00];
160160
resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>;
161-
reset-names = "stmmaceth", "stmmaceth-ocp";
161+
reset-names = "stmmaceth", "ahb";
162162
tx-fifo-depth = <16384>;
163163
rx-fifo-depth = <16384>;
164164
snps,multicast-filter-bins = <256>;
@@ -176,7 +176,7 @@
176176
interrupt-names = "macirq";
177177
mac-address = [00 00 00 00 00 00];
178178
resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>;
179-
reset-names = "stmmaceth", "stmmaceth-ocp";
179+
reset-names = "stmmaceth", "ahb";
180180
tx-fifo-depth = <16384>;
181181
rx-fifo-depth = <16384>;
182182
snps,multicast-filter-bins = <256>;
@@ -194,7 +194,7 @@
194194
interrupt-names = "macirq";
195195
mac-address = [00 00 00 00 00 00];
196196
resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>;
197-
reset-names = "stmmaceth", "stmmaceth-ocp";
197+
reset-names = "stmmaceth", "ahb";
198198
tx-fifo-depth = <16384>;
199199
rx-fifo-depth = <16384>;
200200
snps,multicast-filter-bins = <256>;

0 commit comments

Comments
 (0)