Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

arch/arm/mach-shmobile/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -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
@@ -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

arch/sh/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ menu "System type" 
#

config CPU_SH2

	bool

	select SH_INTC



config CPU_SH2A

	bool
@@ -182,6 +183,7 @@ config CPU_SH3 
	bool

	select CPU_HAS_INTEVT

	select CPU_HAS_SR_RB

	select SH_INTC

	select SYS_SUPPORTS_SH_TMU



config CPU_SH4
@@ -189,6 +191,7 @@ config CPU_SH4 
	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

drivers/sh/Makefile

+1 −2
Original line number Diff line number Diff line 
#

# 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

drivers/sh/intc/Kconfig

+5 −1
Original line number Diff line number Diff line 
config SH_INTC

	def_bool y

	bool

	select IRQ_DOMAIN



if SH_INTC



comment "Interrupt controller options"



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



	  If in doubt, say N.



endif