renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 21:54:06 +08:00
Code

net: mvpp2: finally add the PPv2.2 compatible string

Browse Source 
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>
This commit is contained in:
Thomas Petazzoni 2017-03-07 16:53:20 +01:00 committed by David S. Miller
parent 2067e0a13c
commit fc5e1550e5
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/marvell/Kconfig
View File

@ -82,13 +82,13 @@ config MVNETA_BM
that all dependencies are met. that all dependencies are met.
config MVPP2 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 ARCH_MVEBU || COMPILE_TEST
depends on HAS_DMA depends on HAS_DMA
select MVMDIO select MVMDIO
---help--- ---help---
This driver supports the network interface units in the This driver supports the network interface units in the
Marvell ARMADA 375 SoC. Marvell ARMADA 375, 7K and 8K SoCs.
config PXA168_ETH config PXA168_ETH
tristate "Marvell pxa168 ethernet support" tristate "Marvell pxa168 ethernet support"

4
drivers/net/ethernet/marvell/mvpp2.c
View File

@ -7037,6 +7037,10 @@ static const struct of_device_id mvpp2_match[] = {
.compatible = "marvell,armada-375-pp2", .compatible = "marvell,armada-375-pp2",
.data = (void *)MVPP21, .data = (void *)MVPP21,
}, },
{
.compatible = "marvell,armada-7k-pp22",
.data = (void *)MVPP22,
},
{ } { }
}; };
MODULE_DEVICE_TABLE(of, mvpp2_match); MODULE_DEVICE_TABLE(of, mvpp2_match);