aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt2
-rw-r--r--drivers/net/ethernet/marvell/mvneta.c1
2 files changed, 2 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
3Required properties: 3Required 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.
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index 74176ec4f39d..4fb27eac6ce5 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -3185,6 +3185,7 @@ static int mvneta_remove(struct platform_device *pdev)
3185 3185
3186static const struct of_device_id mvneta_match[] = { 3186static const struct of_device_id mvneta_match[] = {
3187 { .compatible = "marvell,armada-370-neta" }, 3187 { .compatible = "marvell,armada-370-neta" },
3188 { .compatible = "marvell,armada-xp-neta" },
3188 { } 3189 { }
3189}; 3190};
3190MODULE_DEVICE_TABLE(of, mvneta_match); 3191MODULE_DEVICE_TABLE(of, mvneta_match);