| Message ID | 1392729491-24913-1-git-send-email-thomas.petazzoni@free-electrons.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, Feb 18, 2014 at 02:18:11PM +0100, Thomas Petazzoni wrote: > With the introduction of the support for Armada 375 and Armada 38x, > the hidden Kconfig option MACH_ARMADA_370_XP is being renamed to > MACH_MVEBU_V7. Therefore, the dependency that was used for the mvneta > driver can no longer work. This commit replaces this dependency by a > dependency on PLAT_ORION, which is used similarly for the mv643xx_eth > driver. > > In addition to this, it takes this opportunity to adjust the > description and help text to indicate that the driver can is also used > for Armada 38x. Note that Armada 375 cannot use this driver as it has > a completely different networking unit, which will require a separate > driver. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > --- > Changes since v1: > - Instead of removing the Kconfig dependency, replace it by a > dependency on PLAT_ORION, in order to avoid building mvneta on too > many architectures and getting weird build issues. Suggested by > Jason Cooper. > - Fix capitalization in the Kconfig help text. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > --- > drivers/net/ethernet/marvell/Kconfig | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Acked-by: Jason Cooper <jason@lakedaemon.net> thx, Jason. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Date: Tue, 18 Feb 2014 14:18:11 +0100 > With the introduction of the support for Armada 375 and Armada 38x, > the hidden Kconfig option MACH_ARMADA_370_XP is being renamed to > MACH_MVEBU_V7. Therefore, the dependency that was used for the mvneta > driver can no longer work. This commit replaces this dependency by a > dependency on PLAT_ORION, which is used similarly for the mv643xx_eth > driver. > > In addition to this, it takes this opportunity to adjust the > description and help text to indicate that the driver can is also used > for Armada 38x. Note that Armada 375 cannot use this driver as it has > a completely different networking unit, which will require a separate > driver. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/marvell/Kconfig b/drivers/net/ethernet/marvell/Kconfig index 6300fd2..68e6a66 100644 --- a/drivers/net/ethernet/marvell/Kconfig +++ b/drivers/net/ethernet/marvell/Kconfig @@ -43,12 +43,12 @@ config MVMDIO This driver is used by the MV643XX_ETH and MVNETA drivers. config MVNETA - tristate "Marvell Armada 370/XP network interface support" - depends on MACH_ARMADA_370_XP + tristate "Marvell Armada 370/38x/XP network interface support" + depends on PLAT_ORION select MVMDIO ---help--- This driver supports the network interface units in the - Marvell ARMADA XP and ARMADA 370 SoC family. + Marvell ARMADA XP, ARMADA 370 and ARMADA 38x SoC family. Note that this driver is distinct from the mv643xx_eth driver, which should be used for the older Marvell SoCs