stmmac: fix sti compatibililies
authorGiuseppe CAVALLARO <peppe.cavallaro@st.com>
Wed, 15 Oct 2014 05:30:41 +0000 (07:30 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 15 Oct 2014 15:45:42 +0000 (11:45 -0400)
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>
drivers/net/ethernet/stmicro/stmmac/stmmac.h
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c

index 44528896355d8d4dbae235b6c7b7b76c5caa7ed8..c3c40650b309ca94519af4de873619ec7be3a7ee 100644 (file)
@@ -144,7 +144,8 @@ extern const struct stmmac_of_data meson6_dwmac_data;
 extern const struct stmmac_of_data sun7i_gmac_data;
 #endif
 #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
 #ifdef CONFIG_DWMAC_SOCFPGA
 extern const struct stmmac_of_data socfpga_gmac_data;
index 0d6b9adad6ddbaadd6113c275f522bfa280704a9..db56fa7ce8f91ae816b4733c501f60504c2ae228 100644 (file)
@@ -37,10 +37,10 @@ static const struct of_device_id stmmac_dt_ids[] = {
        { .compatible = "allwinner,sun7i-a20-gmac", .data = &sun7i_gmac_data},
 #endif
 #ifdef CONFIG_DWMAC_STI
-       { .compatible = "st,stih415-dwmac", .data = &sti_gmac_data},
-       { .compatible = "st,stih416-dwmac", .data = &sti_gmac_data},
-       { .compatible = "st,stid127-dwmac", .data = &sti_gmac_data},
-       { .compatible = "st,stih407-dwmac", .data = &sti_gmac_data},
+       { .compatible = "st,stih415-dwmac", .data = &stih4xx_dwmac_data},
+       { .compatible = "st,stih416-dwmac", .data = &stih4xx_dwmac_data},
+       { .compatible = "st,stid127-dwmac", .data = &stid127_dwmac_data},
+       { .compatible = "st,stih407-dwmac", .data = &stih4xx_dwmac_data},
 #endif
 #ifdef CONFIG_DWMAC_SOCFPGA
        { .compatible = "altr,socfpga-stmmac", .data = &socfpga_gmac_data },