Skip to content

Commit

Permalink
sh: intc: Confine SH_INTC to platforms that need it
Browse files Browse the repository at this point in the history
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 <geert+renesas@glider.be>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  • Loading branch information
Geert Uytterhoeven authored and Simon Horman committed Aug 22, 2014
1 parent 7d1311b commit 049d280
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
2 changes: 2 additions & 0 deletions arch/arm/mach-shmobile/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ config ARCH_SH7372
select ARM_CPU_SUSPEND if PM || CPU_IDLE
select CPU_V7
select SH_CLK_CPG
select SH_INTC
select SYS_SUPPORTS_SH_CMT
select SYS_SUPPORTS_SH_TMU

Expand All @@ -85,6 +86,7 @@ config ARCH_SH73A0
select CPU_V7
select I2C
select SH_CLK_CPG
select SH_INTC
select RENESAS_INTC_IRQPIN
select SYS_SUPPORTS_SH_CMT
select SYS_SUPPORTS_SH_TMU
Expand Down
3 changes: 3 additions & 0 deletions arch/sh/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ menu "System type"
#
config CPU_SH2
bool
select SH_INTC

config CPU_SH2A
bool
Expand All @@ -182,13 +183,15 @@ config CPU_SH3
bool
select CPU_HAS_INTEVT
select CPU_HAS_SR_RB
select SH_INTC
select SYS_SUPPORTS_SH_TMU

config CPU_SH4
bool
select CPU_HAS_INTEVT
select CPU_HAS_SR_RB
select CPU_HAS_FPU if !CPU_SH4AL_DSP
select SH_INTC
select SYS_SUPPORTS_SH_TMU
select SYS_SUPPORTS_HUGETLBFS if MMU

Expand Down
3 changes: 1 addition & 2 deletions drivers/sh/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#
# Makefile for the SuperH specific drivers.
#
obj-$(CONFIG_SUPERH) += intc/
obj-$(CONFIG_ARCH_SHMOBILE_LEGACY) += intc/
obj-$(CONFIG_SH_INTC) += intc/
ifneq ($(CONFIG_COMMON_CLK),y)
obj-$(CONFIG_HAVE_CLK) += clk/
endif
Expand Down
6 changes: 5 additions & 1 deletion drivers/sh/intc/Kconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
config SH_INTC
def_bool y
bool
select IRQ_DOMAIN

if SH_INTC

comment "Interrupt controller options"

config INTC_USERIMASK
Expand Down Expand Up @@ -37,3 +39,5 @@ config INTC_MAPPING_DEBUG
between system IRQs and the per-controller id tables.

If in doubt, say N.

endif

0 comments on commit 049d280

Please sign in to comment.