diff options
author | Andrew Victor <andrew@sanpeople.com> | 2007-05-11 08:21:27 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-05-11 12:20:31 -0400 |
commit | 030f4810e782e541468d36c27e721b582b7820a4 (patch) | |
tree | f1dcab0f3335a2fa8a8cda69b44aa58b82ea0094 /include/asm-arm/arch-at91/hardware.h | |
parent | f7538ac95200fd122fd84c8f85ff1130ee7645b5 (diff) |
[ARM] 4369/1: AT91: Fix circular dependency in header files
Resolve the circular dependency in the AT91 header files (io.h and
hardware.h) by moving the at91_sys_read() and at91_sys_write() functions
to io.h
Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/arch-at91/hardware.h')
-rw-r--r-- | include/asm-arm/arch-at91/hardware.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/include/asm-arm/arch-at91/hardware.h b/include/asm-arm/arch-at91/hardware.h index 28133e0154dd..1c14382dc3f5 100644 --- a/include/asm-arm/arch-at91/hardware.h +++ b/include/asm-arm/arch-at91/hardware.h | |||
@@ -69,22 +69,5 @@ | |||
69 | /* Clocks */ | 69 | /* Clocks */ |
70 | #define AT91_SLOW_CLOCK 32768 /* slow clock */ | 70 | #define AT91_SLOW_CLOCK 32768 /* slow clock */ |
71 | 71 | ||
72 | #ifndef __ASSEMBLY__ | ||
73 | #include <asm/io.h> | ||
74 | |||
75 | static inline unsigned int at91_sys_read(unsigned int reg_offset) | ||
76 | { | ||
77 | void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS; | ||
78 | |||
79 | return __raw_readl(addr + reg_offset); | ||
80 | } | ||
81 | |||
82 | static inline void at91_sys_write(unsigned int reg_offset, unsigned long value) | ||
83 | { | ||
84 | void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS; | ||
85 | |||
86 | __raw_writel(value, addr + reg_offset); | ||
87 | } | ||
88 | #endif | ||
89 | 72 | ||
90 | #endif | 73 | #endif |