Commit a875e0e5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'vexpress-modules-for-soc-v2' of... 

Merge tag 'vexpress-modules-for-soc-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux into arm/soc

VExpress modularization

This series enables building various Versatile Express platform drivers
as modules. The primary target is the Fast Model FVP which is supported
in Android. As Android is moving towards their GKI, or generic kernel,
the hardware support has to be in modules. Currently ARCH_VEXPRESS
enables several built-in only drivers. Some of these are needed, but
some are only needed for older 32-bit VExpress platforms and can just
be disabled.

* tag 'vexpress-modules-for-soc-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

:
  ARM: vexpress: Don't select VEXPRESS_CONFIG
  bus: vexpress-config: Support building as module
  vexpress: Move setting master site to vexpress-config bus
  bus: vexpress-config: simplify config bus probing
  bus: vexpress-config: Merge vexpress-syscfg into vexpress-config
  mfd: vexpress-sysreg: Support building as a module
  mfd: vexpress-sysreg: Use devres API variants
  mfd: vexpress-sysreg: Drop unused syscon child devices
  mfd: vexpress-sysreg: Drop selecting CONFIG_CLKSRC_MMIO
  clk: vexpress-osc: Support building as a module
  clk: vexpress-osc: Use the devres clock API variants
  clk: versatile: Only enable SP810 on 32-bit by default
  clk: versatile: Rework kconfig structure
  amba: Retry adding deferred devices at late_initcall
  arm64: vexpress: Don't select CONFIG_POWER_RESET_VEXPRESS
  ARM: vexpress: Move vexpress_flags_set() into arch code

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5df04698 848685c2

arch/arm/mach-integrator/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ menuconfig ARCH_INTEGRATOR 
	bool "ARM Ltd. Integrator family"

	depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V6

	select ARM_AMBA

	select COMMON_CLK_VERSATILE

	select CMA

	select DMA_CMA

	select HAVE_TCM

arch/arm/mach-realview/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ menuconfig ARCH_REALVIEW 
	select ARM_GIC

	select ARM_TIMER_SP804

	select CLK_SP810

	select COMMON_CLK_VERSATILE

	select GPIO_PL061 if GPIOLIB

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

arch/arm/mach-versatile/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ config ARCH_VERSATILE 
	select ARM_TIMER_SP804

	select ARM_VIC

	select CLKSRC_VERSATILE

	select COMMON_CLK_VERSATILE

	select CPU_ARM926T

	select ICST

	select MFD_SYSCON

arch/arm/mach-vexpress/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ menuconfig ARCH_VEXPRESS 
	select ARM_GIC

	select ARM_GLOBAL_TIMER

	select ARM_TIMER_SP804

	select COMMON_CLK_VERSATILE

	select GPIOLIB

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP
@@ -20,9 +19,6 @@ menuconfig ARCH_VEXPRESS 
	select POWER_SUPPLY

	select REGULATOR if MMC_ARMMMCI

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	select VEXPRESS_CONFIG

	select VEXPRESS_SYSCFG

	select MFD_VEXPRESS_SYSREG

	help

	  This option enables support for systems using Cortex processor based

	  ARM core and logic (FPGA) tiles on the Versatile Express motherboard,

arch/arm/mach-vexpress/core.h

+1 −0
Original line number Diff line number Diff line 
bool vexpress_smp_init_ops(void);

void vexpress_flags_set(u32 data);



extern const struct smp_operations vexpress_smp_dt_ops;