Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+9
-9
+3
-3
arch/arm/boot/dts/intel/socfpga/socfpga_arria10.dtsi
+3
-3
arch/arm/boot/dts/intel/socfpga/socfpga_arria10.dtsi
···
440
440
clocks = <&l4_mp_clk>, <&peri_emac_ptp_clk>;
441
441
clock-names = "stmmaceth", "ptp_ref";
442
442
resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>;
443
-
reset-names = "stmmaceth", "stmmaceth-ocp";
443
+
reset-names = "stmmaceth", "ahb";
444
444
snps,axi-config = <&socfpga_axi_setup>;
445
445
status = "disabled";
446
446
};
···
460
460
clocks = <&l4_mp_clk>, <&peri_emac_ptp_clk>;
461
461
clock-names = "stmmaceth", "ptp_ref";
462
462
resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>;
463
-
reset-names = "stmmaceth", "stmmaceth-ocp";
463
+
reset-names = "stmmaceth", "ahb";
464
464
snps,axi-config = <&socfpga_axi_setup>;
465
465
status = "disabled";
466
466
};
···
480
480
clocks = <&l4_mp_clk>, <&peri_emac_ptp_clk>;
481
481
clock-names = "stmmaceth", "ptp_ref";
482
482
resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>;
483
-
reset-names = "stmmaceth", "stmmaceth-ocp";
483
+
reset-names = "stmmaceth", "ahb";
484
484
snps,axi-config = <&socfpga_axi_setup>;
485
485
status = "disabled";
486
486
};
+3
-3
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
+3
-3
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
···
153
153
interrupt-names = "macirq";
154
154
mac-address = [00 00 00 00 00 00];
155
155
resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>;
156
-
reset-names = "stmmaceth", "stmmaceth-ocp";
156
+
reset-names = "stmmaceth", "ahb";
157
157
clocks = <&clkmgr STRATIX10_EMAC0_CLK>, <&clkmgr STRATIX10_EMAC_PTP_CLK>;
158
158
clock-names = "stmmaceth", "ptp_ref";
159
159
tx-fifo-depth = <16384>;
···
171
171
interrupt-names = "macirq";
172
172
mac-address = [00 00 00 00 00 00];
173
173
resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>;
174
-
reset-names = "stmmaceth", "stmmaceth-ocp";
174
+
reset-names = "stmmaceth", "ahb";
175
175
clocks = <&clkmgr STRATIX10_EMAC1_CLK>, <&clkmgr STRATIX10_EMAC_PTP_CLK>;
176
176
clock-names = "stmmaceth", "ptp_ref";
177
177
tx-fifo-depth = <16384>;
···
189
189
interrupt-names = "macirq";
190
190
mac-address = [00 00 00 00 00 00];
191
191
resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>;
192
-
reset-names = "stmmaceth", "stmmaceth-ocp";
192
+
reset-names = "stmmaceth", "ahb";
193
193
clocks = <&clkmgr STRATIX10_EMAC2_CLK>, <&clkmgr STRATIX10_EMAC_PTP_CLK>;
194
194
clock-names = "stmmaceth", "ptp_ref";
195
195
tx-fifo-depth = <16384>;
+3
-3
arch/arm64/boot/dts/intel/socfpga_agilex.dtsi
+3
-3
arch/arm64/boot/dts/intel/socfpga_agilex.dtsi
···
158
158
interrupt-names = "macirq";
159
159
mac-address = [00 00 00 00 00 00];
160
160
resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>;
161
-
reset-names = "stmmaceth", "stmmaceth-ocp";
161
+
reset-names = "stmmaceth", "ahb";
162
162
tx-fifo-depth = <16384>;
163
163
rx-fifo-depth = <16384>;
164
164
snps,multicast-filter-bins = <256>;
···
176
176
interrupt-names = "macirq";
177
177
mac-address = [00 00 00 00 00 00];
178
178
resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>;
179
-
reset-names = "stmmaceth", "stmmaceth-ocp";
179
+
reset-names = "stmmaceth", "ahb";
180
180
tx-fifo-depth = <16384>;
181
181
rx-fifo-depth = <16384>;
182
182
snps,multicast-filter-bins = <256>;
···
194
194
interrupt-names = "macirq";
195
195
mac-address = [00 00 00 00 00 00];
196
196
resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>;
197
-
reset-names = "stmmaceth", "stmmaceth-ocp";
197
+
reset-names = "stmmaceth", "ahb";
198
198
tx-fifo-depth = <16384>;
199
199
rx-fifo-depth = <16384>;
200
200
snps,multicast-filter-bins = <256>;