aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/dm355.c
diff options
context:
space:
mode:
authorMark A. Greer <mgreer@mvista.com>2009-04-15 15:39:09 -0400
committerKevin Hilman <khilman@deeprootsystems.com>2009-05-26 11:14:56 -0400
commitb9ab12797e74d93a3656ea0bf5591f8b3e094fd5 (patch)
tree5900f0c6a70d9de793ab282dacd820e967f84272 /arch/arm/mach-davinci/dm355.c
parent79c3c0b729647a6246c120408f36e6804dab244e (diff)
davinci: Support JTAG ID register at any address
The Davinci cpu_is_davinci_*() macros use the SoC part number and variant retrieved from the JTAG ID register to determine the type of cpu that the kernel is running on. Currently, the code to read the JTAG ID register assumes that the register is always at the same base address. This isn't true on some newer SoCs. To solve this, have the SoC-specific code set the JTAG ID register base address in soc_info structure and add a 'cpu_id' member to it. 'cpu_id' will be used by the cpu_is_davinci_*() macros to match the cpu id. Also move the info used to identify the cpu type into the SoC-specific code to keep all SoC-specific code together. The common code will read the JTAG ID register, search through an array of davinci_id structures to identify the cpu type. Once identified, it will set the 'cpu_id' member of the soc_info structure to the proper value and the cpu_is_davinci_*() macros will now work. Signed-off-by: Mark A. Greer <mgreer@mvista.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-davinci/dm355.c')
-rw-r--r--arch/arm/mach-davinci/dm355.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index 6d1abfdcfb72..0f724c060084 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -534,9 +534,23 @@ static struct map_desc dm355_io_desc[] = {
534 }, 534 },
535}; 535};
536 536
537/* Contents of JTAG ID register used to identify exact cpu type */
538static struct davinci_id dm355_ids[] = {
539 {
540 .variant = 0x0,
541 .part_no = 0xb73b,
542 .manufacturer = 0x00f,
543 .cpu_id = DAVINCI_CPU_ID_DM355,
544 .name = "dm355",
545 },
546};
547
537static struct davinci_soc_info davinci_soc_info_dm355 = { 548static struct davinci_soc_info davinci_soc_info_dm355 = {
538 .io_desc = dm355_io_desc, 549 .io_desc = dm355_io_desc,
539 .io_desc_num = ARRAY_SIZE(dm355_io_desc), 550 .io_desc_num = ARRAY_SIZE(dm355_io_desc),
551 .jtag_id_base = IO_ADDRESS(0x01c40028),
552 .ids = dm355_ids,
553 .ids_num = ARRAY_SIZE(dm355_ids),
540}; 554};
541 555
542void __init dm355_init(void) 556void __init dm355_init(void)