summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/id.c
diff options
context:
space:
mode:
authorKevin Hilman2009-04-14 14:04:16 +0200
committerKevin Hilman2009-04-23 18:31:09 +0200
commitf5c122da543ebf98a5ccb3166768e38eea3120dd (patch)
tree0275d0646aab07c8e3bf9ef5a22572bcf668f400 /arch/arm/mach-davinci/id.c
parentdavinci: major rework of clock, PLL, PSC infrastructure (diff)
downloadkernel-qcow2-linux-f5c122da543ebf98a5ccb3166768e38eea3120dd.tar.gz
kernel-qcow2-linux-f5c122da543ebf98a5ccb3166768e38eea3120dd.tar.xz
kernel-qcow2-linux-f5c122da543ebf98a5ccb3166768e38eea3120dd.zip
davinci: add arch_ioremap() which uses existing static mappings
Add arch-specific ioremap() which uses any existing static mappings in place of doing a new mapping. From now on, drivers should always use ioremap() instead of IO_ADDRESS(). In addition, remove the davinci_[read|write]* macros in favor of using ioremap. Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-davinci/id.c')
-rw-r--r--arch/arm/mach-davinci/id.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-davinci/id.c b/arch/arm/mach-davinci/id.c
index 379f2baf66d6..018b994cd794 100644
--- a/arch/arm/mach-davinci/id.c
+++ b/arch/arm/mach-davinci/id.c
@@ -15,7 +15,7 @@
#include <linux/init.h>
#include <linux/io.h>
-#define JTAG_ID_BASE 0x01c40028
+#define JTAG_ID_BASE IO_ADDRESS(0x01c40028)
static unsigned int davinci_revision;
@@ -58,7 +58,7 @@ static u16 __init davinci_get_part_no(void)
{
u32 dev_id, part_no;
- dev_id = davinci_readl(JTAG_ID_BASE);
+ dev_id = __raw_readl(JTAG_ID_BASE);
part_no = ((dev_id >> 12) & 0xffff);
@@ -72,7 +72,7 @@ static u8 __init davinci_get_variant(void)
{
u32 variant;
- variant = davinci_readl(JTAG_ID_BASE);
+ variant = __raw_readl(JTAG_ID_BASE);
variant = (variant >> 28) & 0xf;