[U-Boot] [PATCH] AX88180: use standard I/O accessors
Mike Frysinger
vapier at gentoo.org
Tue May 11 08:43:27 CEST 2010
The current dm9000x driver accesses its memory mapped registers directly
instead of using the standard I/O accessors. This can cause problems on
Blackfin systems as the accesses can get out of order. So convert the
direct volatile dereferences to use the normal in/out macros.
Signed-off-by: Mike Frysinger <vapier at gentoo.org>
Tested-by: Hoan Hoang <hnhoan at i-syst.com>
---
drivers/net/ax88180.h | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ax88180.h b/drivers/net/ax88180.h
index 9a324bd..7d75eb8 100644
--- a/drivers/net/ax88180.h
+++ b/drivers/net/ax88180.h
@@ -19,6 +19,7 @@
#ifndef _AX88180_H_
#define _AX88180_H_
+#include <asm/io.h>
#include <asm/types.h>
#include <config.h>
@@ -354,7 +355,7 @@ struct ax88180_private {
static inline unsigned short INW (struct eth_device *dev, unsigned long addr)
{
- return le16_to_cpu (*(volatile unsigned short *) (addr + dev->iobase));
+ return le16_to_cpu(inw(addr + dev->iobase));
}
/*
@@ -363,32 +364,32 @@ static inline unsigned short INW (struct eth_device *dev, unsigned long addr)
#if defined (CONFIG_DRIVER_AX88180_16BIT)
static inline void OUTW (struct eth_device *dev, unsigned short command, unsigned long addr)
{
- *(volatile unsigned short *) ((addr + dev->iobase)) = cpu_to_le16 (command);
+ outw(cpu_to_le16(command), addr + dev->iobase);
}
static inline unsigned short READ_RXBUF (struct eth_device *dev)
{
- return le16_to_cpu (*(volatile unsigned short *) (RXBUFFER_START + dev->iobase));
+ return le16_to_cpu(inw(RXBUFFER_START + dev->iobase));
}
static inline void WRITE_TXBUF (struct eth_device *dev, unsigned short data)
{
- *(volatile unsigned short *) ((TXBUFFER_START + dev->iobase)) = cpu_to_le16 (data);
+ outw(cpu_to_le16(data), dev->iobase + TXBUFFER_START);
}
#else
static inline void OUTW (struct eth_device *dev, unsigned short command, unsigned long addr)
{
- *(volatile unsigned long *) ((addr + dev->iobase)) = cpu_to_le32 (command);
+ outl(cpu_to_le32(command), addr + dev->iobase);
}
static inline unsigned long READ_RXBUF (struct eth_device *dev)
{
- return le32_to_cpu (*(volatile unsigned long *) (RXBUFFER_START + dev->iobase));
+ return le32_to_cpu(inl(RXBUFFER_START + dev->iobase));
}
static inline void WRITE_TXBUF (struct eth_device *dev, unsigned long data)
{
- *(volatile unsigned long *) ((TXBUFFER_START + dev->iobase)) = cpu_to_le32 (data);
+ outl(cpu_to_le32(data), dev->iobase + TXBUFFER_START);
}
#endif
--
1.7.1
More information about the U-Boot
mailing list