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

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

Merge tag 'renesas-arm-soc2-for-v4.19' of... 

Merge tag 'renesas-arm-soc2-for-v4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

Second Round of Renesas ARM Based SoC Updates for v4.19

* Always enable ARCH_TIMER on SoCs with A7 or A15

  All such SoCs have ARCH_TIMER so there is no need for it to be optional.
  This allows clean-up which is included in this change.

* Do not compile r8a7779_platform_cpu_kill when it is unused

  This avoids a warning by shuffling code into an existing #ifdef
  r8a7779 is the R-Car H1 SoC

* Add SMP enabler driver for the RZ/N1D (r9a06g032) SoC

  This is to allow SMP to be enabled via DT on the r9a06g032

* Stop compiling headsmp-apmu for non-SMP configs

  This is a minor clean-up allowing removal of an #ifdef

* tag 'renesas-arm-soc2-for-v4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: Always enable ARCH_TIMER on SoCs with A7 and/or A15
  ARM: shmobile: r8a7779: hide unused r8a7779_platform_cpu_kill
  soc: r9a06g032: don't build SMP files for non-SMP config
  ARM: shmobile: Add the R9A06G032 SMP enabler driver
  ARM: shmobile: rcar-gen2: Stop compiling headsmp-apmu on !SMP

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 10567c49 54f464e0

arch/arm/mach-shmobile/Kconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ config ARCH_RCAR_GEN1 




config ARCH_RCAR_GEN2

config ARCH_RCAR_GEN2

	bool

	bool

	select HAVE_ARM_ARCH_TIMER

	select PM

	select PM

	select PM_GENERIC_DOMAINS

	select PM_GENERIC_DOMAINS

	select RENESAS_IRQC

	select RENESAS_IRQC
@@ -58,6 +59,7 @@ config ARCH_R8A73A4 
	bool "R-Mobile APE6 (R8A73A40)"

	bool "R-Mobile APE6 (R8A73A40)"

	select ARCH_RMOBILE

	select ARCH_RMOBILE

	select ARM_ERRATA_798181 if SMP

	select ARM_ERRATA_798181 if SMP

	select HAVE_ARM_ARCH_TIMER

	select RENESAS_IRQC

	select RENESAS_IRQC





config ARCH_R8A7740

config ARCH_R8A7740

arch/arm/mach-shmobile/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -21,13 +21,13 @@ cpu-y := platsmp.o headsmp.o 
# Shared SoC family objects

# Shared SoC family objects

obj-$(CONFIG_ARCH_RCAR_GEN2)	+= setup-rcar-gen2.o platsmp-apmu.o $(cpu-y)

obj-$(CONFIG_ARCH_RCAR_GEN2)	+= setup-rcar-gen2.o platsmp-apmu.o $(cpu-y)

CFLAGS_setup-rcar-gen2.o	+= -march=armv7-a

CFLAGS_setup-rcar-gen2.o	+= -march=armv7-a

obj-$(CONFIG_ARCH_RCAR_GEN2)	+= headsmp-apmu.o

obj-$(CONFIG_ARCH_R8A7790)	+= regulator-quirk-rcar-gen2.o

obj-$(CONFIG_ARCH_R8A7790)	+= regulator-quirk-rcar-gen2.o

obj-$(CONFIG_ARCH_R8A7791)	+= regulator-quirk-rcar-gen2.o

obj-$(CONFIG_ARCH_R8A7791)	+= regulator-quirk-rcar-gen2.o

obj-$(CONFIG_ARCH_R8A7793)	+= regulator-quirk-rcar-gen2.o

obj-$(CONFIG_ARCH_R8A7793)	+= regulator-quirk-rcar-gen2.o





# SMP objects

# SMP objects

smp-y				:= $(cpu-y)

smp-y				:= $(cpu-y)

smp-$(CONFIG_ARCH_RCAR_GEN2)	+= headsmp-apmu.o

smp-$(CONFIG_ARCH_SH73A0)	+= smp-sh73a0.o headsmp-scu.o platsmp-scu.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_R8A7779)	+= smp-r8a7779.o headsmp-scu.o platsmp-scu.o

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

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

arch/arm/mach-shmobile/headsmp-apmu.S

+0 −2
Original line number Original line Diff line number Diff line
@@ -8,9 +8,7 @@ 
#include <linux/linkage.h>

#include <linux/linkage.h>

#include <asm/assembler.h>

#include <asm/assembler.h>





#ifdef CONFIG_SMP

ENTRY(shmobile_boot_apmu)

ENTRY(shmobile_boot_apmu)

	bl	secure_cntvoff_init

	bl	secure_cntvoff_init

	b	secondary_startup

	b	secondary_startup

ENDPROC(shmobile_boot_apmu)
 
ENDPROC(shmobile_boot_apmu)
 
#endif

arch/arm/mach-shmobile/setup-r8a73a4.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ static const char *const r8a73a4_boards_compat_dt[] __initconst = { 
};

};





DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)")

DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)")

	.init_early	= shmobile_init_delay,

	.init_late	= shmobile_init_late,

	.init_late	= shmobile_init_late,

	.dt_compat	= r8a73a4_boards_compat_dt,

	.dt_compat	= r8a73a4_boards_compat_dt,

MACHINE_END
 
MACHINE_END

arch/arm/mach-shmobile/setup-rcar-gen2.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -59,7 +59,6 @@ static unsigned int __init get_extal_freq(void) 




void __init rcar_gen2_timer_init(void)

void __init rcar_gen2_timer_init(void)

{

{

#ifdef CONFIG_ARM_ARCH_TIMER

	void __iomem *base;

	void __iomem *base;

	u32 freq;

	u32 freq;
@@ -101,7 +100,6 @@ void __init rcar_gen2_timer_init(void) 
	}

	}





	iounmap(base);

	iounmap(base);

#endif /* CONFIG_ARM_ARCH_TIMER */





	of_clk_init(NULL);

	of_clk_init(NULL);

	timer_probe();

	timer_probe();
@@ -187,7 +185,6 @@ static const char * const rcar_gen2_boards_compat_dt[] __initconst = { 
};

};





DT_MACHINE_START(RCAR_GEN2_DT, "Generic R-Car Gen2 (Flattened Device Tree)")

DT_MACHINE_START(RCAR_GEN2_DT, "Generic R-Car Gen2 (Flattened Device Tree)")

	.init_early	= shmobile_init_delay,

	.init_late	= shmobile_init_late,

	.init_late	= shmobile_init_late,

	.init_time	= rcar_gen2_timer_init,

	.init_time	= rcar_gen2_timer_init,

	.reserve	= rcar_gen2_reserve,

	.reserve	= rcar_gen2_reserve,
@@ -202,7 +199,6 @@ static const char * const rz_g1_boards_compat_dt[] __initconst = { 
};

};





DT_MACHINE_START(RZ_G1_DT, "Generic RZ/G1 (Flattened Device Tree)")

DT_MACHINE_START(RZ_G1_DT, "Generic RZ/G1 (Flattened Device Tree)")

	.init_early	= shmobile_init_delay,

	.init_late	= shmobile_init_late,

	.init_late	= shmobile_init_late,

	.init_time	= rcar_gen2_timer_init,

	.init_time	= rcar_gen2_timer_init,

	.reserve	= rcar_gen2_reserve,

	.reserve	= rcar_gen2_reserve,