diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/Kconfig | 9 | ||||
-rw-r--r-- | drivers/net/bfin_mac.c | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 2aab62e0f5f6..55d224c8a0b9 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -814,8 +814,8 @@ config ULTRA32 | |||
814 | will be called smc-ultra32. | 814 | will be called smc-ultra32. |
815 | 815 | ||
816 | config BFIN_MAC | 816 | config BFIN_MAC |
817 | tristate "Blackfin 536/537 on-chip mac support" | 817 | tristate "Blackfin 527/536/537 on-chip mac support" |
818 | depends on NET_ETHERNET && (BF537 || BF536) && (!BF537_PORT_H) | 818 | depends on NET_ETHERNET && (BF527 || BF537 || BF536) && (!BF537_PORT_H) |
819 | select CRC32 | 819 | select CRC32 |
820 | select MII | 820 | select MII |
821 | select PHYLIB | 821 | select PHYLIB |
@@ -828,7 +828,7 @@ config BFIN_MAC | |||
828 | 828 | ||
829 | config BFIN_MAC_USE_L1 | 829 | config BFIN_MAC_USE_L1 |
830 | bool "Use L1 memory for rx/tx packets" | 830 | bool "Use L1 memory for rx/tx packets" |
831 | depends on BFIN_MAC && BF537 | 831 | depends on BFIN_MAC && (BF527 || BF537) |
832 | default y | 832 | default y |
833 | help | 833 | help |
834 | To get maximum network performance, you should use L1 memory as rx/tx buffers. | 834 | To get maximum network performance, you should use L1 memory as rx/tx buffers. |
@@ -855,7 +855,8 @@ config BFIN_RX_DESC_NUM | |||
855 | config BFIN_MAC_RMII | 855 | config BFIN_MAC_RMII |
856 | bool "RMII PHY Interface (EXPERIMENTAL)" | 856 | bool "RMII PHY Interface (EXPERIMENTAL)" |
857 | depends on BFIN_MAC && EXPERIMENTAL | 857 | depends on BFIN_MAC && EXPERIMENTAL |
858 | default n | 858 | default y if BFIN527_EZKIT |
859 | default n if BFIN537_STAMP | ||
859 | help | 860 | help |
860 | Use Reduced PHY MII Interface | 861 | Use Reduced PHY MII Interface |
861 | 862 | ||
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c index ed935e1baa26..e9bd05916774 100644 --- a/drivers/net/bfin_mac.c +++ b/drivers/net/bfin_mac.c | |||
@@ -42,7 +42,7 @@ | |||
42 | #define DRV_NAME "bfin_mac" | 42 | #define DRV_NAME "bfin_mac" |
43 | #define DRV_VERSION "1.1" | 43 | #define DRV_VERSION "1.1" |
44 | #define DRV_AUTHOR "Bryan Wu, Luke Yang" | 44 | #define DRV_AUTHOR "Bryan Wu, Luke Yang" |
45 | #define DRV_DESC "Blackfin BF53[67] on-chip Ethernet MAC driver" | 45 | #define DRV_DESC "Blackfin BF53[67] BF527 on-chip Ethernet MAC driver" |
46 | 46 | ||
47 | MODULE_AUTHOR(DRV_AUTHOR); | 47 | MODULE_AUTHOR(DRV_AUTHOR); |
48 | MODULE_LICENSE("GPL"); | 48 | MODULE_LICENSE("GPL"); |
@@ -752,7 +752,7 @@ static void bf537mac_enable(void) | |||
752 | 752 | ||
753 | #if defined(CONFIG_BFIN_MAC_RMII) | 753 | #if defined(CONFIG_BFIN_MAC_RMII) |
754 | opmode |= RMII; /* For Now only 100MBit are supported */ | 754 | opmode |= RMII; /* For Now only 100MBit are supported */ |
755 | #ifdef CONFIG_BF_REV_0_2 | 755 | #if (defined(CONFIG_BF537) || defined(CONFIG_BF536)) && CONFIG_BF_REV_0_2 |
756 | opmode |= TE; | 756 | opmode |= TE; |
757 | #endif | 757 | #endif |
758 | #endif | 758 | #endif |
@@ -994,7 +994,7 @@ static int __init bf537mac_probe(struct net_device *dev) | |||
994 | /* register irq handler */ | 994 | /* register irq handler */ |
995 | if (request_irq | 995 | if (request_irq |
996 | (IRQ_MAC_RX, bf537mac_interrupt, IRQF_DISABLED | IRQF_SHARED, | 996 | (IRQ_MAC_RX, bf537mac_interrupt, IRQF_DISABLED | IRQF_SHARED, |
997 | "BFIN537_MAC_RX", dev)) { | 997 | "EMAC_RX", dev)) { |
998 | printk(KERN_WARNING DRV_NAME | 998 | printk(KERN_WARNING DRV_NAME |
999 | ": Unable to attach BlackFin MAC RX interrupt\n"); | 999 | ": Unable to attach BlackFin MAC RX interrupt\n"); |
1000 | return -EBUSY; | 1000 | return -EBUSY; |