diff options
author | Geert Uytterhoeven <geert+renesas@glider.be> | 2014-08-20 09:39:22 -0400 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2014-08-21 23:28:16 -0400 |
commit | 049d28048be595e0a10a58fe1c104b153c386633 (patch) | |
tree | 04ecf6caf9a5b5b100f9b47a954d7bf6d0610ebd /drivers/sh | |
parent | 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 (diff) |
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>
Diffstat (limited to 'drivers/sh')
-rw-r--r-- | drivers/sh/Makefile | 3 | ||||
-rw-r--r-- | drivers/sh/intc/Kconfig | 6 |
2 files changed, 6 insertions, 3 deletions
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 @@ | |||
1 | # | 1 | # |
2 | # Makefile for the SuperH specific drivers. | 2 | # Makefile for the SuperH specific drivers. |
3 | # | 3 | # |
4 | obj-$(CONFIG_SUPERH) += intc/ | 4 | obj-$(CONFIG_SH_INTC) += intc/ |
5 | obj-$(CONFIG_ARCH_SHMOBILE_LEGACY) += intc/ | ||
6 | ifneq ($(CONFIG_COMMON_CLK),y) | 5 | ifneq ($(CONFIG_COMMON_CLK),y) |
7 | obj-$(CONFIG_HAVE_CLK) += clk/ | 6 | obj-$(CONFIG_HAVE_CLK) += clk/ |
8 | endif | 7 | 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 @@ | |||
1 | config SH_INTC | 1 | config SH_INTC |
2 | def_bool y | 2 | bool |
3 | select IRQ_DOMAIN | 3 | select IRQ_DOMAIN |
4 | 4 | ||
5 | if SH_INTC | ||
6 | |||
5 | comment "Interrupt controller options" | 7 | comment "Interrupt controller options" |
6 | 8 | ||
7 | config INTC_USERIMASK | 9 | config INTC_USERIMASK |
@@ -37,3 +39,5 @@ config INTC_MAPPING_DEBUG | |||
37 | between system IRQs and the per-controller id tables. | 39 | between system IRQs and the per-controller id tables. |
38 | 40 | ||
39 | If in doubt, say N. | 41 | If in doubt, say N. |
42 | |||
43 | endif | ||