Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eea4fba5 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-smp-for-v3.13' of... 

Merge tag 'renesas-smp-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

From Simon Horman:
Renesas ARM based SoC SMP updates for v3.13

* Add CPU notifier based SCU boot vector code
  - Use on emev2, r8a7779 and sh73a0 SoCs
  - Remove now unused shmobile_smp_scu_boot_secondary()
* Add shared APMU SMP support code
  - Use to add SMP support for r8a7790 SoC
* Introduce shmobile_boot_size
* Expose shmobile_invalidate_start()
* Introduce shmobile_smp_cpu_disable()
  - Use on sh73a0 SoC
  - Remove now unused shmobile_smp_init_cpus()

* tag 'renesas-smp-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: Include CA7 cores in APMU table
  ARM: shmobile: Extend APMU code to allow single cluster only
  ARM: shmobile: Remove shmobile_smp_scu_boot_secondary()
  ARM: shmobile: Let r8a7779 rely on SCU CPU notifier
  ARM: shmobile: Let EMEV2 rely on SCU CPU notifier
  ARM: shmobile: Let sh73a0 rely on SCU CPU notifier
  ARM: shmobile: Add CPU notifier based SCU boot vector code
  ARM: shmobile: Add r8a7790 SMP support using APMU code
  ARM: shmobile: Shared APMU SMP support code without DT
  ARM: shmobile: Introduce shmobile_boot_size
  ARM: shmobile: Expose shmobile_invalidate_start()
  ARM: shmobile: Remove unused shmobile_smp_init_cpus()
  ARM: shmobile: Use shmobile_smp_cpu_disable() on sh73a0
  ARM: shmobile: Introduce shmobile_smp_cpu_disable()
  ARM: shmobile: r8a7790: Constify platform data and resources
  ARM: shmobile: Rename to r8a7790_init_early()
  ARM: shmobile: Rename to r8a73a4_init_early()

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 6c409bfa 43651b15

arch/arm/mach-shmobile/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ endif 
smp-y				:= platsmp.o headsmp.o

smp-$(CONFIG_ARCH_SH73A0)	+= smp-sh73a0.o headsmp-scu.o platsmp-scu.o

smp-$(CONFIG_ARCH_R8A7779)	+= smp-r8a7779.o headsmp-scu.o platsmp-scu.o

smp-$(CONFIG_ARCH_R8A7790)	+= smp-r8a7790.o platsmp-apmu.o

smp-$(CONFIG_ARCH_EMEV2)	+= smp-emev2.o headsmp-scu.o platsmp-scu.o



# IRQ objects

arch/arm/mach-shmobile/board-ape6evm-reference.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static const char *ape6evm_boards_compat_dt[] __initdata = { 
};



DT_MACHINE_START(APE6EVM_DT, "ape6evm")

	.init_early	= r8a73a4_init_delay,

	.init_early	= r8a73a4_init_early,

	.init_machine	= ape6evm_add_standard_devices,

	.dt_compat	= ape6evm_boards_compat_dt,

MACHINE_END

arch/arm/mach-shmobile/board-ape6evm.c

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static const char *ape6evm_boards_compat_dt[] __initdata = { 
};



DT_MACHINE_START(APE6EVM_DT, "ape6evm")

	.init_early	= r8a73a4_init_delay,

	.init_early	= r8a73a4_init_early,

	.init_machine	= ape6evm_add_standard_devices,

	.dt_compat	= ape6evm_boards_compat_dt,

MACHINE_END

arch/arm/mach-shmobile/board-lager-reference.c

+2 −1
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ static const char *lager_boards_compat_dt[] __initdata = { 
};



DT_MACHINE_START(LAGER_DT, "lager")

	.init_early	= r8a7790_init_delay,

	.smp		= smp_ops(r8a7790_smp_ops),

	.init_early	= r8a7790_init_early,

	.init_machine	= lager_add_standard_devices,

	.init_time	= r8a7790_timer_init,

	.dt_compat	= lager_boards_compat_dt,

arch/arm/mach-shmobile/board-lager.c

+2 −1
Original line number Diff line number Diff line
@@ -161,7 +161,8 @@ static const char *lager_boards_compat_dt[] __initdata = { 
};



DT_MACHINE_START(LAGER_DT, "lager")

	.init_early	= r8a7790_init_delay,

	.smp		= smp_ops(r8a7790_smp_ops),

	.init_early	= r8a7790_init_early,

	.init_time	= r8a7790_timer_init,

	.init_machine	= lager_add_standard_devices,

	.dt_compat	= lager_boards_compat_dt,