| From 77b0acecda2f53a09306d0bb546f4400b1dd4d08 Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Wed, 20 Aug 2014 15:39:22 +0200 |
| Subject: 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 <geert+renesas@glider.be> |
| Acked-by: Magnus Damm <damm+renesas@opensource.se> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 049d28048be595e0a10a58fe1c104b153c386633) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| Conflicts: |
| arch/arm/mach-shmobile/Kconfig |
| arch/sh/Kconfig |
| --- |
| arch/arm/mach-shmobile/Kconfig | 2 ++ |
| arch/sh/Kconfig | 3 +++ |
| drivers/sh/Makefile | 3 +-- |
| drivers/sh/intc/Kconfig | 6 +++++- |
| 4 files changed, 11 insertions(+), 3 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig |
| index 54c9210461c7..0548968e21a8 100644 |
| --- a/arch/arm/mach-shmobile/Kconfig |
| +++ b/arch/arm/mach-shmobile/Kconfig |
| @@ -64,6 +64,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 |
| |
| @@ -74,6 +75,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 |
| diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig |
| index b2cdb203e843..8356f395a10a 100644 |
| --- a/arch/sh/Kconfig |
| +++ b/arch/sh/Kconfig |
| @@ -181,6 +181,7 @@ menu "System type" |
| # |
| config CPU_SH2 |
| bool |
| + select SH_INTC |
| |
| config CPU_SH2A |
| bool |
| @@ -191,6 +192,7 @@ config CPU_SH3 |
| bool |
| select CPU_HAS_INTEVT |
| select CPU_HAS_SR_RB |
| + select SH_INTC |
| select SYS_SUPPORTS_TMU |
| |
| config CPU_SH4 |
| @@ -198,6 +200,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_TMU |
| select SYS_SUPPORTS_HUGETLBFS if MMU |
| |
| diff --git a/drivers/sh/Makefile b/drivers/sh/Makefile |
| index 788ed9b59b4e..114203f32843 100644 |
| --- a/drivers/sh/Makefile |
| +++ b/drivers/sh/Makefile |
| @@ -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 |
| diff --git a/drivers/sh/intc/Kconfig b/drivers/sh/intc/Kconfig |
| index 60228fae943f..6a1b05ddc8c9 100644 |
| --- a/drivers/sh/intc/Kconfig |
| +++ b/drivers/sh/intc/Kconfig |
| @@ -1,7 +1,9 @@ |
| 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 |
| -- |
| 2.1.2 |
| |
