Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71ae8f52 authored Oct 15, 2014 by Giuseppe CAVALLARO Committed by David S. Miller Oct 15, 2014

stmmac: fix sti compatibililies



this patch is to fix the stmmac data compatibilities for
all the SoCs inside the platform file.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 2ef1e9ef

drivers/net/ethernet/stmicro/stmmac/stmmac.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -144,7 +144,8 @@ extern const struct stmmac_of_data meson6_dwmac_data;
	extern const struct stmmac_of_data sun7i_gmac_data;		extern const struct stmmac_of_data sun7i_gmac_data;
	#endif		#endif
	#ifdef CONFIG_DWMAC_STI		#ifdef CONFIG_DWMAC_STI
	extern const struct stmmac_of_data sti_gmac_data;		extern const struct stmmac_of_data stih4xx_dwmac_data;
			extern const struct stmmac_of_data stid127_dwmac_data;
	#endif		#endif
	#ifdef CONFIG_DWMAC_SOCFPGA		#ifdef CONFIG_DWMAC_SOCFPGA
	extern const struct stmmac_of_data socfpga_gmac_data;		extern const struct stmmac_of_data socfpga_gmac_data;

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -37,10 +37,10 @@ static const struct of_device_id stmmac_dt_ids[] = {
	{ .compatible = "allwinner,sun7i-a20-gmac", .data = &sun7i_gmac_data},		{ .compatible = "allwinner,sun7i-a20-gmac", .data = &sun7i_gmac_data},
	#endif		#endif
	#ifdef CONFIG_DWMAC_STI		#ifdef CONFIG_DWMAC_STI
	{ .compatible = "st,stih415-dwmac", .data = &sti_gmac_data},		{ .compatible = "st,stih415-dwmac", .data = &stih4xx_dwmac_data},
	{ .compatible = "st,stih416-dwmac", .data = &sti_gmac_data},		{ .compatible = "st,stih416-dwmac", .data = &stih4xx_dwmac_data},
	{ .compatible = "st,stid127-dwmac", .data = &sti_gmac_data},		{ .compatible = "st,stid127-dwmac", .data = &stid127_dwmac_data},
	{ .compatible = "st,stih407-dwmac", .data = &sti_gmac_data},		{ .compatible = "st,stih407-dwmac", .data = &stih4xx_dwmac_data},
	#endif		#endif
	#ifdef CONFIG_DWMAC_SOCFPGA		#ifdef CONFIG_DWMAC_SOCFPGA
	{ .compatible = "altr,socfpga-stmmac", .data = &socfpga_gmac_data },		{ .compatible = "altr,socfpga-stmmac", .data = &socfpga_gmac_data },