diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 10:42:05 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 10:42:05 -0600 |
| commit | f8edca2e9a128f526b1fe6f997f7adb852cf5b3c (patch) | |
| tree | 92deb9ddf1153c64ff1ced9392816e60b4ecaa03 /drivers/smc91111.h | |
| parent | 79582020313e6d992a3bac71cf3a9b337f9ac7f7 (diff) | |
| parent | 7b4fd36b0322ec98836a8459d9be80e2777fdc05 (diff) | |
| download | u-boot-imx-f8edca2e9a128f526b1fe6f997f7adb852cf5b3c.zip u-boot-imx-f8edca2e9a128f526b1fe6f997f7adb852cf5b3c.tar.gz u-boot-imx-f8edca2e9a128f526b1fe6f997f7adb852cf5b3c.tar.bz2 | |
Merge branch 'origin'
Conflicts:
CHANGELOG
Diffstat (limited to 'drivers/smc91111.h')
| -rw-r--r-- | drivers/smc91111.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/smc91111.h b/drivers/smc91111.h index cf08582..d03cbc3 100644 --- a/drivers/smc91111.h +++ b/drivers/smc91111.h @@ -49,7 +49,7 @@ * in order to override the default mac address. */ -void smc_set_mac_addr(const char *addr); +void smc_set_mac_addr (const unsigned char *addr); /* I want some simple types */ @@ -185,6 +185,8 @@ typedef unsigned long int dword; #ifdef CONFIG_ADNPESC1 #define SMC_inw(r) (*((volatile word *)(SMC_BASE_ADDRESS+((r)<<1)))) +#elif CONFIG_BLACKFIN +#define SMC_inw(r) ({ word __v = (*((volatile word *)(SMC_BASE_ADDRESS+(r)))); asm("ssync;"); __v;}) #else #define SMC_inw(r) (*((volatile word *)(SMC_BASE_ADDRESS+(r)))) #endif @@ -192,6 +194,8 @@ typedef unsigned long int dword; #ifdef CONFIG_ADNPESC1 #define SMC_outw(d,r) (*((volatile word *)(SMC_BASE_ADDRESS+((r)<<1))) = d) +#elif CONFIG_BLACKFIN +#define SMC_outw(d,r) {(*((volatile word *)(SMC_BASE_ADDRESS+(r))) = d);asm("ssync;");} #else #define SMC_outw(d,r) (*((volatile word *)(SMC_BASE_ADDRESS+(r))) = d) #endif |