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>

diff --git a/drivers/net/ethernet/marvell/Kconfig b/drivers/net/ethernet/marvell/Kconfig
index d2555e8b947ee2a93053f4ac54191193c4a50529..da6fb825afeafd28a56909aa3baa4e97c3704d58 100644 (file)
--- 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 92c47f35bbdbc61fb9cfd8c58423bf438f2f7c84..af5bfa13d976d20ffa75129f27ce69a87ddc7bc1 100644 (file)
--- 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);