Unverified Commit 819ed6f0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-drivers-for-v5.19-tag2' of... 

Merge tag 'renesas-drivers-for-v5.19-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/drivers

Renesas driver updates for v5.19 (take two)

  - Initial support for the R-Car V4H and RZ/V2M SoCs,
  - Miscellaneous fixes and improvements.

* tag 'renesas-drivers-for-v5.19-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  soc: renesas: R-Car V3U is R-Car Gen4
  soc: renesas: rzn1: Select PM and PM_GENERIC_DOMAINS configs
  soc: renesas: Add RZ/V2M (R9A09G011) config option
  soc: renesas: rcar-rst: Add support for R-Car V4H
  soc: renesas: Identify R-Car V4H
  soc: renesas: r8a779g0-sysc: Add r8a779g0 support
  dt-bindings: clock: Add r8a779g0 CPG Core Clock Definitions
  dt-bindings: power: Add r8a779g0 SYSC power domain definitions

Link: https://lore.kernel.org/r/cover.1651828613.git.geert+renesas@glider.be


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 15b5b762 27e7657a

drivers/soc/renesas/Kconfig

+20 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ config ARCH_RZG2L 


config ARCH_RZN1

	bool

	select PM

	select PM_GENERIC_DOMAINS

	select ARM_AMBA



if ARM && ARCH_RENESAS
@@ -268,6 +270,13 @@ config ARCH_R8A779A0 
	help

	  This enables support for the Renesas R-Car V3U SoC.



config ARCH_R8A779G0

	bool "ARM64 Platform support for R-Car V4H"

	select ARCH_RCAR_GEN3

	select SYSC_R8A779G0

	help

	  This enables support for the Renesas R-Car V4H SoC.



config ARCH_R8A774C0

	bool "ARM64 Platform support for RZ/G2E"

	select ARCH_RCAR_GEN3
@@ -314,6 +323,13 @@ config ARCH_R9A07G054 
	help

	  This enables support for the Renesas RZ/V2L SoC variants.



config ARCH_R9A09G011

	bool "ARM64 Platform support for RZ/V2M"

	select PM

	select PM_GENERIC_DOMAINS

	help

	  This enables support for the Renesas RZ/V2M SoC.



endif # ARM64



config RST_RCAR
@@ -385,6 +401,10 @@ config SYSC_R8A779A0 
	bool "System Controller support for R-Car V3U" if COMPILE_TEST

	select SYSC_RCAR_GEN4



config SYSC_R8A779G0

	bool "System Controller support for R-Car V4H" if COMPILE_TEST

	select SYSC_RCAR_GEN4



config SYSC_RMOBILE

	bool "System Controller support for R-Mobile" if COMPILE_TEST

drivers/soc/renesas/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ obj-$(CONFIG_SYSC_R8A77990) += r8a77990-sysc.o 
obj-$(CONFIG_SYSC_R8A77995)	+= r8a77995-sysc.o

obj-$(CONFIG_SYSC_R8A779A0)	+= r8a779a0-sysc.o

obj-$(CONFIG_SYSC_R8A779F0)	+= r8a779f0-sysc.o

obj-$(CONFIG_SYSC_R8A779G0)	+= r8a779g0-sysc.o

ifdef CONFIG_SMP

obj-$(CONFIG_ARCH_R9A06G032)	+= r9a06g032-smp.o

endif

drivers/soc/renesas/r8a779g0-sysc.c

0 → 100644
+62 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Renesas R-Car V4H System Controller

 *

 * Copyright (C) 2022 Renesas Electronics Corp.

 */



#include <linux/bits.h>

#include <linux/clk/renesas.h>

#include <linux/delay.h>

#include <linux/err.h>

#include <linux/io.h>

#include <linux/iopoll.h>

#include <linux/kernel.h>

#include <linux/mm.h>

#include <linux/of_address.h>

#include <linux/pm_domain.h>

#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/types.h>



#include <dt-bindings/power/r8a779g0-sysc.h>



#include "rcar-gen4-sysc.h"



static struct rcar_gen4_sysc_area r8a779g0_areas[] __initdata = {

	{ "always-on",	R8A779G0_PD_ALWAYS_ON, -1, PD_ALWAYS_ON },

	{ "a3e0",	R8A779G0_PD_A3E0, R8A779G0_PD_ALWAYS_ON, PD_SCU },

	{ "a2e0d0",	R8A779G0_PD_A2E0D0, R8A779G0_PD_A3E0, PD_SCU },

	{ "a2e0d1",	R8A779G0_PD_A2E0D1, R8A779G0_PD_A3E0, PD_SCU },

	{ "a1e0d0c0",	R8A779G0_PD_A1E0D0C0, R8A779G0_PD_A2E0D0, PD_CPU_NOCR },

	{ "a1e0d0c1",	R8A779G0_PD_A1E0D0C1, R8A779G0_PD_A2E0D0, PD_CPU_NOCR },

	{ "a1e0d1c0",	R8A779G0_PD_A1E0D1C0, R8A779G0_PD_A2E0D1, PD_CPU_NOCR },

	{ "a1e0d1c1",	R8A779G0_PD_A1E0D1C1, R8A779G0_PD_A2E0D1, PD_CPU_NOCR },

	{ "a33dga",	R8A779G0_PD_A33DGA, R8A779G0_PD_ALWAYS_ON },

	{ "a23dgb",	R8A779G0_PD_A23DGB, R8A779G0_PD_A33DGA },

	{ "a3vip0",	R8A779G0_PD_A3VIP0, R8A779G0_PD_ALWAYS_ON },

	{ "a3vip1",	R8A779G0_PD_A3VIP1, R8A779G0_PD_ALWAYS_ON },

	{ "a3vip2",	R8A779G0_PD_A3VIP2, R8A779G0_PD_ALWAYS_ON },

	{ "a3isp0",	R8A779G0_PD_A3ISP0, R8A779G0_PD_ALWAYS_ON },

	{ "a3isp1",	R8A779G0_PD_A3ISP1, R8A779G0_PD_ALWAYS_ON },

	{ "a3ir",	R8A779G0_PD_A3IR, R8A779G0_PD_ALWAYS_ON },

	{ "a2cn0",	R8A779G0_PD_A2CN0, R8A779G0_PD_A3IR },

	{ "a1cnn0",	R8A779G0_PD_A1CNN0, R8A779G0_PD_A2CN0 },

	{ "a1dsp0",	R8A779G0_PD_A1DSP0, R8A779G0_PD_A2CN0 },

	{ "a1dsp1",	R8A779G0_PD_A1DSP1, R8A779G0_PD_A2CN0 },

	{ "a1dsp2",	R8A779G0_PD_A1DSP2, R8A779G0_PD_A2CN0 },

	{ "a1dsp3",	R8A779G0_PD_A1DSP3, R8A779G0_PD_A2CN0 },

	{ "a2imp01",	R8A779G0_PD_A2IMP01, R8A779G0_PD_A3IR },

	{ "a2imp23",	R8A779G0_PD_A2IMP23, R8A779G0_PD_A3IR },

	{ "a2psc",	R8A779G0_PD_A2PSC, R8A779G0_PD_A3IR },

	{ "a2dma",	R8A779G0_PD_A2DMA, R8A779G0_PD_A3IR },

	{ "a2cv0",	R8A779G0_PD_A2CV0, R8A779G0_PD_A3IR },

	{ "a2cv1",	R8A779G0_PD_A2CV1, R8A779G0_PD_A3IR },

	{ "a2cv2",	R8A779G0_PD_A2CV2, R8A779G0_PD_A3IR },

	{ "a2cv3",	R8A779G0_PD_A2CV3, R8A779G0_PD_A3IR },

};



const struct rcar_gen4_sysc_info r8a779g0_sysc_info __initconst = {

	.areas = r8a779g0_areas,

	.num_areas = ARRAY_SIZE(r8a779g0_areas),

};

drivers/soc/renesas/rcar-gen4-sysc.c

+3 −0
Original line number Diff line number Diff line
@@ -281,6 +281,9 @@ static const struct of_device_id rcar_gen4_sysc_matches[] __initconst = { 
#endif

#ifdef CONFIG_SYSC_R8A779F0

	{ .compatible = "renesas,r8a779f0-sysc", .data = &r8a779f0_sysc_info },

#endif

#ifdef CONFIG_SYSC_R8A779G0

	{ .compatible = "renesas,r8a779g0-sysc", .data = &r8a779g0_sysc_info },

#endif

	{ /* sentinel */ }

};

drivers/soc/renesas/rcar-gen4-sysc.h

+1 −0
Original line number Diff line number Diff line
@@ -39,5 +39,6 @@ struct rcar_gen4_sysc_info { 


extern const struct rcar_gen4_sysc_info r8a779a0_sysc_info;

extern const struct rcar_gen4_sysc_info r8a779f0_sysc_info;

extern const struct rcar_gen4_sysc_info r8a779g0_sysc_info;



#endif /* __SOC_RENESAS_RCAR_GEN4_SYSC_H__ */