[PATCH] Clean up Katmai (440SPe) linker script

[u-boot] / drivers / smc91111.h

diff --git a/drivers/smc91111.h b/drivers/smc91111.h
index b373452fc9845f93df1cd0fb0bfabc1f6fbcde33..d03cbc320bf11a1bc8071f24259e0a15202982b7 100644 (file)
--- 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 */
@@ -76,6 +76,29 @@ typedef unsigned long int            dword;
 
 #ifdef CONFIG_PXA250
 
+#ifdef CONFIG_XSENGINE
+#define        SMC_inl(r)      (*((volatile dword *)(SMC_BASE_ADDRESS+(r<<1))))
+#define        SMC_inw(r)      (*((volatile word *)(SMC_BASE_ADDRESS+(r<<1))))
+#define SMC_inb(p)     ({ \
+       unsigned int __p = (unsigned int)(SMC_BASE_ADDRESS + (p<<1)); \
+       unsigned int __v = *(volatile unsigned short *)((__p) & ~2); \
+       if (__p & 2) __v >>= 8; \
+       else __v &= 0xff; \
+       __v; })
+#elif defined(CONFIG_XAENIAX)
+#define SMC_inl(r)     (*((volatile dword *)(SMC_BASE_ADDRESS+(r))))
+#define SMC_inw(z)     ({ \
+       unsigned int __p = (unsigned int)(SMC_BASE_ADDRESS + (z)); \
+       unsigned int __v = *(volatile unsigned int *)((__p) & ~3); \
+       if (__p & 3) __v >>= 16; \
+       else __v &= 0xffff; \
+       __v; })
+#define SMC_inb(p)     ({ \
+       unsigned int ___v = SMC_inw((p) & ~1); \
+       if (p & 1) ___v >>= 8; \
+       else ___v &= 0xff; \
+       ___v; })
+#else
 #define        SMC_inl(r)      (*((volatile dword *)(SMC_BASE_ADDRESS+(r))))
 #define        SMC_inw(r)      (*((volatile word *)(SMC_BASE_ADDRESS+(r))))
 #define SMC_inb(p)     ({ \
@@ -84,9 +107,25 @@ typedef unsigned long int           dword;
        if (__p & 1) __v >>= 8; \
        else __v &= 0xff; \
        __v; })
+#endif
 
+#ifdef CONFIG_XSENGINE
+#define        SMC_outl(d,r)   (*((volatile dword *)(SMC_BASE_ADDRESS+(r<<1))) = d)
+#define        SMC_outw(d,r)   (*((volatile word *)(SMC_BASE_ADDRESS+(r<<1))) = d)
+#elif defined (CONFIG_XAENIAX)
+#define SMC_outl(d,r)  (*((volatile dword *)(SMC_BASE_ADDRESS+(r))) = d)
+#define SMC_outw(d,p)  ({ \
+       dword __dwo = SMC_inl((p) & ~3); \
+       dword __dwn = (word)(d); \
+       __dwo &= ((p) & 3) ? 0x0000ffff : 0xffff0000; \
+       __dwo |= ((p) & 3) ? __dwn << 16 : __dwn; \
+       SMC_outl(__dwo, (p) & ~3); \
+})
+#else
 #define        SMC_outl(d,r)   (*((volatile dword *)(SMC_BASE_ADDRESS+(r))) = d)
 #define        SMC_outw(d,r)   (*((volatile word *)(SMC_BASE_ADDRESS+(r))) = d)
+#endif
+
 #define        SMC_outb(d,r)   ({      word __d = (byte)(d);  \
                                word __w = SMC_inw((r)&~1);  \
                                __w &= ((r)&1) ? 0x00FF : 0xFF00;  \
@@ -146,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
@@ -153,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
@@ -191,7 +234,11 @@ typedef unsigned long int          dword;
 
 #if defined(CONFIG_SMC_USE_32_BIT)
 
+#ifdef CONFIG_XSENGINE
+#define        SMC_inl(r)      (*((volatile dword *)(SMC_BASE_ADDRESS+(r<<1))))
+#else
 #define        SMC_inl(r)      (*((volatile dword *)(SMC_BASE_ADDRESS+(r))))
+#endif
 
 #define SMC_insl(r,b,l)        ({      int __i ;  \
                                        dword *__b2;  \
@@ -202,8 +249,11 @@ typedef unsigned long int          dword;
                                        };  \
                                })
 
+#ifdef CONFIG_XSENGINE
+#define        SMC_outl(d,r)   (*((volatile dword *)(SMC_BASE_ADDRESS+(r<<1))) = d)
+#else
 #define        SMC_outl(d,r)   (*((volatile dword *)(SMC_BASE_ADDRESS+(r))) = d)
-
+#endif
 #define SMC_outsl(r,b,l)       ({      int __i; \
                                        dword *__b2; \
                                        __b2 = (dword *) b; \