diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sh/Kconfig | 6 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4/Makefile | 4 | ||||
-rw-r--r-- | arch/sh/mm/Kconfig | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 6c42c8ed9781..78f5f2305132 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -467,13 +467,13 @@ config SH_PCLK_FREQ | |||
467 | int "Peripheral clock frequency (in Hz)" | 467 | int "Peripheral clock frequency (in Hz)" |
468 | default "27000000" if CPU_SUBTYPE_SH73180 || CPU_SUBTYPE_SH7343 | 468 | default "27000000" if CPU_SUBTYPE_SH73180 || CPU_SUBTYPE_SH7343 |
469 | default "31250000" if CPU_SUBTYPE_SH7619 | 469 | default "31250000" if CPU_SUBTYPE_SH7619 |
470 | default "32000000" if CPU_SUBTYPE_SH7722 | ||
470 | default "33333333" if CPU_SUBTYPE_SH7300 || CPU_SUBTYPE_SH7770 || \ | 471 | default "33333333" if CPU_SUBTYPE_SH7300 || CPU_SUBTYPE_SH7770 || \ |
471 | CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7705 || \ | 472 | CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7705 || \ |
472 | CPU_SUBTYPE_SH7206 | 473 | CPU_SUBTYPE_SH7206 |
473 | default "50000000" if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7780 || \ | 474 | default "60000000" if CPU_SUBTYPE_SH7751 || CPU_SUBTYPE_SH7751R |
474 | CPU_SUBTYPE_SH7785 | ||
475 | default "60000000" if CPU_SUBTYPE_SH7751 | ||
476 | default "66000000" if CPU_SUBTYPE_SH4_202 | 475 | default "66000000" if CPU_SUBTYPE_SH4_202 |
476 | default "50000000" | ||
477 | help | 477 | help |
478 | This option is used to specify the peripheral clock frequency. | 478 | This option is used to specify the peripheral clock frequency. |
479 | This is necessary for determining the reference clock value on | 479 | This is necessary for determining the reference clock value on |
diff --git a/arch/sh/kernel/cpu/sh4/Makefile b/arch/sh/kernel/cpu/sh4/Makefile index 8add10bd8268..dadd6bffc128 100644 --- a/arch/sh/kernel/cpu/sh4/Makefile +++ b/arch/sh/kernel/cpu/sh4/Makefile | |||
@@ -10,7 +10,11 @@ obj-$(CONFIG_SH_STORE_QUEUES) += sq.o | |||
10 | 10 | ||
11 | # CPU subtype setup | 11 | # CPU subtype setup |
12 | obj-$(CONFIG_CPU_SUBTYPE_SH7750) += setup-sh7750.o | 12 | obj-$(CONFIG_CPU_SUBTYPE_SH7750) += setup-sh7750.o |
13 | obj-$(CONFIG_CPU_SUBTYPE_SH7750R) += setup-sh7750.o | ||
14 | obj-$(CONFIG_CPU_SUBTYPE_SH7750S) += setup-sh7750.o | ||
15 | obj-$(CONFIG_CPU_SUBTYPE_SH7091) += setup-sh7750.o | ||
13 | obj-$(CONFIG_CPU_SUBTYPE_SH7751) += setup-sh7750.o | 16 | obj-$(CONFIG_CPU_SUBTYPE_SH7751) += setup-sh7750.o |
17 | obj-$(CONFIG_CPU_SUBTYPE_SH7751R) += setup-sh7750.o | ||
14 | obj-$(CONFIG_CPU_SUBTYPE_SH7760) += setup-sh7760.o | 18 | obj-$(CONFIG_CPU_SUBTYPE_SH7760) += setup-sh7760.o |
15 | obj-$(CONFIG_CPU_SUBTYPE_SH4_202) += setup-sh4-202.o | 19 | obj-$(CONFIG_CPU_SUBTYPE_SH4_202) += setup-sh4-202.o |
16 | 20 | ||
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig index 8f826b03f9fe..00f64c41edba 100644 --- a/arch/sh/mm/Kconfig +++ b/arch/sh/mm/Kconfig | |||
@@ -126,7 +126,6 @@ config CPU_SUBTYPE_SH7750 | |||
126 | config CPU_SUBTYPE_SH7091 | 126 | config CPU_SUBTYPE_SH7091 |
127 | bool "Support SH7091 processor" | 127 | bool "Support SH7091 processor" |
128 | select CPU_SH4 | 128 | select CPU_SH4 |
129 | select CPU_SUBTYPE_SH7750 | ||
130 | help | 129 | help |
131 | Select SH7091 if you have an SH-4 based Sega device (such as | 130 | Select SH7091 if you have an SH-4 based Sega device (such as |
132 | the Dreamcast, Naomi, and Naomi 2). | 131 | the Dreamcast, Naomi, and Naomi 2). |
@@ -134,13 +133,11 @@ config CPU_SUBTYPE_SH7091 | |||
134 | config CPU_SUBTYPE_SH7750R | 133 | config CPU_SUBTYPE_SH7750R |
135 | bool "Support SH7750R processor" | 134 | bool "Support SH7750R processor" |
136 | select CPU_SH4 | 135 | select CPU_SH4 |
137 | select CPU_SUBTYPE_SH7750 | ||
138 | select CPU_HAS_IPR_IRQ | 136 | select CPU_HAS_IPR_IRQ |
139 | 137 | ||
140 | config CPU_SUBTYPE_SH7750S | 138 | config CPU_SUBTYPE_SH7750S |
141 | bool "Support SH7750S processor" | 139 | bool "Support SH7750S processor" |
142 | select CPU_SH4 | 140 | select CPU_SH4 |
143 | select CPU_SUBTYPE_SH7750 | ||
144 | select CPU_HAS_IPR_IRQ | 141 | select CPU_HAS_IPR_IRQ |
145 | 142 | ||
146 | config CPU_SUBTYPE_SH7751 | 143 | config CPU_SUBTYPE_SH7751 |
@@ -154,7 +151,6 @@ config CPU_SUBTYPE_SH7751 | |||
154 | config CPU_SUBTYPE_SH7751R | 151 | config CPU_SUBTYPE_SH7751R |
155 | bool "Support SH7751R processor" | 152 | bool "Support SH7751R processor" |
156 | select CPU_SH4 | 153 | select CPU_SH4 |
157 | select CPU_SUBTYPE_SH7751 | ||
158 | select CPU_HAS_IPR_IRQ | 154 | select CPU_HAS_IPR_IRQ |
159 | 155 | ||
160 | config CPU_SUBTYPE_SH7760 | 156 | config CPU_SUBTYPE_SH7760 |