commit a45dde2293c816138e53c26eca6fd0322583f9a6 changed the dm9000 direct register access to standard IO. This should work on the ColdFire platform as there are corresponding macros for the LE devices. But the hardware settings on M5253DEMO board had swapped the byte order which make the original macros such as out_le16 cannot work. To avoid changing the common io access code on ColdFire platform, the DM9000_BYTE_SWAPPED define added to make the dm9000 use __raw* IO access on ColdFire M5253DEMO board.
Signed-off-by: Jason Jin Jason.jin@freescale.com --- drivers/net/dm9000x.c | 10 +++++++++- include/configs/M5253DEMO.h | 1 + 2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c index 709f67a..d806c91 100644 --- a/drivers/net/dm9000x.c +++ b/drivers/net/dm9000x.c @@ -116,13 +116,21 @@ static u8 DM9000_ior(int); static void DM9000_iow(int reg, u8 value);
/* DM9000 network board routine ---------------------------- */ - +#ifndef DM9000_BYTE_SWAPPED #define DM9000_outb(d,r) writeb(d, (volatile u8 *)(r)) #define DM9000_outw(d,r) writew(d, (volatile u16 *)(r)) #define DM9000_outl(d,r) writel(d, (volatile u32 *)(r)) #define DM9000_inb(r) readb((volatile u8 *)(r)) #define DM9000_inw(r) readw((volatile u16 *)(r)) #define DM9000_inl(r) readl((volatile u32 *)(r)) +#else +#define DM9000_outb(d,r) __raw_writeb(d, (volatile u8 *)(r)) +#define DM9000_outw(d,r) __raw_writew(d, (volatile u16 *)(r)) +#define DM9000_outl(d,r) __raw_writel(d, (volatile u32 *)(r)) +#define DM9000_inb(r) __raw_readb((volatile u8 *)(r)) +#define DM9000_inw(r) __raw_readw((volatile u16 *)(r)) +#define DM9000_inl(r) __raw_readl((volatile u32 *)(r)) +#endif
#ifdef CONFIG_DM9000_DEBUG static void diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index f2f3159..8120b68 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -95,6 +95,7 @@ # define DM9000_IO CONFIG_DM9000_BASE # define DM9000_DATA (CONFIG_DM9000_BASE + 4) # undef CONFIG_DM9000_DEBUG +# define DM9000_BYTE_SWAPPED
# define CONFIG_OVERWRITE_ETHADDR_ONCE