diff options
author | Giuseppe CAVALLARO <peppe.cavallaro@st.com> | 2014-10-14 02:12:55 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-10-14 16:40:06 -0400 |
commit | 160e1fd10a287bb805745ea4e5b8bb383b686b7f (patch) | |
tree | 994af980f86fa4f0f43abc879df081f80c805ff1 | |
parent | 8c2a7a5d2c6ec6c2a95fe22a6d3af1db07840da8 (diff) |
stmmac: make the STi Layer compatible to STiH407
This adds the missing compatibility to the STiH407 SoC.
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | Documentation/devicetree/bindings/net/sti-dwmac.txt | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/net/sti-dwmac.txt b/Documentation/devicetree/bindings/net/sti-dwmac.txt index 3dd3d0bf112f..8c84d9a18f4c 100644 --- a/Documentation/devicetree/bindings/net/sti-dwmac.txt +++ b/Documentation/devicetree/bindings/net/sti-dwmac.txt | |||
@@ -3,8 +3,8 @@ STMicroelectronics SoC DWMAC glue layer controller | |||
3 | The device node has following properties. | 3 | The device node has following properties. |
4 | 4 | ||
5 | Required properties: | 5 | Required properties: |
6 | - compatible : Can be "st,stih415-dwmac", "st,stih416-dwmac" or | 6 | - compatible : Can be "st,stih415-dwmac", "st,stih416-dwmac", |
7 | "st,stid127-dwmac". | 7 | "st,stid127-dwmac", "st,stih407-dwmac". |
8 | - reg : Offset of the glue configuration register map in system | 8 | - reg : Offset of the glue configuration register map in system |
9 | configuration regmap pointed by st,syscon property and size. | 9 | configuration regmap pointed by st,syscon property and size. |
10 | 10 | ||
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index 4894500a0139..0d6b9adad6dd 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | |||
@@ -40,6 +40,7 @@ static const struct of_device_id stmmac_dt_ids[] = { | |||
40 | { .compatible = "st,stih415-dwmac", .data = &sti_gmac_data}, | 40 | { .compatible = "st,stih415-dwmac", .data = &sti_gmac_data}, |
41 | { .compatible = "st,stih416-dwmac", .data = &sti_gmac_data}, | 41 | { .compatible = "st,stih416-dwmac", .data = &sti_gmac_data}, |
42 | { .compatible = "st,stid127-dwmac", .data = &sti_gmac_data}, | 42 | { .compatible = "st,stid127-dwmac", .data = &sti_gmac_data}, |
43 | { .compatible = "st,stih407-dwmac", .data = &sti_gmac_data}, | ||
43 | #endif | 44 | #endif |
44 | #ifdef CONFIG_DWMAC_SOCFPGA | 45 | #ifdef CONFIG_DWMAC_SOCFPGA |
45 | { .compatible = "altr,socfpga-stmmac", .data = &socfpga_gmac_data }, | 46 | { .compatible = "altr,socfpga-stmmac", .data = &socfpga_gmac_data }, |