diff options
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/net/mvgbe.c | 2 | ||||
| -rw-r--r-- | drivers/net/mvgbe.h | 7 |
3 files changed, 8 insertions, 9 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 3a374d88718..c962d7a72c0 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -178,6 +178,14 @@ config FTMAC100 help This MAC is present in Andestech SoCs. +config MVGBE + bool "Marvell Orion5x/Kirkwood network interface support" + depends on KIRKWOOD || ORION5X + select PHYLIB + help + This driver supports the network interface units in the + Marvell Orion5x and Kirkwood SoCs + config MVNETA bool "Marvell Armada XP/385/3700 network interface support" depends on ARMADA_XP || ARMADA_38X || ARMADA_3700 diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c index 98b9a9a4f9c..4e1aff6e3a8 100644 --- a/drivers/net/mvgbe.c +++ b/drivers/net/mvgbe.c @@ -26,8 +26,6 @@ #include <asm/arch/soc.h> #elif defined(CONFIG_ORION5X) #include <asm/arch/orion5x.h> -#elif defined(CONFIG_DOVE) -#include <asm/arch/dove.h> #endif #include "mvgbe.h" diff --git a/drivers/net/mvgbe.h b/drivers/net/mvgbe.h index 8a466658e38..c20d1d7edf7 100644 --- a/drivers/net/mvgbe.h +++ b/drivers/net/mvgbe.h @@ -291,17 +291,10 @@ #define EBAR_TARGET_GUNIT 0x00000007 /* Window attrib */ -#if defined(CONFIG_DOVE) -#define EBAR_DRAM_CS0 0x00000000 -#define EBAR_DRAM_CS1 0x00000000 -#define EBAR_DRAM_CS2 0x00000000 -#define EBAR_DRAM_CS3 0x00000000 -#else #define EBAR_DRAM_CS0 0x00000E00 #define EBAR_DRAM_CS1 0x00000D00 #define EBAR_DRAM_CS2 0x00000B00 #define EBAR_DRAM_CS3 0x00000700 -#endif /* DRAM Target interface */ #define EBAR_DRAM_NO_CACHE_COHERENCY 0x00000000 |