From: Olof Johansson Date: Tue, 8 Jul 2014 05:27:00 +0000 (-0700) Subject: Merge tag 'mvebu-soc-3.17' of git://git.infradead.org/linux-mvebu into next/soc X-Git-Tag: v3.17-rc1~79^2~31 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b3c20e983269667ecce75fa7f4b0353917a8d0d1;p=platform%2Fkernel%2Flinux-exynos.git Merge tag 'mvebu-soc-3.17' of git://git.infradead.org/linux-mvebu into next/soc Merge "mvebu SoC changes for v3.17" from Jason Cooper: - kirkwood * add setup file for netxbig LEDs (non-trivial DT binding doesn't exist yet) - mvebu * staticize where needed * add CPU hotplug for Armada XP * add public datasheet for Armada 370 * don't apply thermal quirk by default * get SoC ID from the system controller when possible * tag 'mvebu-soc-3.17' of git://git.infradead.org/linux-mvebu: ARM: mvebu: Staticize mvebu_cpu_reset_init ARM: mvebu: Staticize armada_370_xp_cpu_pm_init ARM: mvebu: Staticize armada_375_smp_cpu1_enable_wa ARM: mvebu: Use system controller to get the soc id when possible ARM: mvebu: Use the a standard errno in mvebu_get_soc_id ARM: mvebu: Don't apply the thermal quirk if the SoC revision is unknown Documentation: arm: add URLs to public datasheets for the Marvell Armada 370 SoC ARM: mvebu: implement CPU hotplug support for Armada XP ARM: mvebu: export PMSU idle enter/exit functions ARM: mvebu: slightly refactor/rename PMSU idle related functions ARM: mvebu: remove stub implementation of CPU hotplug on Armada 375/38x ARM: Kirkwood: Add setup file for netxbig LEDs ARM: mvebu: mark armada_370_xp_pmsu_idle_prepare() as static Signed-off-by: Olof Johansson --- b3c20e983269667ecce75fa7f4b0353917a8d0d1 diff --cc arch/arm/mach-mvebu/Kconfig index b9bc599,e5ab3a7cb..955d4a3 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@@ -96,4 -97,13 +96,11 @@@ config MACH_KIRKWOO Say 'Y' here if you want your kernel to support boards based on the Marvell Kirkwood device tree. + config MACH_NETXBIG + bool "LaCie 2Big and 5Big Network v2" + depends on MACH_KIRKWOOD + help + Say 'Y' here if you want your kernel to support the + LaCie 2Big and 5Big Network v2 + -endmenu - endif