forked from Minki/linux
52fcc56753
On Marvell Armada platforms, the PMSU (Power Management Service Unit) controls a number of power management related activities, needed for things like suspend/resume, CPU hotplug, cpuidle or even simply SMP. Since cpuidle support was added for Armada XP, the pmsu.c file in arch/arm/mach-mvebu/ calls the cpu_suspend() and cpu_resume() ARM functions, which are only available when CONFIG_ARM_CPU_SUSPEND=y. Therefore, configurations that have CONFIG_ARM_CPU_SUSPEND disabled due to PM_SLEEP being disabled no longer build properly, due to undefined references to cpu_suspend() and cpu_resume(). To fix this, this patch simply ensures CONFIG_ARM_CPU_SUSPEND is always enabled for Marvell EBU v7 platforms. Doing things in a more fine-grained way would require a lot of #ifdef-ery in pmsu.c to isolate the parts that use cpu_suspend()/cpu_resume(), and those parts would anyway have been needed as soon as either one of suspend/resume, CPU hotplug or cpuidle was enabled. Reported-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Link: https://lkml.kernel.org/r/1402488397-31381-1-git-send-email-thomas.petazzoni@free-electrons.com Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
105 lines
2.5 KiB
Plaintext
105 lines
2.5 KiB
Plaintext
config ARCH_MVEBU
|
|
bool "Marvell Engineering Business Unit (MVEBU) SoCs" if (ARCH_MULTI_V7 || ARCH_MULTI_V5)
|
|
select ARCH_SUPPORTS_BIG_ENDIAN
|
|
select CLKSRC_MMIO
|
|
select GENERIC_IRQ_CHIP
|
|
select PINCTRL
|
|
select PLAT_ORION
|
|
select SOC_BUS
|
|
select MVEBU_MBUS
|
|
select ZONE_DMA if ARM_LPAE
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
select PCI_QUIRKS if PCI
|
|
select OF_ADDRESS_PCI
|
|
|
|
if ARCH_MVEBU
|
|
|
|
menu "Marvell EBU SoC variants"
|
|
|
|
config MACH_MVEBU_V7
|
|
bool
|
|
select ARMADA_370_XP_TIMER
|
|
select CACHE_L2X0
|
|
select ARM_CPU_SUSPEND
|
|
|
|
config MACH_ARMADA_370
|
|
bool "Marvell Armada 370 boards" if ARCH_MULTI_V7
|
|
select ARMADA_370_CLK
|
|
select CPU_PJ4B
|
|
select MACH_MVEBU_V7
|
|
select PINCTRL_ARMADA_370
|
|
help
|
|
Say 'Y' here if you want your kernel to support boards based
|
|
on the Marvell Armada 370 SoC with device tree.
|
|
|
|
config MACH_ARMADA_375
|
|
bool "Marvell Armada 375 boards" if ARCH_MULTI_V7
|
|
select ARM_ERRATA_720789
|
|
select ARM_ERRATA_753970
|
|
select ARM_GIC
|
|
select ARMADA_375_CLK
|
|
select HAVE_ARM_SCU
|
|
select HAVE_ARM_TWD if SMP
|
|
select HAVE_SMP
|
|
select MACH_MVEBU_V7
|
|
select PINCTRL_ARMADA_375
|
|
help
|
|
Say 'Y' here if you want your kernel to support boards based
|
|
on the Marvell Armada 375 SoC with device tree.
|
|
|
|
config MACH_ARMADA_38X
|
|
bool "Marvell Armada 380/385 boards" if ARCH_MULTI_V7
|
|
select ARM_ERRATA_720789
|
|
select ARM_ERRATA_753970
|
|
select ARM_GIC
|
|
select ARMADA_38X_CLK
|
|
select HAVE_ARM_SCU
|
|
select HAVE_ARM_TWD if SMP
|
|
select HAVE_SMP
|
|
select MACH_MVEBU_V7
|
|
select PINCTRL_ARMADA_38X
|
|
help
|
|
Say 'Y' here if you want your kernel to support boards based
|
|
on the Marvell Armada 380/385 SoC with device tree.
|
|
|
|
config MACH_ARMADA_XP
|
|
bool "Marvell Armada XP boards" if ARCH_MULTI_V7
|
|
select ARMADA_XP_CLK
|
|
select CPU_PJ4B
|
|
select MACH_MVEBU_V7
|
|
select PINCTRL_ARMADA_XP
|
|
help
|
|
Say 'Y' here if you want your kernel to support boards based
|
|
on the Marvell Armada XP SoC with device tree.
|
|
|
|
config MACH_DOVE
|
|
bool "Marvell Dove boards" if ARCH_MULTI_V7
|
|
select CACHE_L2X0
|
|
select CPU_PJ4
|
|
select DOVE_CLK
|
|
select ORION_IRQCHIP
|
|
select ORION_TIMER
|
|
select PINCTRL_DOVE
|
|
help
|
|
Say 'Y' here if you want your kernel to support the
|
|
Marvell Dove using flattened device tree.
|
|
|
|
config MACH_KIRKWOOD
|
|
bool "Marvell Kirkwood boards" if ARCH_MULTI_V5
|
|
select ARCH_HAS_CPUFREQ
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
select CPU_FEROCEON
|
|
select KIRKWOOD_CLK
|
|
select ORION_IRQCHIP
|
|
select ORION_TIMER
|
|
select PCI
|
|
select PCI_QUIRKS
|
|
select PINCTRL_KIRKWOOD
|
|
help
|
|
Say 'Y' here if you want your kernel to support boards based
|
|
on the Marvell Kirkwood device tree.
|
|
|
|
endmenu
|
|
|
|
endif
|