diff options
author | Magnus Damm <damm@opensource.se> | 2011-01-12 05:54:21 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-13 01:20:40 -0500 |
commit | fac6c2a891a3e7255e4440f09a4c7da954043ba9 (patch) | |
tree | f273784e5f0de645decf253afe20b357e122cb0d /arch | |
parent | 83eb95b852902f952ba594447a796ad8146b9462 (diff) |
sh: sh7372 SH4AL-DSP probe support
Add probe support for the sh7372 SH4AL-DSP core.
The most common use case for this is when the system
boots from the ARM core in the sh7372 and uses the
SH core for application offload as a slave CPU.
May also be used to boot the sh7372 from the SH core.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sh/include/asm/processor.h | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/proc.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4/probe.c | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/arch/sh/include/asm/processor.h b/arch/sh/include/asm/processor.h index c9e7cbc4768a..9c7bdfcaebbd 100644 --- a/arch/sh/include/asm/processor.h +++ b/arch/sh/include/asm/processor.h | |||
@@ -35,7 +35,7 @@ enum cpu_type { | |||
35 | CPU_SH7723, CPU_SH7724, CPU_SH7757, CPU_SHX3, | 35 | CPU_SH7723, CPU_SH7724, CPU_SH7757, CPU_SHX3, |
36 | 36 | ||
37 | /* SH4AL-DSP types */ | 37 | /* SH4AL-DSP types */ |
38 | CPU_SH7343, CPU_SH7722, CPU_SH7366, | 38 | CPU_SH7343, CPU_SH7722, CPU_SH7366, CPU_SH7372, |
39 | 39 | ||
40 | /* SH-5 types */ | 40 | /* SH-5 types */ |
41 | CPU_SH5_101, CPU_SH5_103, | 41 | CPU_SH5_101, CPU_SH5_103, |
diff --git a/arch/sh/kernel/cpu/proc.c b/arch/sh/kernel/cpu/proc.c index e80a936f409a..f47be8727b3b 100644 --- a/arch/sh/kernel/cpu/proc.c +++ b/arch/sh/kernel/cpu/proc.c | |||
@@ -25,7 +25,7 @@ static const char *cpu_name[] = { | |||
25 | [CPU_SH5_101] = "SH5-101", [CPU_SH5_103] = "SH5-103", | 25 | [CPU_SH5_101] = "SH5-101", [CPU_SH5_103] = "SH5-103", |
26 | [CPU_MXG] = "MX-G", [CPU_SH7723] = "SH7723", | 26 | [CPU_MXG] = "MX-G", [CPU_SH7723] = "SH7723", |
27 | [CPU_SH7366] = "SH7366", [CPU_SH7724] = "SH7724", | 27 | [CPU_SH7366] = "SH7366", [CPU_SH7724] = "SH7724", |
28 | [CPU_SH_NONE] = "Unknown" | 28 | [CPU_SH7372] = "SH7372", [CPU_SH_NONE] = "Unknown" |
29 | }; | 29 | }; |
30 | 30 | ||
31 | const char *get_cpu_subtype(struct sh_cpuinfo *c) | 31 | const char *get_cpu_subtype(struct sh_cpuinfo *c) |
diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c index b1edc90d482b..971cf0fce4f5 100644 --- a/arch/sh/kernel/cpu/sh4/probe.c +++ b/arch/sh/kernel/cpu/sh4/probe.c | |||
@@ -154,6 +154,11 @@ void __cpuinit cpu_probe(void) | |||
154 | case 0x11: | 154 | case 0x11: |
155 | boot_cpu_data.type = CPU_SH7757; | 155 | boot_cpu_data.type = CPU_SH7757; |
156 | break; | 156 | break; |
157 | case 0xd0: | ||
158 | case 0x40: /* yon-ten-go */ | ||
159 | boot_cpu_data.type = CPU_SH7372; | ||
160 | break; | ||
161 | |||
157 | } | 162 | } |
158 | break; | 163 | break; |
159 | case 0x4000: /* 1st cut */ | 164 | case 0x4000: /* 1st cut */ |