diff options
-rw-r--r-- | arch/sh/kernel/setup.c | 3 | ||||
-rw-r--r-- | arch/sh/mm/Kconfig | 5 | ||||
-rw-r--r-- | include/asm-sh/bugs.h | 2 | ||||
-rw-r--r-- | include/asm-sh/processor.h | 3 |
4 files changed, 11 insertions, 2 deletions
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index c24f6390007b..696ca75752d9 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c | |||
@@ -392,6 +392,7 @@ static int __init topology_init(void) | |||
392 | subsys_initcall(topology_init); | 392 | subsys_initcall(topology_init); |
393 | 393 | ||
394 | static const char *cpu_name[] = { | 394 | static const char *cpu_name[] = { |
395 | [CPU_SH7206] = "SH7206", [CPU_SH7619] = "SH7619", | ||
395 | [CPU_SH7604] = "SH7604", [CPU_SH7300] = "SH7300", | 396 | [CPU_SH7604] = "SH7604", [CPU_SH7300] = "SH7300", |
396 | [CPU_SH7705] = "SH7705", [CPU_SH7706] = "SH7706", | 397 | [CPU_SH7705] = "SH7705", [CPU_SH7706] = "SH7706", |
397 | [CPU_SH7707] = "SH7707", [CPU_SH7708] = "SH7708", | 398 | [CPU_SH7707] = "SH7707", [CPU_SH7708] = "SH7708", |
@@ -404,7 +405,7 @@ static const char *cpu_name[] = { | |||
404 | [CPU_SH4_202] = "SH4-202", [CPU_SH4_501] = "SH4-501", | 405 | [CPU_SH4_202] = "SH4-202", [CPU_SH4_501] = "SH4-501", |
405 | [CPU_SH7770] = "SH7770", [CPU_SH7780] = "SH7780", | 406 | [CPU_SH7770] = "SH7770", [CPU_SH7780] = "SH7780", |
406 | [CPU_SH7781] = "SH7781", [CPU_SH7343] = "SH7343", | 407 | [CPU_SH7781] = "SH7781", [CPU_SH7343] = "SH7343", |
407 | [CPU_SH7206] = "SH7206", [CPU_SH7619] = "SH7619", | 408 | [CPU_SH7785] = "SH7785", |
408 | [CPU_SH_NONE] = "Unknown" | 409 | [CPU_SH_NONE] = "Unknown" |
409 | }; | 410 | }; |
410 | 411 | ||
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig index 814a17586974..27463e26a7b8 100644 --- a/arch/sh/mm/Kconfig +++ b/arch/sh/mm/Kconfig | |||
@@ -171,6 +171,11 @@ config CPU_SUBTYPE_SH7780 | |||
171 | select CPU_SH4A | 171 | select CPU_SH4A |
172 | select CPU_HAS_INTC2_IRQ | 172 | select CPU_HAS_INTC2_IRQ |
173 | 173 | ||
174 | config CPU_SUBTYPE_SH7785 | ||
175 | bool "Support SH7785 processor" | ||
176 | select CPU_SH4A | ||
177 | select CPU_HAS_INTC2_IRQ | ||
178 | |||
174 | comment "SH4AL-DSP Processor Support" | 179 | comment "SH4AL-DSP Processor Support" |
175 | 180 | ||
176 | config CPU_SUBTYPE_SH73180 | 181 | config CPU_SUBTYPE_SH73180 |
diff --git a/include/asm-sh/bugs.h b/include/asm-sh/bugs.h index 51cc9e38d16a..795047da5e17 100644 --- a/include/asm-sh/bugs.h +++ b/include/asm-sh/bugs.h | |||
@@ -36,7 +36,7 @@ static void __init check_bugs(void) | |||
36 | case CPU_SH7750 ... CPU_SH4_501: | 36 | case CPU_SH7750 ... CPU_SH4_501: |
37 | *p++ = '4'; | 37 | *p++ = '4'; |
38 | break; | 38 | break; |
39 | case CPU_SH7770 ... CPU_SH7781: | 39 | case CPU_SH7770 ... CPU_SH7785: |
40 | *p++ = '4'; | 40 | *p++ = '4'; |
41 | *p++ = 'a'; | 41 | *p++ = 'a'; |
42 | break; | 42 | break; |
diff --git a/include/asm-sh/processor.h b/include/asm-sh/processor.h index 29a56c505ae5..da22ac30c75f 100644 --- a/include/asm-sh/processor.h +++ b/include/asm-sh/processor.h | |||
@@ -50,7 +50,10 @@ enum cpu_type { | |||
50 | /* SH-4 types */ | 50 | /* SH-4 types */ |
51 | CPU_SH7750, CPU_SH7750S, CPU_SH7750R, CPU_SH7751, CPU_SH7751R, | 51 | CPU_SH7750, CPU_SH7750S, CPU_SH7750R, CPU_SH7751, CPU_SH7751R, |
52 | CPU_SH7760, CPU_ST40RA, CPU_ST40GX1, CPU_SH4_202, CPU_SH4_501, | 52 | CPU_SH7760, CPU_ST40RA, CPU_ST40GX1, CPU_SH4_202, CPU_SH4_501, |
53 | |||
54 | /* SH-4A types */ | ||
53 | CPU_SH73180, CPU_SH7343, CPU_SH7770, CPU_SH7780, CPU_SH7781, | 55 | CPU_SH73180, CPU_SH7343, CPU_SH7770, CPU_SH7780, CPU_SH7781, |
56 | CPU_SH7785, | ||
54 | 57 | ||
55 | /* Unknown subtype */ | 58 | /* Unknown subtype */ |
56 | CPU_SH_NONE | 59 | CPU_SH_NONE |