diff options
| author |   David S. Miller <davem@davemloft.net> | 2021-06-21 14:38:48 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-21 14:38:48 -0700 |
| commit | c829de3989f53e535bd6ab5b942df8c5c8863d3f (patch) | |
| tree | 2e0ffa953ec12a892d3eef145017e9248f7667df | |
| parent | net: hns3: Fix a memory leak in an error handling path in 'hclge_handle_error_info_log()' (diff) | |
| parent | dt-bindings: dwmac: Remove unexpected item. (diff) | |
| download | wireguard-linux-c829de3989f53e535bd6ab5b942df8c5c8863d3f.tar.xz wireguard-linux-c829de3989f53e535bd6ab5b942df8c5c8863d3f.zip | |
Merge branch 'ingenic-fixes'
Zhou Yanjie says:
====================
Fix for Ingenic MAC support.
1.Remove the unexpected "snps,dwmac" item in the example.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | Documentation/devicetree/bindings/net/ingenic,mac.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/net/ingenic,mac.yaml b/Documentation/devicetree/bindings/net/ingenic,mac.yaml index 5e93d4f9a080..d08a88125a5c 100644 --- a/Documentation/devicetree/bindings/net/ingenic,mac.yaml +++ b/Documentation/devicetree/bindings/net/ingenic,mac.yaml @@ -61,7 +61,7 @@ examples: #include <dt-bindings/clock/x1000-cgu.h> mac: ethernet@134b0000 { - compatible = "ingenic,x1000-mac", "snps,dwmac"; + compatible = "ingenic,x1000-mac"; reg = <0x134b0000 0x2000>; interrupt-parent = <&intc>; |