diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-08-13 19:52:25 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-08-13 19:52:25 +0000 |
| commit | a45f225e73eec20349c9641a2e520afba82f9c0f (patch) | |
| tree | a2b287a23d655c58ab4b558cab69778dd862dc06 /target/linux/adm5120 | |
| parent | 2e71a903478d328e15f25ecad0d01e42639686ca (diff) | |
| download | upstream-a45f225e73eec20349c9641a2e520afba82f9c0f.tar.gz upstream-a45f225e73eec20349c9641a2e520afba82f9c0f.tar.bz2 upstream-a45f225e73eec20349c9641a2e520afba82f9c0f.zip | |
load board's mac address on Compex devices
SVN-Revision: 12302
Diffstat (limited to 'target/linux/adm5120')
3 files changed, 27 insertions, 1 deletions
diff --git a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.c b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.c index adc765f5e0..10120d6226 100644 --- a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.c +++ b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.c @@ -11,15 +11,19 @@ #include <linux/kernel.h> #include <linux/init.h> +#include <linux/gpio.h> #include <asm/bootinfo.h> -#include <linux/gpio.h> #include <asm/mach-adm5120/adm5120_info.h> #include <asm/mach-adm5120/adm5120_board.h> #include <asm/mach-adm5120/adm5120_platform.h> #include <asm/mach-adm5120/adm5120_irq.h> +#include <asm/mach-adm5120/prom/myloader.h> + +#include "compex.h" + #define COMPEX_GPIO_DEV_MASK (1 << ADM5120_GPIO_PIN5) static void switch_bank_gpio5(unsigned bank) @@ -34,6 +38,18 @@ static void switch_bank_gpio5(unsigned bank) } } +void __init compex_mac_setup(void) +{ + int i, j; + + if (!myloader_present()) + return; + + for (i = 0; i < 6; i++) + for (j = 0; j < 6; j++) + adm5120_eth_macs[i][j] = myloader_info.macs[i][j]; +} + void __init compex_generic_setup(void) { gpio_request(ADM5120_GPIO_PIN5, NULL); /* for flash A20 line */ @@ -43,4 +59,6 @@ void __init compex_generic_setup(void) adm5120_add_device_flash(0); adm5120_add_device_gpio(COMPEX_GPIO_DEV_MASK); + + compex_mac_setup(); } diff --git a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/prom/myloader.c b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/prom/myloader.c index 737c15dea2..939422681b 100644 --- a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/prom/myloader.c +++ b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/prom/myloader.c @@ -36,6 +36,7 @@ int __init myloader_present(void) struct mylo_system_params *sysp; struct mylo_board_params *boardp; struct mylo_partition_table *parts; + int i; if (myloader_found) goto out; @@ -55,6 +56,12 @@ int __init myloader_present(void) myloader_info.svid = le32_to_cpu(sysp->svid); myloader_info.sdid = le32_to_cpu(sysp->sdid); + for (i = 0; i < MYLO_ETHADDR_COUNT; i++) { + int j; + for (j = 0; j < 6; j++) + myloader_info.macs[i][j] = boardp->addr[i].mac[j]; + } + myloader_found = 1; out: diff --git a/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/prom/myloader.h b/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/prom/myloader.h index 2c40aa4056..ea8db81ed3 100644 --- a/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/prom/myloader.h +++ b/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/prom/myloader.h @@ -170,6 +170,7 @@ struct myloader_info { u32 did; u32 svid; u32 sdid; + uint8_t macs[MYLO_ETHADDR_COUNT][6]; }; extern struct myloader_info myloader_info; |