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

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

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

+3 −3
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ 
			clocks = <&l4_mp_clk>, <&peri_emac_ptp_clk>;

			clock-names = "stmmaceth", "ptp_ref";

			resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>;

			reset-names = "stmmaceth", "stmmaceth-ocp";

			reset-names = "stmmaceth", "ahb";

			snps,axi-config = <&socfpga_axi_setup>;

			status = "disabled";

		};
@@ -460,7 +460,7 @@ 
			clocks = <&l4_mp_clk>, <&peri_emac_ptp_clk>;

			clock-names = "stmmaceth", "ptp_ref";

			resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>;

			reset-names = "stmmaceth", "stmmaceth-ocp";

			reset-names = "stmmaceth", "ahb";

			snps,axi-config = <&socfpga_axi_setup>;

			status = "disabled";

		};
@@ -480,7 +480,7 @@ 
			clocks = <&l4_mp_clk>, <&peri_emac_ptp_clk>;

			clock-names = "stmmaceth", "ptp_ref";

			resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>;

			reset-names = "stmmaceth", "stmmaceth-ocp";

			reset-names = "stmmaceth", "ahb";

			snps,axi-config = <&socfpga_axi_setup>;

			status = "disabled";

		};

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

+3 −3
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ 
			interrupt-names = "macirq";

			mac-address = [00 00 00 00 00 00];

			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>;

			clock-names = "stmmaceth", "ptp_ref";

			tx-fifo-depth = <16384>;
@@ -171,7 +171,7 @@ 
			interrupt-names = "macirq";

			mac-address = [00 00 00 00 00 00];

			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>;

			clock-names = "stmmaceth", "ptp_ref";

			tx-fifo-depth = <16384>;
@@ -189,7 +189,7 @@ 
			interrupt-names = "macirq";

			mac-address = [00 00 00 00 00 00];

			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>;

			clock-names = "stmmaceth", "ptp_ref";

			tx-fifo-depth = <16384>;

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

+3 −3
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ 
			interrupt-names = "macirq";

			mac-address = [00 00 00 00 00 00];

			resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>;

			reset-names = "stmmaceth", "stmmaceth-ocp";

			reset-names = "stmmaceth", "ahb";

			tx-fifo-depth = <16384>;

			rx-fifo-depth = <16384>;

			snps,multicast-filter-bins = <256>;
@@ -176,7 +176,7 @@ 
			interrupt-names = "macirq";

			mac-address = [00 00 00 00 00 00];

			resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>;

			reset-names = "stmmaceth", "stmmaceth-ocp";

			reset-names = "stmmaceth", "ahb";

			tx-fifo-depth = <16384>;

			rx-fifo-depth = <16384>;

			snps,multicast-filter-bins = <256>;
@@ -194,7 +194,7 @@ 
			interrupt-names = "macirq";

			mac-address = [00 00 00 00 00 00];

			resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>;

			reset-names = "stmmaceth", "stmmaceth-ocp";

			reset-names = "stmmaceth", "ahb";

			tx-fifo-depth = <16384>;

			rx-fifo-depth = <16384>;

			snps,multicast-filter-bins = <256>;