The Renesas Advanced Power Management Unit for AP-System Core (APMU) is not limited to R-Car Gen2 and RZ/G1 SoCs, but also present on R-Mobile APE6. Hence introduce a separate Kconfig symbol to control the build of APMU-related files, currently selected by ARCH_RCAR_GEN2. Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx> --- arch/arm/mach-shmobile/Makefile | 5 +++-- drivers/soc/renesas/Kconfig | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index f7bf17b7abaef7a9..bce16aa04c5c1bb2 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile @@ -20,7 +20,8 @@ obj-$(CONFIG_ARCH_R7S9210) += setup-r7s9210.o cpu-y := platsmp.o headsmp.o # 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 +obj-$(CONFIG_RENESAS_APMU) += platsmp-apmu.o $(cpu-y) CFLAGS_setup-rcar-gen2.o += -march=armv7-a obj-$(CONFIG_ARCH_R8A7790) += regulator-quirk-rcar-gen2.o obj-$(CONFIG_ARCH_R8A7791) += regulator-quirk-rcar-gen2.o @@ -28,7 +29,7 @@ obj-$(CONFIG_ARCH_R8A7793) += regulator-quirk-rcar-gen2.o # SMP objects smp-y := $(cpu-y) -smp-$(CONFIG_ARCH_RCAR_GEN2) += headsmp-apmu.o +smp-$(CONFIG_RENESAS_APMU) += headsmp-apmu.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_EMEV2) += smp-emev2.o headsmp-scu.o platsmp-scu.o diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig index b70bbc38efc6771d..f92b6cdff8d6ca25 100644 --- a/drivers/soc/renesas/Kconfig +++ b/drivers/soc/renesas/Kconfig @@ -6,6 +6,9 @@ menuconfig SOC_RENESAS if SOC_RENESAS +config RENESAS_APMU + bool + config ARCH_RCAR_GEN1 bool select PM @@ -19,6 +22,7 @@ config ARCH_RCAR_GEN2 select HAVE_ARM_ARCH_TIMER select PM select PM_GENERIC_DOMAINS + select RENESAS_APMU select RENESAS_IRQC select RST_RCAR select SYS_SUPPORTS_SH_CMT -- 2.25.1
