aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/da850.c
diff options
context:
space:
mode:
authorCyril Chemparathy <cyril@ti.com>2010-05-07 17:06:34 -0400
committerKevin Hilman <khilman@deeprootsystems.com>2010-05-13 13:05:24 -0400
commit3347db8392486a1b52aab980cc445cf505c36d45 (patch)
treed0ee14d2c658b48a355d3e845dd791b5f3736f33 /arch/arm/mach-davinci/da850.c
parentdb6db5d8474b16811566e0e919d060e2856d5ad9 (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/da850.c')
-rw-r--r--arch/arm/mach-davinci/da850.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index cb7f66300525..fcf701628590 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -1073,6 +1073,7 @@ no_ddrpll_mem:
1073static struct davinci_soc_info davinci_soc_info_da850 = { 1073static struct davinci_soc_info davinci_soc_info_da850 = {
1074 .io_desc = da850_io_desc, 1074 .io_desc = da850_io_desc,
1075 .io_desc_num = ARRAY_SIZE(da850_io_desc), 1075 .io_desc_num = ARRAY_SIZE(da850_io_desc),
1076 .jtag_id_reg = DA8XX_SYSCFG0_BASE + DA8XX_JTAG_ID_REG,
1076 .ids = da850_ids, 1077 .ids = da850_ids,
1077 .ids_num = ARRAY_SIZE(da850_ids), 1078 .ids_num = ARRAY_SIZE(da850_ids),
1078 .cpu_clks = da850_clks, 1079 .cpu_clks = da850_clks,
@@ -1108,8 +1109,6 @@ void __init da850_init(void)
1108 if (WARN(!da8xx_syscfg1_base, "Unable to map syscfg1 module")) 1109 if (WARN(!da8xx_syscfg1_base, "Unable to map syscfg1 module"))
1109 return; 1110 return;
1110 1111
1111 davinci_soc_info_da850.jtag_id_base =
1112 DA8XX_SYSCFG0_VIRT(DA8XX_JTAG_ID_REG);
1113 davinci_soc_info_da850.pinmux_base = DA8XX_SYSCFG0_VIRT(0x120); 1112 davinci_soc_info_da850.pinmux_base = DA8XX_SYSCFG0_VIRT(0x120);
1114 1113
1115 davinci_common_init(&davinci_soc_info_da850); 1114 davinci_common_init(&davinci_soc_info_da850);