diff options
author | Giuseppe CAVALLARO <peppe.cavallaro@st.com> | 2014-10-15 01:30:41 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-10-15 11:45:42 -0400 |
commit | 71ae8f5271b31da1172751059deb8bfc32b2b759 (patch) | |
tree | 67d542537a36288a278253a549753e7d399e6528 /drivers/net/ethernet/stmicro | |
parent | 2ef1e9efebce49ffc9ae13a6e9d93da83734494e (diff) |
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>
Diffstat (limited to 'drivers/net/ethernet/stmicro')
-rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac.h | 3 | ||||
-rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h index 44528896355d..c3c40650b309 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h | |||
@@ -144,7 +144,8 @@ extern const struct stmmac_of_data meson6_dwmac_data; | |||
144 | extern const struct stmmac_of_data sun7i_gmac_data; | 144 | extern const struct stmmac_of_data sun7i_gmac_data; |
145 | #endif | 145 | #endif |
146 | #ifdef CONFIG_DWMAC_STI | 146 | #ifdef CONFIG_DWMAC_STI |
147 | extern const struct stmmac_of_data sti_gmac_data; | 147 | extern const struct stmmac_of_data stih4xx_dwmac_data; |
148 | extern const struct stmmac_of_data stid127_dwmac_data; | ||
148 | #endif | 149 | #endif |
149 | #ifdef CONFIG_DWMAC_SOCFPGA | 150 | #ifdef CONFIG_DWMAC_SOCFPGA |
150 | extern const struct stmmac_of_data socfpga_gmac_data; | 151 | extern const struct stmmac_of_data socfpga_gmac_data; |
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index 0d6b9adad6dd..db56fa7ce8f9 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | |||
@@ -37,10 +37,10 @@ static const struct of_device_id stmmac_dt_ids[] = { | |||
37 | { .compatible = "allwinner,sun7i-a20-gmac", .data = &sun7i_gmac_data}, | 37 | { .compatible = "allwinner,sun7i-a20-gmac", .data = &sun7i_gmac_data}, |
38 | #endif | 38 | #endif |
39 | #ifdef CONFIG_DWMAC_STI | 39 | #ifdef CONFIG_DWMAC_STI |
40 | { .compatible = "st,stih415-dwmac", .data = &sti_gmac_data}, | 40 | { .compatible = "st,stih415-dwmac", .data = &stih4xx_dwmac_data}, |
41 | { .compatible = "st,stih416-dwmac", .data = &sti_gmac_data}, | 41 | { .compatible = "st,stih416-dwmac", .data = &stih4xx_dwmac_data}, |
42 | { .compatible = "st,stid127-dwmac", .data = &sti_gmac_data}, | 42 | { .compatible = "st,stid127-dwmac", .data = &stid127_dwmac_data}, |
43 | { .compatible = "st,stih407-dwmac", .data = &sti_gmac_data}, | 43 | { .compatible = "st,stih407-dwmac", .data = &stih4xx_dwmac_data}, |
44 | #endif | 44 | #endif |
45 | #ifdef CONFIG_DWMAC_SOCFPGA | 45 | #ifdef CONFIG_DWMAC_SOCFPGA |
46 | { .compatible = "altr,socfpga-stmmac", .data = &socfpga_gmac_data }, | 46 | { .compatible = "altr,socfpga-stmmac", .data = &socfpga_gmac_data }, |