diff options
author | David Howells <dhowells@redhat.com> | 2008-02-08 07:19:31 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 12:22:30 -0500 |
commit | b920de1b77b72ca9432ac3f97edb26541e65e5dd (patch) | |
tree | 40fa9be1470e929c47927dea7eddf184c0204229 /drivers/net | |
parent | ef3d534754f31fed9c3b976fee1ece1b3bc38282 (diff) |
mn10300: add the MN10300/AM33 architecture to the kernel
Add architecture support for the MN10300/AM33 CPUs produced by MEI to the
kernel.
This patch also adds board support for the ASB2303 with the ASB2308 daughter
board, and the ASB2305. The only processor supported is the MN103E010, which
is an AM33v2 core plus on-chip devices.
[akpm@linux-foundation.org: nuke cvs control strings]
Signed-off-by: Masakazu Urade <urade.masakazu@jp.panasonic.com>
Signed-off-by: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/Kconfig | 3 | ||||
-rw-r--r-- | drivers/net/smc91x.h | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 9cc25fd80b60..50c2b60e1fee 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -879,7 +879,8 @@ config SMC91X | |||
879 | tristate "SMC 91C9x/91C1xxx support" | 879 | tristate "SMC 91C9x/91C1xxx support" |
880 | select CRC32 | 880 | select CRC32 |
881 | select MII | 881 | select MII |
882 | depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || SOC_AU1X00 || BLACKFIN | 882 | depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || \ |
883 | SOC_AU1X00 || BLACKFIN || MN10300 | ||
883 | help | 884 | help |
884 | This is a driver for SMC's 91x series of Ethernet chipsets, | 885 | This is a driver for SMC's 91x series of Ethernet chipsets, |
885 | including the SMC91C94 and the SMC91C111. Say Y if you want it | 886 | including the SMC91C94 and the SMC91C111. Say Y if you want it |
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 271c28dc9baa..51d4134b37b1 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h | |||
@@ -450,8 +450,20 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r, | |||
450 | #define SMC_outsl(a, r, p, l) writesl((a) + (r), p, l) | 450 | #define SMC_outsl(a, r, p, l) writesl((a) + (r), p, l) |
451 | #define SMC_IRQ_FLAGS (-1) /* from resource */ | 451 | #define SMC_IRQ_FLAGS (-1) /* from resource */ |
452 | 452 | ||
453 | #elif defined(CONFIG_MN10300) | ||
454 | |||
455 | /* | ||
456 | * MN10300/AM33 configuration | ||
457 | */ | ||
458 | |||
459 | #include <asm/unit/smc91111.h> | ||
460 | |||
453 | #else | 461 | #else |
454 | 462 | ||
463 | /* | ||
464 | * Default configuration | ||
465 | */ | ||
466 | |||
455 | #define SMC_CAN_USE_8BIT 1 | 467 | #define SMC_CAN_USE_8BIT 1 |
456 | #define SMC_CAN_USE_16BIT 1 | 468 | #define SMC_CAN_USE_16BIT 1 |
457 | #define SMC_CAN_USE_32BIT 1 | 469 | #define SMC_CAN_USE_32BIT 1 |