diff options
| author | Simon Guinot <simon.guinot@sequanux.org> | 2015-06-30 10:20:20 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-10 12:49:32 -0400 |
| commit | b5aded8311788994641bd1d04b4b922f9c202b8f (patch) | |
| tree | cc0784c399bfb2672d9f865c2d0cdb69a5176d7d /Documentation | |
| parent | 8c6e5415f83cb5ba0da1321ec743b650c8a16764 (diff) | |
net: mvneta: introduce compatible string "marvell, armada-xp-neta"
[ Upstream commit f522a975a8101895a85354b9c143f41b8248e71a ]
The mvneta driver supports the Ethernet IP found in the Armada 370, XP,
380 and 385 SoCs. Since at least one more hardware feature is available
for the Armada XP SoCs then a way to identify them is needed.
This patch introduces a new compatible string "marvell,armada-xp-neta".
Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
Fixes: c5aff18204da ("net: mvneta: driver for Marvell Armada 370/XP network unit")
Cc: <stable@vger.kernel.org> # v3.8+
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt b/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt index 750d577e8083..f5a8ca29aff0 100644 --- a/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt +++ b/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | * Marvell Armada 370 / Armada XP Ethernet Controller (NETA) | 1 | * Marvell Armada 370 / Armada XP Ethernet Controller (NETA) |
| 2 | 2 | ||
| 3 | Required properties: | 3 | Required properties: |
| 4 | - compatible: should be "marvell,armada-370-neta". | 4 | - compatible: "marvell,armada-370-neta" or "marvell,armada-xp-neta". |
| 5 | - reg: address and length of the register set for the device. | 5 | - reg: address and length of the register set for the device. |
| 6 | - interrupts: interrupt for the device | 6 | - interrupts: interrupt for the device |
| 7 | - phy: See ethernet.txt file in the same directory. | 7 | - phy: See ethernet.txt file in the same directory. |