diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-05-12 17:12:12 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-05-12 17:12:12 +0200 |
| commit | 158304ef09a28c7f2dd37d78f536a4e09ba084a1 (patch) | |
| tree | 2e6d808fef46d70268e547ccfc5926a865e3d2ea /include/asm-arm/arch-at91 | |
| parent | [ARM] Use new get_irqnr_preamble (diff) | |
| parent | Merge branch 'omap-fixes' into fixes (diff) | |
| download | linux-158304ef09a28c7f2dd37d78f536a4e09ba084a1.tar.xz linux-158304ef09a28c7f2dd37d78f536a4e09ba084a1.zip | |
Merge branch 'fixes' into devel
Diffstat (limited to 'include/asm-arm/arch-at91')
| -rw-r--r-- | include/asm-arm/arch-at91/hardware.h | 17 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91/io.h | 18 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91/irqs.h | 1 | ||||
| -rw-r--r-- | include/asm-arm/arch-at91/uncompress.h | 2 |
4 files changed, 20 insertions, 18 deletions
diff --git a/include/asm-arm/arch-at91/hardware.h b/include/asm-arm/arch-at91/hardware.h index 0e51ad224eaa..46835e945aea 100644 --- a/include/asm-arm/arch-at91/hardware.h +++ b/include/asm-arm/arch-at91/hardware.h @@ -71,22 +71,5 @@ /* Clocks */ #define AT91_SLOW_CLOCK 32768 /* slow clock */ -#ifndef __ASSEMBLY__ -#include <asm/io.h> - -static inline unsigned int at91_sys_read(unsigned int reg_offset) -{ - void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS; - - return __raw_readl(addr + reg_offset); -} - -static inline void at91_sys_write(unsigned int reg_offset, unsigned long value) -{ - void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS; - - __raw_writel(value, addr + reg_offset); -} -#endif #endif diff --git a/include/asm-arm/arch-at91/io.h b/include/asm-arm/arch-at91/io.h index 401f327ec047..80073fd36b8e 100644 --- a/include/asm-arm/arch-at91/io.h +++ b/include/asm-arm/arch-at91/io.h @@ -29,4 +29,22 @@ #define __mem_pci(a) (a) +#ifndef __ASSEMBLY__ + +static inline unsigned int at91_sys_read(unsigned int reg_offset) +{ + void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS; + + return __raw_readl(addr + reg_offset); +} + +static inline void at91_sys_write(unsigned int reg_offset, unsigned long value) +{ + void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS; + + __raw_writel(value, addr + reg_offset); +} + +#endif + #endif diff --git a/include/asm-arm/arch-at91/irqs.h b/include/asm-arm/arch-at91/irqs.h index 1ffa3bb9a9c1..1127a3b5e928 100644 --- a/include/asm-arm/arch-at91/irqs.h +++ b/include/asm-arm/arch-at91/irqs.h @@ -21,6 +21,7 @@ #ifndef __ASM_ARCH_IRQS_H #define __ASM_ARCH_IRQS_H +#include <asm/io.h> #include <asm/arch/at91_aic.h> #define NR_AIC_IRQS 32 diff --git a/include/asm-arm/arch-at91/uncompress.h b/include/asm-arm/arch-at91/uncompress.h index a193d28304b6..30ac587b3b41 100644 --- a/include/asm-arm/arch-at91/uncompress.h +++ b/include/asm-arm/arch-at91/uncompress.h @@ -21,7 +21,7 @@ #ifndef __ASM_ARCH_UNCOMPRESS_H #define __ASM_ARCH_UNCOMPRESS_H -#include <asm/hardware.h> +#include <asm/io.h> #include <asm/arch/at91_dbgu.h> /* |