diff options
| author | Manjunath Hadli <manjunath.hadli@ti.com> | 2011-12-21 19:13:36 +0530 |
|---|---|---|
| committer | Sekhar Nori <nsekhar@ti.com> | 2012-02-25 02:40:17 +0530 |
| commit | 5cfb19ac604a68c030b245561f575c2d1bac1d49 (patch) | |
| tree | 2118dacf77e4f83400757a31dd94f4149e3ca495 /arch/arm/mach-davinci/davinci.h | |
| parent | 39c6d2d1d743b8c925abae7043acc35e6cdc0051 (diff) | |
ARM: davinci: streamline sysmod access
There are instances of IO_ADDRESS() being used for system module
(sysmod) register access. Eliminate this in favor of a ioremap()
based access. ioremap() the entire sysmod address space once during
boot-up and provide a helper macro to access specific register
offsets within the address space.
With this, also eliminate ioremap() of specific sysmodule registers
related to VPIF happening in DM646x EVM code.
While at it, also eliminate some duplicate sysmod register offset macros
defined in code and place offset definitions at one place in davinci.h
Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
[nsekhar@ti.com: removed the addition of ifndef __ASSEMBLER__
in davinci.h, eliminate IO_ADDRESS() usage left out in dm646x.c,
cleanup VPIF sysmodule register access as part of this patch and
keep all sysmod offsets in davinci.h Also, convert the WARN_ON()
on failure to setup sysmod base to BUG_ON()]
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm/mach-davinci/davinci.h')
| -rw-r--r-- | arch/arm/mach-davinci/davinci.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h index 5e4f85ebd232..b1a52fb30cba 100644 --- a/arch/arm/mach-davinci/davinci.h +++ b/arch/arm/mach-davinci/davinci.h @@ -25,10 +25,21 @@ #include <mach/asp.h> #include <mach/keyscan.h> +#include <mach/hardware.h> #include <media/davinci/vpfe_capture.h> #include <media/davinci/vpif_types.h> +#define DAVINCI_SYSTEM_MODULE_BASE 0x01c40000 +#define SYSMOD_VIDCLKCTL 0x38 +#define SYSMOD_VDD3P3VPWDN 0x48 +#define SYSMOD_VSCLKDIS 0x6c +#define SYSMOD_PUPDCTL1 0x7c + +extern void __iomem *davinci_sysmod_base; +#define DAVINCI_SYSMOD_VIRT(x) (davinci_sysmod_base + (x)) +void davinci_map_sysmod(void); + /* DM355 base addresses */ #define DM355_ASYNC_EMIF_CONTROL_BASE 0x01e10000 #define DM355_ASYNC_EMIF_DATA_CE0_BASE 0x02000000 |