Skip to content

Commit 049d280

Browse files
geertuhorms
authored andcommitted
sh: intc: Confine SH_INTC to platforms that need it
Currently the sh-intc driver is compiled on all SuperH and non-multiplatform SH-Mobile platforms, while it's only used on a limited number of platforms: - SuperH: SH2(A), SH3(A), SH4(A)(L) (all but SH5) - ARM: sh7372, sh73a0 Drop the "default y" on SH_INTC, make all CPU platforms that use it select it, and protect all sub-options by "if SH_INTC" to fix this. Signed-off-by: Geert Uytterhoeven <[email protected]> Acked-by: Magnus Damm <[email protected]> Signed-off-by: Simon Horman <[email protected]>
1 parent 7d1311b commit 049d280

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

arch/arm/mach-shmobile/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ config ARCH_SH7372
7575
select ARM_CPU_SUSPEND if PM || CPU_IDLE
7676
select CPU_V7
7777
select SH_CLK_CPG
78+
select SH_INTC
7879
select SYS_SUPPORTS_SH_CMT
7980
select SYS_SUPPORTS_SH_TMU
8081

@@ -85,6 +86,7 @@ config ARCH_SH73A0
8586
select CPU_V7
8687
select I2C
8788
select SH_CLK_CPG
89+
select SH_INTC
8890
select RENESAS_INTC_IRQPIN
8991
select SYS_SUPPORTS_SH_CMT
9092
select SYS_SUPPORTS_SH_TMU

arch/sh/Kconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ menu "System type"
172172
#
173173
config CPU_SH2
174174
bool
175+
select SH_INTC
175176

176177
config CPU_SH2A
177178
bool
@@ -182,13 +183,15 @@ config CPU_SH3
182183
bool
183184
select CPU_HAS_INTEVT
184185
select CPU_HAS_SR_RB
186+
select SH_INTC
185187
select SYS_SUPPORTS_SH_TMU
186188

187189
config CPU_SH4
188190
bool
189191
select CPU_HAS_INTEVT
190192
select CPU_HAS_SR_RB
191193
select CPU_HAS_FPU if !CPU_SH4AL_DSP
194+
select SH_INTC
192195
select SYS_SUPPORTS_SH_TMU
193196
select SYS_SUPPORTS_HUGETLBFS if MMU
194197

drivers/sh/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#
22
# Makefile for the SuperH specific drivers.
33
#
4-
obj-$(CONFIG_SUPERH) += intc/
5-
obj-$(CONFIG_ARCH_SHMOBILE_LEGACY) += intc/
4+
obj-$(CONFIG_SH_INTC) += intc/
65
ifneq ($(CONFIG_COMMON_CLK),y)
76
obj-$(CONFIG_HAVE_CLK) += clk/
87
endif

drivers/sh/intc/Kconfig

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
config SH_INTC
2-
def_bool y
2+
bool
33
select IRQ_DOMAIN
44

5+
if SH_INTC
6+
57
comment "Interrupt controller options"
68

79
config INTC_USERIMASK
@@ -37,3 +39,5 @@ config INTC_MAPPING_DEBUG
3739
between system IRQs and the per-controller id tables.
3840

3941
If in doubt, say N.
42+
43+
endif

0 commit comments

Comments
 (0)