Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC platform changes from Arnd Bergmann: "New and updated SoC support, notable changes include: - bcm: brcmstb SMP support initial iproc/cygnus support - exynos: Exynos4415 SoC support PMU and suspend support for Exynos5420 PMU support for Exynos3250 pm related maintenance - imx: new LS1021A SoC support vybrid 610 global timer support - integrator: convert to using multiplatform configuration - mediatek: earlyprintk support for mt8127/mt8135 - meson: meson8 soc and l2 cache controller support - mvebu: Armada 38x CPU hotplug support drop support for prerelease Armada 375 Z1 stepping extended suspend support, now works on Armada 370/XP - omap: hwmod related maintenance prcm cleanup - pxa: initial pxa27x DT handling - rockchip: SMP support for rk3288 add cpu frequency scaling support - shmobile: r8a7740 power domain support various small restart, timer, pci apmu changes - sunxi: Allwinner A80 (sun9i) earlyprintk support - ux500: power domain support Overall, a significant chunk of changes, coming mostly from the usual suspects: omap, shmobile, samsung and mvebu, all of which already contain a lot of platform specific code in arch/arm" * tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (187 commits) ARM: mvebu: use the cpufreq-dt platform_data for independent clocks soc: integrator: Add terminating entry for integrator_cm_match ARM: mvebu: add SDRAM controller description for Armada XP ARM: mvebu: adjust mbus controller description on Armada 370/XP ARM: mvebu: add suspend/resume DT information for Armada XP GP ARM: mvebu: synchronize secondary CPU clocks on resume ARM: mvebu: make sure MMU is disabled in armada_370_xp_cpu_resume ARM: mvebu: Armada XP GP specific suspend/resume code ARM: mvebu: reserve the first 10 KB of each memory bank for suspend/resume ARM: mvebu: implement suspend/resume support for Armada XP clk: mvebu: add suspend/resume for gatable clocks bus: mvebu-mbus: provide a mechanism to save SDRAM window configuration bus: mvebu-mbus: suspend/resume support clocksource: time-armada-370-xp: add suspend/resume support irqchip: armada-370-xp: Add suspend/resume support ARM: add lolevel debug support for asm9260 ARM: add mach-asm9260 ARM: EXYNOS: use u8 for val[] in struct exynos_pmu_conf power: reset: imx-snvs-poweroff: add power off driver for i.mx6 ARM: imx: temporarily remove CONFIG_SOC_FSL from LS1021A ...
这个提交包含在:
@@ -21,7 +21,7 @@ config CPU_ARM7TDMI
|
||||
|
||||
# ARM720T
|
||||
config CPU_ARM720T
|
||||
bool "Support ARM720T processor" if ARCH_INTEGRATOR
|
||||
bool "Support ARM720T processor" if (ARCH_MULTI_V4T && ARCH_INTEGRATOR)
|
||||
select CPU_32v4T
|
||||
select CPU_ABRT_LV4T
|
||||
select CPU_CACHE_V4
|
||||
@@ -39,7 +39,7 @@ config CPU_ARM720T
|
||||
|
||||
# ARM740T
|
||||
config CPU_ARM740T
|
||||
bool "Support ARM740T processor" if ARCH_INTEGRATOR
|
||||
bool "Support ARM740T processor" if (ARCH_MULTI_V4T && ARCH_INTEGRATOR)
|
||||
depends on !MMU
|
||||
select CPU_32v4T
|
||||
select CPU_ABRT_LV4T
|
||||
@@ -71,7 +71,7 @@ config CPU_ARM9TDMI
|
||||
|
||||
# ARM920T
|
||||
config CPU_ARM920T
|
||||
bool "Support ARM920T processor" if ARCH_INTEGRATOR
|
||||
bool "Support ARM920T processor" if (ARCH_MULTI_V4T && ARCH_INTEGRATOR)
|
||||
select CPU_32v4T
|
||||
select CPU_ABRT_EV4T
|
||||
select CPU_CACHE_V4WT
|
||||
@@ -89,7 +89,7 @@ config CPU_ARM920T
|
||||
|
||||
# ARM922T
|
||||
config CPU_ARM922T
|
||||
bool "Support ARM922T processor" if ARCH_INTEGRATOR
|
||||
bool "Support ARM922T processor" if (ARCH_MULTI_V4T && ARCH_INTEGRATOR)
|
||||
select CPU_32v4T
|
||||
select CPU_ABRT_EV4T
|
||||
select CPU_CACHE_V4WT
|
||||
@@ -127,7 +127,7 @@ config CPU_ARM925T
|
||||
|
||||
# ARM926T
|
||||
config CPU_ARM926T
|
||||
bool "Support ARM926T processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB
|
||||
bool "Support ARM926T processor" if (!ARCH_MULTIPLATFORM || ARCH_MULTI_V5) && (ARCH_INTEGRATOR || MACH_REALVIEW_EB)
|
||||
select CPU_32v5
|
||||
select CPU_ABRT_EV5TJ
|
||||
select CPU_CACHE_VIVT
|
||||
@@ -163,7 +163,7 @@ config CPU_FA526
|
||||
|
||||
# ARM940T
|
||||
config CPU_ARM940T
|
||||
bool "Support ARM940T processor" if ARCH_INTEGRATOR
|
||||
bool "Support ARM940T processor" if (ARCH_MULTI_V4T && ARCH_INTEGRATOR)
|
||||
depends on !MMU
|
||||
select CPU_32v4T
|
||||
select CPU_ABRT_NOMMU
|
||||
@@ -181,7 +181,7 @@ config CPU_ARM940T
|
||||
|
||||
# ARM946E-S
|
||||
config CPU_ARM946E
|
||||
bool "Support ARM946E-S processor" if ARCH_INTEGRATOR
|
||||
bool "Support ARM946E-S processor" if (ARCH_MULTI_V5 && ARCH_INTEGRATOR)
|
||||
depends on !MMU
|
||||
select CPU_32v5
|
||||
select CPU_ABRT_NOMMU
|
||||
@@ -198,7 +198,7 @@ config CPU_ARM946E
|
||||
|
||||
# ARM1020 - needs validating
|
||||
config CPU_ARM1020
|
||||
bool "Support ARM1020T (rev 0) processor" if ARCH_INTEGRATOR
|
||||
bool "Support ARM1020T (rev 0) processor" if (ARCH_MULTI_V5 && ARCH_INTEGRATOR)
|
||||
select CPU_32v5
|
||||
select CPU_ABRT_EV4T
|
||||
select CPU_CACHE_V4WT
|
||||
@@ -216,7 +216,7 @@ config CPU_ARM1020
|
||||
|
||||
# ARM1020E - needs validating
|
||||
config CPU_ARM1020E
|
||||
bool "Support ARM1020E processor" if ARCH_INTEGRATOR
|
||||
bool "Support ARM1020E processor" if (ARCH_MULTI_V5 && ARCH_INTEGRATOR)
|
||||
depends on n
|
||||
select CPU_32v5
|
||||
select CPU_ABRT_EV4T
|
||||
@@ -229,7 +229,7 @@ config CPU_ARM1020E
|
||||
|
||||
# ARM1022E
|
||||
config CPU_ARM1022
|
||||
bool "Support ARM1022E processor" if ARCH_INTEGRATOR
|
||||
bool "Support ARM1022E processor" if (ARCH_MULTI_V5 && ARCH_INTEGRATOR)
|
||||
select CPU_32v5
|
||||
select CPU_ABRT_EV4T
|
||||
select CPU_CACHE_VIVT
|
||||
@@ -247,7 +247,7 @@ config CPU_ARM1022
|
||||
|
||||
# ARM1026EJ-S
|
||||
config CPU_ARM1026
|
||||
bool "Support ARM1026EJ-S processor" if ARCH_INTEGRATOR
|
||||
bool "Support ARM1026EJ-S processor" if (ARCH_MULTI_V5 && ARCH_INTEGRATOR)
|
||||
select CPU_32v5
|
||||
select CPU_ABRT_EV5T # But need Jazelle, but EV5TJ ignores bit 10
|
||||
select CPU_CACHE_VIVT
|
||||
@@ -358,7 +358,7 @@ config CPU_PJ4B
|
||||
|
||||
# ARMv6
|
||||
config CPU_V6
|
||||
bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX
|
||||
bool "Support ARM V6 processor" if (!ARCH_MULTIPLATFORM || ARCH_MULTI_V6) && (ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX)
|
||||
select CPU_32v6
|
||||
select CPU_ABRT_EV6
|
||||
select CPU_CACHE_V6
|
||||
@@ -371,7 +371,7 @@ config CPU_V6
|
||||
|
||||
# ARMv6k
|
||||
config CPU_V6K
|
||||
bool "Support ARM V6K processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX
|
||||
bool "Support ARM V6K processor" if (!ARCH_MULTIPLATFORM || ARCH_MULTI_V6) && (ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX)
|
||||
select CPU_32v6
|
||||
select CPU_32v6K
|
||||
select CPU_ABRT_EV6
|
||||
@@ -385,7 +385,7 @@ config CPU_V6K
|
||||
|
||||
# ARMv7
|
||||
config CPU_V7
|
||||
bool "Support ARM V7 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX
|
||||
bool "Support ARM V7 processor" if (!ARCH_MULTIPLATFORM || ARCH_MULTI_V7) && (ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX)
|
||||
select CPU_32v6K
|
||||
select CPU_32v7
|
||||
select CPU_ABRT_EV7
|
||||
|
在新工单中引用
屏蔽一个用户