diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-06-23 06:49:29 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-23 06:49:29 -0700 |
| commit | 69ae2f7acc05e9eb4a451e2728845e768586ddad (patch) | |
| tree | 58607a122bf0781c7867e0408f10c72ada4c51d5 /Documentation/devicetree/bindings/net | |
| parent | dsa: mv88x6xxx: Zero statistics counters (diff) | |
| parent | net: stmmac: dwmac-rk: add rk3368-specific data (diff) | |
| download | linux-dev-69ae2f7acc05e9eb4a451e2728845e768586ddad.tar.xz linux-dev-69ae2f7acc05e9eb4a451e2728845e768586ddad.zip | |
Merge branch 'stmmac-rk3368'
Heiko Stuebner says:
====================
net: stmmac: dwmac-rk: add support for rk3368
Apart from small cleanups, this series provides support for the dwmac
on the new rk3368 ARM64 soc.
Tested on a R88 board using a RMII phy.
Changes since v1:
- Adapt to changes resulting from patch d42202dce002 ("net: stmmac:
dwmac-rk: Don't add function name in info or err messages")
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/devicetree/bindings/net')
| -rw-r--r-- | Documentation/devicetree/bindings/net/rockchip-dwmac.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/net/rockchip-dwmac.txt b/Documentation/devicetree/bindings/net/rockchip-dwmac.txt index 21fd199e89b5..93eac7ce1446 100644 --- a/Documentation/devicetree/bindings/net/rockchip-dwmac.txt +++ b/Documentation/devicetree/bindings/net/rockchip-dwmac.txt @@ -3,7 +3,7 @@ Rockchip SoC RK3288 10/100/1000 Ethernet driver(GMAC) The device node has following properties. Required properties: - - compatible: Can be "rockchip,rk3288-gmac". + - compatible: Can be one of "rockchip,rk3288-gmac", "rockchip,rk3368-gmac" - reg: addresses and length of the register sets for the device. - interrupts: Should contain the GMAC interrupts. - interrupt-names: Should contain the interrupt names "macirq". |