diff options
| author |   Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> | 2007-09-30 20:36:33 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2007-10-12 23:43:41 +0100 |
| commit | 361c7ad607bc0e84ef0fef8c3f11c47b33c06e41 (patch) | |
| tree | eb4d73ce8fec23d402ce5da05f3394ada0dbb9ed /include/asm-arm/arch-ns9xxx/hardware.h | |
| parent | [ARM] 4594/1: ns9xxx: use the new gpio functions (diff) | |
| download | linux-dev-361c7ad607bc0e84ef0fef8c3f11c47b33c06e41.tar.xz linux-dev-361c7ad607bc0e84ef0fef8c3f11c47b33c06e41.zip | |
[ARM] 4595/1: ns9xxx: define registers as void __iomem * instead of volatile u32
As a consequence registers are now accessed with __raw_{read,write}[bl].
Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/arch-ns9xxx/hardware.h')
| -rw-r--r-- | include/asm-arm/arch-ns9xxx/hardware.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/include/asm-arm/arch-ns9xxx/hardware.h b/include/asm-arm/arch-ns9xxx/hardware.h index b5d66f963981..0b7b34603f1c 100644 --- a/include/asm-arm/arch-ns9xxx/hardware.h +++ b/include/asm-arm/arch-ns9xxx/hardware.h @@ -35,11 +35,8 @@ #ifndef __ASSEMBLY__ -# define __REG(x) (*((volatile u32 *)io_p2v((x)))) -# define __REG2(x, y) (*((volatile u32 *)io_p2v((x)) + (y))) - -# define __REGB(x) (*((volatile u8 *)io_p2v((x)))) -# define __REGB2(x) (*((volatile u8 *)io_p2v((x)) + (y))) +# define __REG(x) ((void __iomem __force *)io_p2v((x))) +# define __REG2(x, y) ((void __iomem __force *)(io_p2v((x)) + 4 * (y))) # define __REGSET(var, field, value) \ ((var) = (((var) & ~((field) & ~(value))) | (value))) @@ -77,9 +74,6 @@ # define __REG(x) io_p2v(x) # define __REG2(x, y) io_p2v((x) + (y)) -# define __REGB(x) __REG((x)) -# define __REGB2(x, y) __REG2((x), (y)) - #endif #endif /* ifndef __ASM_ARCH_HARDWARE_H */ |