Commit dd5957b7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'renesas-sh-drivers-for-v3.17' of...

Merge tag 'renesas-sh-drivers-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

Pull SH driver fix from Simon Horman:
 "Confine SH_INTC to platforms that need it"

* tag 'renesas-sh-drivers-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  sh: intc: Confine SH_INTC to platforms that need it
parents 497c01dd 049d2804
...@@ -75,6 +75,7 @@ config ARCH_SH7372 ...@@ -75,6 +75,7 @@ config ARCH_SH7372
select ARM_CPU_SUSPEND if PM || CPU_IDLE select ARM_CPU_SUSPEND if PM || CPU_IDLE
select CPU_V7 select CPU_V7
select SH_CLK_CPG select SH_CLK_CPG
select SH_INTC
select SYS_SUPPORTS_SH_CMT select SYS_SUPPORTS_SH_CMT
select SYS_SUPPORTS_SH_TMU select SYS_SUPPORTS_SH_TMU
...@@ -85,6 +86,7 @@ config ARCH_SH73A0 ...@@ -85,6 +86,7 @@ config ARCH_SH73A0
select CPU_V7 select CPU_V7
select I2C select I2C
select SH_CLK_CPG select SH_CLK_CPG
select SH_INTC
select RENESAS_INTC_IRQPIN select RENESAS_INTC_IRQPIN
select SYS_SUPPORTS_SH_CMT select SYS_SUPPORTS_SH_CMT
select SYS_SUPPORTS_SH_TMU select SYS_SUPPORTS_SH_TMU
......
...@@ -172,6 +172,7 @@ menu "System type" ...@@ -172,6 +172,7 @@ menu "System type"
# #
config CPU_SH2 config CPU_SH2
bool bool
select SH_INTC
config CPU_SH2A config CPU_SH2A
bool bool
...@@ -182,6 +183,7 @@ config CPU_SH3 ...@@ -182,6 +183,7 @@ config CPU_SH3
bool bool
select CPU_HAS_INTEVT select CPU_HAS_INTEVT
select CPU_HAS_SR_RB select CPU_HAS_SR_RB
select SH_INTC
select SYS_SUPPORTS_SH_TMU select SYS_SUPPORTS_SH_TMU
config CPU_SH4 config CPU_SH4
...@@ -189,6 +191,7 @@ config CPU_SH4 ...@@ -189,6 +191,7 @@ config CPU_SH4
select CPU_HAS_INTEVT select CPU_HAS_INTEVT
select CPU_HAS_SR_RB select CPU_HAS_SR_RB
select CPU_HAS_FPU if !CPU_SH4AL_DSP select CPU_HAS_FPU if !CPU_SH4AL_DSP
select SH_INTC
select SYS_SUPPORTS_SH_TMU select SYS_SUPPORTS_SH_TMU
select SYS_SUPPORTS_HUGETLBFS if MMU select SYS_SUPPORTS_HUGETLBFS if MMU
......
# #
# Makefile for the SuperH specific drivers. # Makefile for the SuperH specific drivers.
# #
obj-$(CONFIG_SUPERH) += intc/ obj-$(CONFIG_SH_INTC) += intc/
obj-$(CONFIG_ARCH_SHMOBILE_LEGACY) += intc/
ifneq ($(CONFIG_COMMON_CLK),y) ifneq ($(CONFIG_COMMON_CLK),y)
obj-$(CONFIG_HAVE_CLK) += clk/ obj-$(CONFIG_HAVE_CLK) += clk/
endif endif
......
config SH_INTC config SH_INTC
def_bool y bool
select IRQ_DOMAIN select IRQ_DOMAIN
if SH_INTC
comment "Interrupt controller options" comment "Interrupt controller options"
config INTC_USERIMASK config INTC_USERIMASK
...@@ -37,3 +39,5 @@ config INTC_MAPPING_DEBUG ...@@ -37,3 +39,5 @@ config INTC_MAPPING_DEBUG
between system IRQs and the per-controller id tables. between system IRQs and the per-controller id tables.
If in doubt, say N. If in doubt, say N.
endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment