Commit 03890f47 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-arm-soc-for-v5.3' of... 

Merge tag 'renesas-arm-soc-for-v5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into arm/soc

Renesas ARM Based SoC Updates for v5.3

* Auto-enable RZ/A1 IRQC on RZ/A1H and RZ/A2M
* Don't init CNTVOFF/counter if PSCI is available

* tag 'renesas-arm-soc-for-v5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  soc: renesas: Enable RZ/A1 IRQC on RZ/A1H and RZ/A2M
  ARM: mach-shmobile: Don't init CNTVOFF/counter if PSCI is available

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9060463b 02af9f90

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

+17 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/of.h>

#include <linux/of_fdt.h>

#include <linux/of_platform.h>

#include <linux/psci.h>

#include <asm/mach/arch.h>

#include <asm/secure_cntvoff.h>

#include "common.h"
@@ -60,9 +61,24 @@ static unsigned int __init get_extal_freq(void) 


void __init rcar_gen2_timer_init(void)

{

	bool need_update = true;

	void __iomem *base;

	u32 freq;



	/*

	 * If PSCI is available then most likely we are running on PSCI-enabled

	 * U-Boot which, we assume, has already taken care of resetting CNTVOFF

	 * and updating counter module before switching to non-secure mode

	 * and we don't need to.

	 */

#ifdef CONFIG_ARM_PSCI_FW

	if (psci_ops.cpu_on)

		need_update = false;

#endif



	if (need_update == false)

		goto skip_update;



	secure_cntvoff_init();



	if (of_machine_is_compatible("renesas,r8a7745") ||
@@ -102,6 +118,7 @@ void __init rcar_gen2_timer_init(void) 


	iounmap(base);



skip_update:

	of_clk_init(NULL);

	timer_probe();

}

drivers/soc/renesas/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -57,14 +57,16 @@ config ARCH_R7S72100 
	bool "RZ/A1H (R7S72100)"

	select PM

	select PM_GENERIC_DOMAINS

	select SYS_SUPPORTS_SH_MTU2

	select RENESAS_OSTM

	select RENESAS_RZA1_IRQC

	select SYS_SUPPORTS_SH_MTU2



config ARCH_R7S9210

	bool "RZ/A2 (R7S9210)"

	select PM

	select PM_GENERIC_DOMAINS

	select RENESAS_OSTM

	select RENESAS_RZA1_IRQC



config ARCH_R8A73A4

	bool "R-Mobile APE6 (R8A73A40)"

CRA Git | Maintained and supported by SUSTech CRA and CCSE