aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/da830.c
diff options
context:
space:
mode:
authorSekhar Nori <nsekhar@ti.com>2009-08-31 15:48:00 +0530
committerKevin Hilman <khilman@deeprootsystems.com>2009-11-25 10:21:19 -0800
commitcd87444802ddceaa2259bc5ac48c1d2e42a99a3f (patch)
treef6b33561b1e947b3b4eaa72b76976aaae046bdc9 /arch/arm/mach-davinci/da830.c
parentdavinci: DA8XX/OMAP-L1XX: Avoid use of IO_ADDRESS for SYSCFG module (diff)
downloadlinux-dev-cd87444802ddceaa2259bc5ac48c1d2e42a99a3f.tar.xz
linux-dev-cd87444802ddceaa2259bc5ac48c1d2e42a99a3f.zip
davinci: DA8XX/OMAP-L1XX: JTAG ID register should offset from SYSCFG base
This makes it clear that JTAG ID register is part of the SYSCFG module Signed-off-by: Sekhar Nori <nsekhar@ti.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-davinci/da830.c')
-rw-r--r--arch/arm/mach-davinci/da830.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c
index 3d70eae19b59..f52174af06c2 100644
--- a/arch/arm/mach-davinci/da830.c
+++ b/arch/arm/mach-davinci/da830.c
@@ -1178,7 +1178,6 @@ static struct davinci_timer_info da830_timer_info = {
static struct davinci_soc_info davinci_soc_info_da830 = {
.io_desc = da830_io_desc,
.io_desc_num = ARRAY_SIZE(da830_io_desc),
- .jtag_id_base = IO_ADDRESS(DA8XX_JTAG_ID_REG),
.ids = da830_ids,
.ids_num = ARRAY_SIZE(da830_ids),
.cpu_clks = da830_clks,
@@ -1204,6 +1203,8 @@ void __init da830_init(void)
if (WARN(!da8xx_syscfg_base, "Unable to map syscfg module"))
return;
+ davinci_soc_info_da830.jtag_id_base =
+ DA8XX_SYSCFG_VIRT(DA8XX_JTAG_ID_REG);
davinci_soc_info_da830.pinmux_base = DA8XX_SYSCFG_VIRT(0x120);
davinci_common_init(&davinci_soc_info_da830);