diff options
author | Cyril Chemparathy <cyril@ti.com> | 2010-05-07 17:06:34 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@deeprootsystems.com> | 2010-05-13 13:05:24 -0400 |
commit | 3347db8392486a1b52aab980cc445cf505c36d45 (patch) | |
tree | d0ee14d2c658b48a355d3e845dd791b5f3736f33 /arch/arm/mach-davinci/da830.c | |
parent | db6db5d8474b16811566e0e919d060e2856d5ad9 (diff) |
Davinci: jtag_id - use ioremap()
This patch replaces the jtag id base info in davinci_soc_info with a physical
address which is then ioremap()ed within common code.
This patch (in combination with a similar change for PSC) will allow us to
eliminate the SYSCFG nastiness in DA8xx code.
Signed-off-by: Cyril Chemparathy <cyril@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.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index 4f5727f0dd11..c5600b89f628 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c | |||
@@ -1188,6 +1188,7 @@ static struct davinci_timer_info da830_timer_info = { | |||
1188 | static struct davinci_soc_info davinci_soc_info_da830 = { | 1188 | static struct davinci_soc_info davinci_soc_info_da830 = { |
1189 | .io_desc = da830_io_desc, | 1189 | .io_desc = da830_io_desc, |
1190 | .io_desc_num = ARRAY_SIZE(da830_io_desc), | 1190 | .io_desc_num = ARRAY_SIZE(da830_io_desc), |
1191 | .jtag_id_reg = DA8XX_SYSCFG0_BASE + DA8XX_JTAG_ID_REG, | ||
1191 | .ids = da830_ids, | 1192 | .ids = da830_ids, |
1192 | .ids_num = ARRAY_SIZE(da830_ids), | 1193 | .ids_num = ARRAY_SIZE(da830_ids), |
1193 | .cpu_clks = da830_clks, | 1194 | .cpu_clks = da830_clks, |
@@ -1215,8 +1216,6 @@ void __init da830_init(void) | |||
1215 | if (WARN(!da8xx_syscfg0_base, "Unable to map syscfg0 module")) | 1216 | if (WARN(!da8xx_syscfg0_base, "Unable to map syscfg0 module")) |
1216 | return; | 1217 | return; |
1217 | 1218 | ||
1218 | davinci_soc_info_da830.jtag_id_base = | ||
1219 | DA8XX_SYSCFG0_VIRT(DA8XX_JTAG_ID_REG); | ||
1220 | davinci_soc_info_da830.pinmux_base = DA8XX_SYSCFG0_VIRT(0x120); | 1219 | davinci_soc_info_da830.pinmux_base = DA8XX_SYSCFG0_VIRT(0x120); |
1221 | 1220 | ||
1222 | davinci_common_init(&davinci_soc_info_da830); | 1221 | davinci_common_init(&davinci_soc_info_da830); |