diff options
author | Paul Mundt <lethal@linux-sh.org> | 2006-09-27 04:38:11 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2006-09-27 04:38:11 -0400 |
commit | e5723e0eeb2dc16629e86d66785024ead9169000 (patch) | |
tree | 7fe39cdaf3106cc726d3b84fdc998b382b6c5e22 /arch/sh/kernel/cpu/sh4/probe.c | |
parent | ecd9561687a0952a96a0a705f618e59cb6f3189b (diff) |
sh: Add support for SH7706/SH7710/SH7343 CPUs.
This adds support for the aforementioned CPU subtypes, and cleans
up some build issues encountered as a result.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/sh4/probe.c')
-rw-r--r-- | arch/sh/kernel/cpu/sh4/probe.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c index 2a7707a81d8f..6e8a2b5268e8 100644 --- a/arch/sh/kernel/cpu/sh4/probe.c +++ b/arch/sh/kernel/cpu/sh4/probe.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * CPU Subtype Probing for SH-4. | 4 | * CPU Subtype Probing for SH-4. |
5 | * | 5 | * |
6 | * Copyright (C) 2001 - 2005 Paul Mundt | 6 | * Copyright (C) 2001 - 2006 Paul Mundt |
7 | * Copyright (C) 2003 Richard Curnow | 7 | * Copyright (C) 2003 Richard Curnow |
8 | * | 8 | * |
9 | * This file is subject to the terms and conditions of the GNU General Public | 9 | * This file is subject to the terms and conditions of the GNU General Public |
@@ -76,12 +76,6 @@ int __init detect_cpu_and_cache_system(void) | |||
76 | cpu_data->type = CPU_SH73180; | 76 | cpu_data->type = CPU_SH73180; |
77 | cpu_data->icache.ways = 4; | 77 | cpu_data->icache.ways = 4; |
78 | cpu_data->dcache.ways = 4; | 78 | cpu_data->dcache.ways = 4; |
79 | |||
80 | /* | ||
81 | * XXX: Double check this, none of the SH-4A/SH-4AL processors | ||
82 | * should have this, as it's essentially a legacy thing. | ||
83 | */ | ||
84 | cpu_data->flags |= CPU_HAS_PTEA; | ||
85 | break; | 79 | break; |
86 | case 0x2001: | 80 | case 0x2001: |
87 | case 0x2004: | 81 | case 0x2004: |
@@ -89,8 +83,7 @@ int __init detect_cpu_and_cache_system(void) | |||
89 | cpu_data->icache.ways = 4; | 83 | cpu_data->icache.ways = 4; |
90 | cpu_data->dcache.ways = 4; | 84 | cpu_data->dcache.ways = 4; |
91 | 85 | ||
92 | /* Same note as above applies here for PTEA */ | 86 | cpu_data->flags |= CPU_HAS_FPU; |
93 | cpu_data->flags |= CPU_HAS_FPU | CPU_HAS_PTEA; | ||
94 | break; | 87 | break; |
95 | case 0x2006: | 88 | case 0x2006: |
96 | case 0x200A: | 89 | case 0x200A: |
@@ -104,6 +97,12 @@ int __init detect_cpu_and_cache_system(void) | |||
104 | 97 | ||
105 | cpu_data->flags |= CPU_HAS_FPU | CPU_HAS_PERF_COUNTER; | 98 | cpu_data->flags |= CPU_HAS_FPU | CPU_HAS_PERF_COUNTER; |
106 | break; | 99 | break; |
100 | case 0x3000: | ||
101 | case 0x3003: | ||
102 | cpu_data->type = CPU_SH7343; | ||
103 | cpu_data->icache.ways = 4; | ||
104 | cpu_data->dcache.ways = 4; | ||
105 | break; | ||
107 | case 0x8000: | 106 | case 0x8000: |
108 | cpu_data->type = CPU_ST40RA; | 107 | cpu_data->type = CPU_ST40RA; |
109 | cpu_data->flags |= CPU_HAS_FPU | CPU_HAS_PTEA; | 108 | cpu_data->flags |= CPU_HAS_FPU | CPU_HAS_PTEA; |