From c9263aacb1be7f2f681e36fd2d2575483ee8639d Mon Sep 17 00:00:00 2001 From: Lennert Buytenhek Date: Thu, 15 Sep 2005 13:00:25 +0100 Subject: [PATCH] --- yaml --- r: 8983 b: refs/heads/master c: 917afce1000d978dfd3f07da5da9d864bc49c77e h: refs/heads/master i: 8981: 56bc44ee4c77bde0dde90560aae397133d0f19bb 8979: 9d24a25e9e8e255efe07e5dad4b9d6b825f2dcd3 8975: 7a3228fbe602368fb0224cc9b50a6708d92dc51c v: v3 --- [refs] | 2 +- trunk/include/asm-arm/arch-ixp2000/platform.h | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ee96722fb323..3b6c62902916 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fea2efe3bba15f0aa8f840fbe052699808187cb6 +refs/heads/master: 917afce1000d978dfd3f07da5da9d864bc49c77e diff --git a/trunk/include/asm-arm/arch-ixp2000/platform.h b/trunk/include/asm-arm/arch-ixp2000/platform.h index c0caf3e3e6fd..6519498dbe25 100644 --- a/trunk/include/asm-arm/arch-ixp2000/platform.h +++ b/trunk/include/asm-arm/arch-ixp2000/platform.h @@ -31,20 +31,24 @@ #include /* Pickup local_irq_ functions */ -static inline void ixp2000_reg_write(volatile unsigned long *reg, unsigned long val) +static inline void ixp2000_reg_write(volatile void *reg, unsigned long val) { - volatile unsigned long dummy; + unsigned long dummy; unsigned long flags; local_irq_save(flags); - *reg = val; + *((volatile unsigned long *)reg) = val; barrier(); - dummy = *reg; + dummy = *((volatile unsigned long *)reg); local_irq_restore(flags); } #else -#define ixp2000_reg_write(reg, val) (*reg = val) +static inline void ixp2000_reg_write(volatile void *reg, unsigned long val) +{ + *((volatile unsigned long *)reg) = val; +} #endif /* IXDP2400 || IXDP2401 */ +#define ixp2000_reg_read(reg) (*((volatile unsigned long *)reg)) /* * Boards may multiplex different devices on the 2nd channel of