aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/Kconfig3
-rw-r--r--arch/sh/kernel/cpu/irq/Makefile3
-rw-r--r--arch/sh/mm/Kconfig20
3 files changed, 1 insertions, 25 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 24c33610615b..c1214ccea009 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -178,9 +178,6 @@ config CPU_HAS_INTEVT
178config CPU_HAS_MASKREG_IRQ 178config CPU_HAS_MASKREG_IRQ
179 bool 179 bool
180 180
181config CPU_HAS_INTC_IRQ
182 bool
183
184config CPU_HAS_IPR_IRQ 181config CPU_HAS_IPR_IRQ
185 bool 182 bool
186 183
diff --git a/arch/sh/kernel/cpu/irq/Makefile b/arch/sh/kernel/cpu/irq/Makefile
index 8712ec5fc0ba..8da8e178f09c 100644
--- a/arch/sh/kernel/cpu/irq/Makefile
+++ b/arch/sh/kernel/cpu/irq/Makefile
@@ -1,8 +1,7 @@
1# 1#
2# Makefile for the Linux/SuperH CPU-specifc IRQ handlers. 2# Makefile for the Linux/SuperH CPU-specifc IRQ handlers.
3# 3#
4obj-y += imask.o 4obj-y += imask.o intc.o
5 5
6obj-$(CONFIG_CPU_HAS_IPR_IRQ) += ipr.o 6obj-$(CONFIG_CPU_HAS_IPR_IRQ) += ipr.o
7obj-$(CONFIG_CPU_HAS_MASKREG_IRQ) += maskreg.o 7obj-$(CONFIG_CPU_HAS_MASKREG_IRQ) += maskreg.o
8obj-$(CONFIG_CPU_HAS_INTC_IRQ) += intc.o
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index 1bebfe30240f..dce59b812946 100644
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -50,40 +50,34 @@ choice
50config CPU_SUBTYPE_SH7619 50config CPU_SUBTYPE_SH7619
51 bool "Support SH7619 processor" 51 bool "Support SH7619 processor"
52 select CPU_SH2 52 select CPU_SH2
53 select CPU_HAS_INTC_IRQ
54 53
55# SH-2A Processor Support 54# SH-2A Processor Support
56 55
57config CPU_SUBTYPE_SH7206 56config CPU_SUBTYPE_SH7206
58 bool "Support SH7206 processor" 57 bool "Support SH7206 processor"
59 select CPU_SH2A 58 select CPU_SH2A
60 select CPU_HAS_INTC_IRQ
61 59
62# SH-3 Processor Support 60# SH-3 Processor Support
63 61
64config CPU_SUBTYPE_SH7705 62config CPU_SUBTYPE_SH7705
65 bool "Support SH7705 processor" 63 bool "Support SH7705 processor"
66 select CPU_SH3 64 select CPU_SH3
67 select CPU_HAS_INTC_IRQ
68 65
69config CPU_SUBTYPE_SH7706 66config CPU_SUBTYPE_SH7706
70 bool "Support SH7706 processor" 67 bool "Support SH7706 processor"
71 select CPU_SH3 68 select CPU_SH3
72 select CPU_HAS_INTC_IRQ
73 help 69 help
74 Select SH7706 if you have a 133 Mhz SH-3 HD6417706 CPU. 70 Select SH7706 if you have a 133 Mhz SH-3 HD6417706 CPU.
75 71
76config CPU_SUBTYPE_SH7707 72config CPU_SUBTYPE_SH7707
77 bool "Support SH7707 processor" 73 bool "Support SH7707 processor"
78 select CPU_SH3 74 select CPU_SH3
79 select CPU_HAS_INTC_IRQ
80 help 75 help
81 Select SH7707 if you have a 60 Mhz SH-3 HD6417707 CPU. 76 Select SH7707 if you have a 60 Mhz SH-3 HD6417707 CPU.
82 77
83config CPU_SUBTYPE_SH7708 78config CPU_SUBTYPE_SH7708
84 bool "Support SH7708 processor" 79 bool "Support SH7708 processor"
85 select CPU_SH3 80 select CPU_SH3
86 select CPU_HAS_INTC_IRQ
87 help 81 help
88 Select SH7708 if you have a 60 Mhz SH-3 HD6417708S or 82 Select SH7708 if you have a 60 Mhz SH-3 HD6417708S or
89 if you have a 100 Mhz SH-3 HD6417708R CPU. 83 if you have a 100 Mhz SH-3 HD6417708R CPU.
@@ -91,14 +85,12 @@ config CPU_SUBTYPE_SH7708
91config CPU_SUBTYPE_SH7709 85config CPU_SUBTYPE_SH7709
92 bool "Support SH7709 processor" 86 bool "Support SH7709 processor"
93 select CPU_SH3 87 select CPU_SH3
94 select CPU_HAS_INTC_IRQ
95 help 88 help
96 Select SH7709 if you have a 80 Mhz SH-3 HD6417709 CPU. 89 Select SH7709 if you have a 80 Mhz SH-3 HD6417709 CPU.
97 90
98config CPU_SUBTYPE_SH7710 91config CPU_SUBTYPE_SH7710
99 bool "Support SH7710 processor" 92 bool "Support SH7710 processor"
100 select CPU_SH3 93 select CPU_SH3
101 select CPU_HAS_INTC_IRQ
102 select CPU_HAS_DSP 94 select CPU_HAS_DSP
103 help 95 help
104 Select SH7710 if you have a SH3-DSP SH7710 CPU. 96 Select SH7710 if you have a SH3-DSP SH7710 CPU.
@@ -106,7 +98,6 @@ config CPU_SUBTYPE_SH7710
106config CPU_SUBTYPE_SH7712 98config CPU_SUBTYPE_SH7712
107 bool "Support SH7712 processor" 99 bool "Support SH7712 processor"
108 select CPU_SH3 100 select CPU_SH3
109 select CPU_HAS_INTC_IRQ
110 select CPU_HAS_DSP 101 select CPU_HAS_DSP
111 help 102 help
112 Select SH7712 if you have a SH3-DSP SH7712 CPU. 103 Select SH7712 if you have a SH3-DSP SH7712 CPU.
@@ -124,14 +115,12 @@ config CPU_SUBTYPE_SH7720
124config CPU_SUBTYPE_SH7750 115config CPU_SUBTYPE_SH7750
125 bool "Support SH7750 processor" 116 bool "Support SH7750 processor"
126 select CPU_SH4 117 select CPU_SH4
127 select CPU_HAS_INTC_IRQ
128 help 118 help
129 Select SH7750 if you have a 200 Mhz SH-4 HD6417750 CPU. 119 Select SH7750 if you have a 200 Mhz SH-4 HD6417750 CPU.
130 120
131config CPU_SUBTYPE_SH7091 121config CPU_SUBTYPE_SH7091
132 bool "Support SH7091 processor" 122 bool "Support SH7091 processor"
133 select CPU_SH4 123 select CPU_SH4
134 select CPU_HAS_INTC_IRQ
135 help 124 help
136 Select SH7091 if you have an SH-4 based Sega device (such as 125 Select SH7091 if you have an SH-4 based Sega device (such as
137 the Dreamcast, Naomi, and Naomi 2). 126 the Dreamcast, Naomi, and Naomi 2).
@@ -139,17 +128,14 @@ config CPU_SUBTYPE_SH7091
139config CPU_SUBTYPE_SH7750R 128config CPU_SUBTYPE_SH7750R
140 bool "Support SH7750R processor" 129 bool "Support SH7750R processor"
141 select CPU_SH4 130 select CPU_SH4
142 select CPU_HAS_INTC_IRQ
143 131
144config CPU_SUBTYPE_SH7750S 132config CPU_SUBTYPE_SH7750S
145 bool "Support SH7750S processor" 133 bool "Support SH7750S processor"
146 select CPU_SH4 134 select CPU_SH4
147 select CPU_HAS_INTC_IRQ
148 135
149config CPU_SUBTYPE_SH7751 136config CPU_SUBTYPE_SH7751
150 bool "Support SH7751 processor" 137 bool "Support SH7751 processor"
151 select CPU_SH4 138 select CPU_SH4
152 select CPU_HAS_INTC_IRQ
153 help 139 help
154 Select SH7751 if you have a 166 Mhz SH-4 HD6417751 CPU, 140 Select SH7751 if you have a 166 Mhz SH-4 HD6417751 CPU,
155 or if you have a HD6417751R CPU. 141 or if you have a HD6417751R CPU.
@@ -157,12 +143,10 @@ config CPU_SUBTYPE_SH7751
157config CPU_SUBTYPE_SH7751R 143config CPU_SUBTYPE_SH7751R
158 bool "Support SH7751R processor" 144 bool "Support SH7751R processor"
159 select CPU_SH4 145 select CPU_SH4
160 select CPU_HAS_INTC_IRQ
161 146
162config CPU_SUBTYPE_SH7760 147config CPU_SUBTYPE_SH7760
163 bool "Support SH7760 processor" 148 bool "Support SH7760 processor"
164 select CPU_SH4 149 select CPU_SH4
165 select CPU_HAS_INTC_IRQ
166 150
167config CPU_SUBTYPE_SH4_202 151config CPU_SUBTYPE_SH4_202
168 bool "Support SH4-202 processor" 152 bool "Support SH4-202 processor"
@@ -192,19 +176,16 @@ config CPU_SUBTYPE_SH7770
192config CPU_SUBTYPE_SH7780 176config CPU_SUBTYPE_SH7780
193 bool "Support SH7780 processor" 177 bool "Support SH7780 processor"
194 select CPU_SH4A 178 select CPU_SH4A
195 select CPU_HAS_INTC_IRQ
196 179
197config CPU_SUBTYPE_SH7785 180config CPU_SUBTYPE_SH7785
198 bool "Support SH7785 processor" 181 bool "Support SH7785 processor"
199 select CPU_SH4A 182 select CPU_SH4A
200 select CPU_SHX2 183 select CPU_SHX2
201 select CPU_HAS_INTC_IRQ
202 184
203config CPU_SUBTYPE_SHX3 185config CPU_SUBTYPE_SHX3
204 bool "Support SH-X3 processor" 186 bool "Support SH-X3 processor"
205 select CPU_SH4A 187 select CPU_SH4A
206 select CPU_SHX3 188 select CPU_SHX3
207 select CPU_HAS_INTC_IRQ
208 select ARCH_SPARSEMEM_ENABLE 189 select ARCH_SPARSEMEM_ENABLE
209 select SYS_SUPPORTS_NUMA 190 select SYS_SUPPORTS_NUMA
210 191
@@ -218,7 +199,6 @@ config CPU_SUBTYPE_SH7722
218 bool "Support SH7722 processor" 199 bool "Support SH7722 processor"
219 select CPU_SH4AL_DSP 200 select CPU_SH4AL_DSP
220 select CPU_SHX2 201 select CPU_SHX2
221 select CPU_HAS_INTC_IRQ
222 select ARCH_SPARSEMEM_ENABLE 202 select ARCH_SPARSEMEM_ENABLE
223 select SYS_SUPPORTS_NUMA 203 select SYS_SUPPORTS_NUMA
224 204