diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-10-10 11:30:59 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-10-10 11:30:59 +0200 |
| commit | 151aeab77738469ddbf0f9532e2fddd0d231aa2b (patch) | |
| tree | cb1320931d458aeecd1d504575c62ad554a3417a /Documentation/devicetree/bindings/net/rockchip-dwmac.txt | |
| parent | 17de4ee04ca925590df036b112c1db8a778e14bf (diff) | |
| parent | 024c9d2faebdad3fb43fe49ad68e91a36190f1e2 (diff) | |
| download | linux-151aeab77738469ddbf0f9532e2fddd0d231aa2b.tar.gz linux-151aeab77738469ddbf0f9532e2fddd0d231aa2b.tar.bz2 linux-151aeab77738469ddbf0f9532e2fddd0d231aa2b.zip | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/devicetree/bindings/net/rockchip-dwmac.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/net/rockchip-dwmac.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/net/rockchip-dwmac.txt b/Documentation/devicetree/bindings/net/rockchip-dwmac.txt index 6af8eed1adeb..9c16ee2965a2 100644 --- a/Documentation/devicetree/bindings/net/rockchip-dwmac.txt +++ b/Documentation/devicetree/bindings/net/rockchip-dwmac.txt @@ -4,6 +4,7 @@ The device node has following properties. Required properties: - compatible: should be "rockchip,<name>-gamc" + "rockchip,rk3128-gmac": found on RK312x SoCs "rockchip,rk3228-gmac": found on RK322x SoCs "rockchip,rk3288-gmac": found on RK3288 SoCs "rockchip,rk3328-gmac": found on RK3328 SoCs |