diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-02-10 09:47:01 -0500 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2016-02-16 12:36:16 -0500 |
| commit | cb49d86dbe7a3277fb329c30206d4d95470c879c (patch) | |
| tree | 37e4de4c39e13462a165d87b301f3be6a62a906b | |
| parent | a71b9412c90ca784ae68d32ec307cc527b5962a9 (diff) | |
ARM: mvebu: Use the ARMADA_370_XP_IRQ option
Now that there is a ARMADA_370_XP_IRQ option to enable the irqchip
driver for Armada 370, XP, 375, 38x and 39x, let's select this option
when needed. Note that this selection is currently not mandatory
because ARMADA_370_XP_IRQ is for now always enabled when ARCH_MVEBU=y,
but this is something that we will change in the future, and therefore
we should make the relevant platforms select ARMADA_370_XP_IRQ when
needed.
Due to this, selecting GENERIC_IRQ_CHIP is no longer needed.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Link: https://lkml.kernel.org/r/1455115621-22846-7-git-send-email-thomas.petazzoni@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| -rw-r--r-- | arch/arm/mach-mvebu/Kconfig | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 64e3d2ce9a07..b003e3afd693 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig | |||
| @@ -3,7 +3,6 @@ menuconfig ARCH_MVEBU | |||
| 3 | depends on ARCH_MULTI_V7 || ARCH_MULTI_V5 | 3 | depends on ARCH_MULTI_V7 || ARCH_MULTI_V5 |
| 4 | select ARCH_SUPPORTS_BIG_ENDIAN | 4 | select ARCH_SUPPORTS_BIG_ENDIAN |
| 5 | select CLKSRC_MMIO | 5 | select CLKSRC_MMIO |
| 6 | select GENERIC_IRQ_CHIP | ||
| 7 | select PINCTRL | 6 | select PINCTRL |
| 8 | select PLAT_ORION | 7 | select PLAT_ORION |
| 9 | select SOC_BUS | 8 | select SOC_BUS |
| @@ -29,6 +28,7 @@ config MACH_ARMADA_370 | |||
| 29 | bool "Marvell Armada 370 boards" | 28 | bool "Marvell Armada 370 boards" |
| 30 | depends on ARCH_MULTI_V7 | 29 | depends on ARCH_MULTI_V7 |
| 31 | select ARMADA_370_CLK | 30 | select ARMADA_370_CLK |
| 31 | select ARMADA_370_XP_IRQ | ||
| 32 | select CPU_PJ4B | 32 | select CPU_PJ4B |
| 33 | select MACH_MVEBU_V7 | 33 | select MACH_MVEBU_V7 |
| 34 | select PINCTRL_ARMADA_370 | 34 | select PINCTRL_ARMADA_370 |
| @@ -39,6 +39,7 @@ config MACH_ARMADA_370 | |||
| 39 | config MACH_ARMADA_375 | 39 | config MACH_ARMADA_375 |
| 40 | bool "Marvell Armada 375 boards" | 40 | bool "Marvell Armada 375 boards" |
| 41 | depends on ARCH_MULTI_V7 | 41 | depends on ARCH_MULTI_V7 |
| 42 | select ARMADA_370_XP_IRQ | ||
| 42 | select ARM_ERRATA_720789 | 43 | select ARM_ERRATA_720789 |
| 43 | select ARM_ERRATA_753970 | 44 | select ARM_ERRATA_753970 |
| 44 | select ARM_GIC | 45 | select ARM_GIC |
| @@ -58,6 +59,7 @@ config MACH_ARMADA_38X | |||
| 58 | select ARM_ERRATA_720789 | 59 | select ARM_ERRATA_720789 |
| 59 | select ARM_ERRATA_753970 | 60 | select ARM_ERRATA_753970 |
| 60 | select ARM_GIC | 61 | select ARM_GIC |
| 62 | select ARMADA_370_XP_IRQ | ||
| 61 | select ARMADA_38X_CLK | 63 | select ARMADA_38X_CLK |
| 62 | select HAVE_ARM_SCU | 64 | select HAVE_ARM_SCU |
| 63 | select HAVE_ARM_TWD if SMP | 65 | select HAVE_ARM_TWD if SMP |
| @@ -72,6 +74,7 @@ config MACH_ARMADA_39X | |||
| 72 | bool "Marvell Armada 39x boards" | 74 | bool "Marvell Armada 39x boards" |
| 73 | depends on ARCH_MULTI_V7 | 75 | depends on ARCH_MULTI_V7 |
| 74 | select ARM_GIC | 76 | select ARM_GIC |
| 77 | select ARMADA_370_XP_IRQ | ||
| 75 | select ARMADA_39X_CLK | 78 | select ARMADA_39X_CLK |
| 76 | select CACHE_L2X0 | 79 | select CACHE_L2X0 |
| 77 | select HAVE_ARM_SCU | 80 | select HAVE_ARM_SCU |
| @@ -86,6 +89,7 @@ config MACH_ARMADA_39X | |||
| 86 | config MACH_ARMADA_XP | 89 | config MACH_ARMADA_XP |
| 87 | bool "Marvell Armada XP boards" | 90 | bool "Marvell Armada XP boards" |
| 88 | depends on ARCH_MULTI_V7 | 91 | depends on ARCH_MULTI_V7 |
| 92 | select ARMADA_370_XP_IRQ | ||
| 89 | select ARMADA_XP_CLK | 93 | select ARMADA_XP_CLK |
| 90 | select CPU_PJ4B | 94 | select CPU_PJ4B |
| 91 | select MACH_MVEBU_V7 | 95 | select MACH_MVEBU_V7 |