aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorSimon Guinot <simon.guinot@sequanux.org>2015-06-30 10:20:20 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-07-10 12:49:32 -0400
commitb5aded8311788994641bd1d04b4b922f9c202b8f (patch)
treecc0784c399bfb2672d9f865c2d0cdb69a5176d7d /drivers/net
parent8c6e5415f83cb5ba0da1321ec743b650c8a16764 (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 'drivers/net')
-rw-r--r--drivers/net/ethernet/marvell/mvneta.c1
1 files changed, 1 insertions, 0 deletions
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);