diff options
| author |   Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-03-07 16:53:20 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-03-09 10:12:11 -0800 |
| commit | fc5e1550e5c365ecd94497fe6d2f230a5e8a2a22 (patch) | |
| tree | 27f73bd237d6821c4f3cdad72d2b6d0d019d173a /drivers/net/ethernet/marvell | |
| parent | net: mvpp2: set dma mask and coherent dma mask on PPv2.2 (diff) | |
| download | linux-dev-fc5e1550e5c365ecd94497fe6d2f230a5e8a2a22.tar.xz linux-dev-fc5e1550e5c365ecd94497fe6d2f230a5e8a2a22.zip | |
net: mvpp2: finally add the PPv2.2 compatible string
Now that the mvpp2 driver has been modified to accommodate the support
for PPv2.2, we can finally advertise this support by adding the
appropriate compatible string.
At the same time, we update the Kconfig description of the MVPP2 driver.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell')
| -rw-r--r-- | drivers/net/ethernet/marvell/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/net/ethernet/marvell/mvpp2.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/ethernet/marvell/Kconfig b/drivers/net/ethernet/marvell/Kconfig index d2555e8b947e..da6fb825afea 100644 --- a/drivers/net/ethernet/marvell/Kconfig +++ b/drivers/net/ethernet/marvell/Kconfig @@ -82,13 +82,13 @@ config MVNETA_BM that all dependencies are met. config MVPP2 - tristate "Marvell Armada 375 network interface support" + tristate "Marvell Armada 375/7K/8K network interface support" depends on ARCH_MVEBU || COMPILE_TEST depends on HAS_DMA select MVMDIO ---help--- This driver supports the network interface units in the - Marvell ARMADA 375 SoC. + Marvell ARMADA 375, 7K and 8K SoCs. config PXA168_ETH tristate "Marvell pxa168 ethernet support" diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c index 92c47f35bbdb..af5bfa13d976 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -7037,6 +7037,10 @@ static const struct of_device_id mvpp2_match[] = { .compatible = "marvell,armada-375-pp2", .data = (void *)MVPP21, }, + { + .compatible = "marvell,armada-7k-pp22", + .data = (void *)MVPP22, + }, { } }; MODULE_DEVICE_TABLE(of, mvpp2_match); |