Commit acb09eca authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-drivers-for-v5.8-tag1' of... 

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

Renesas driver updates for v5.8

  - Add System Controller (SYSC) and Reset (RST) support for the new
    RZ/G1H (R8A7742) SoC.

* tag 'renesas-drivers-for-v5.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  soc: renesas: rcar-rst: Add support for RZ/G1H
  soc: renesas: rcar-sysc: Add R8A7742 support
  clk: renesas: Add r8a7742 CPG Core Clock Definitions
  dt-bindings: power: rcar-sysc: Add r8a7742 power domain index macros

Link: https://lore.kernel.org/r/20200430084849.1457-5-geert+renesas@glider.be


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a7afae50 2f718327

drivers/soc/renesas/Kconfig

+4 −0
Original line number Original line Diff line number Diff line
@@ -261,6 +261,10 @@ config ARCH_R8A77995 
endif # ARM64

endif # ARM64





# SoC

# SoC

config SYSC_R8A7742

	bool "RZ/G1H System Controller support" if COMPILE_TEST

	select SYSC_RCAR



config SYSC_R8A7743

config SYSC_R8A7743

	bool "RZ/G1M System Controller support" if COMPILE_TEST

	bool "RZ/G1M System Controller support" if COMPILE_TEST

	select SYSC_RCAR

	select SYSC_RCAR

drivers/soc/renesas/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -3,6 +3,7 @@ 
obj-$(CONFIG_SOC_RENESAS)	+= renesas-soc.o

obj-$(CONFIG_SOC_RENESAS)	+= renesas-soc.o





# SoC

# SoC

obj-$(CONFIG_SYSC_R8A7742)	+= r8a7742-sysc.o

obj-$(CONFIG_SYSC_R8A7743)	+= r8a7743-sysc.o

obj-$(CONFIG_SYSC_R8A7743)	+= r8a7743-sysc.o

obj-$(CONFIG_SYSC_R8A7745)	+= r8a7745-sysc.o

obj-$(CONFIG_SYSC_R8A7745)	+= r8a7745-sysc.o

obj-$(CONFIG_SYSC_R8A77470)	+= r8a77470-sysc.o

obj-$(CONFIG_SYSC_R8A77470)	+= r8a77470-sysc.o

drivers/soc/renesas/r8a7742-sysc.c

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

/*

 * Renesas RZ/G1H System Controller

 *

 * Copyright (C) 2020 Renesas Electronics Corp.

 */



#include <linux/kernel.h>



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



#include "rcar-sysc.h"



static const struct rcar_sysc_area r8a7742_areas[] __initconst = {

	{ "always-on",	    0, 0, R8A7742_PD_ALWAYS_ON,	-1, PD_ALWAYS_ON },

	{ "ca15-scu",	0x180, 0, R8A7742_PD_CA15_SCU,	R8A7742_PD_ALWAYS_ON,

	  PD_SCU },

	{ "ca15-cpu0",	 0x40, 0, R8A7742_PD_CA15_CPU0,	R8A7742_PD_CA15_SCU,

	  PD_CPU_NOCR },

	{ "ca15-cpu1",	 0x40, 1, R8A7742_PD_CA15_CPU1,	R8A7742_PD_CA15_SCU,

	  PD_CPU_NOCR },

	{ "ca15-cpu2",	 0x40, 2, R8A7742_PD_CA15_CPU2,	R8A7742_PD_CA15_SCU,

	  PD_CPU_NOCR },

	{ "ca15-cpu3",	 0x40, 3, R8A7742_PD_CA15_CPU3,	R8A7742_PD_CA15_SCU,

	  PD_CPU_NOCR },

	{ "ca7-scu",	0x100, 0, R8A7742_PD_CA7_SCU,	R8A7742_PD_ALWAYS_ON,

	  PD_SCU },

	{ "ca7-cpu0",	0x1c0, 0, R8A7742_PD_CA7_CPU0,	R8A7742_PD_CA7_SCU,

	  PD_CPU_NOCR },

	{ "ca7-cpu1",	0x1c0, 1, R8A7742_PD_CA7_CPU1,	R8A7742_PD_CA7_SCU,

	  PD_CPU_NOCR },

	{ "ca7-cpu2",	0x1c0, 2, R8A7742_PD_CA7_CPU2,	R8A7742_PD_CA7_SCU,

	  PD_CPU_NOCR },

	{ "ca7-cpu3",	0x1c0, 3, R8A7742_PD_CA7_CPU3,	R8A7742_PD_CA7_SCU,

	  PD_CPU_NOCR },

	{ "rgx",	 0xc0, 0, R8A7742_PD_RGX,	R8A7742_PD_ALWAYS_ON },

};



const struct rcar_sysc_info r8a7742_sysc_info __initconst = {

	.areas = r8a7742_areas,

	.num_areas = ARRAY_SIZE(r8a7742_areas),

};

drivers/soc/renesas/rcar-rst.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -39,6 +39,7 @@ static const struct rst_config rcar_rst_gen3 __initconst = { 




static const struct of_device_id rcar_rst_matches[] __initconst = {

static const struct of_device_id rcar_rst_matches[] __initconst = {

	/* RZ/G1 is handled like R-Car Gen2 */

	/* RZ/G1 is handled like R-Car Gen2 */

	{ .compatible = "renesas,r8a7742-rst", .data = &rcar_rst_gen2 },

	{ .compatible = "renesas,r8a7743-rst", .data = &rcar_rst_gen2 },

	{ .compatible = "renesas,r8a7743-rst", .data = &rcar_rst_gen2 },

	{ .compatible = "renesas,r8a7744-rst", .data = &rcar_rst_gen2 },

	{ .compatible = "renesas,r8a7744-rst", .data = &rcar_rst_gen2 },

	{ .compatible = "renesas,r8a7745-rst", .data = &rcar_rst_gen2 },

	{ .compatible = "renesas,r8a7745-rst", .data = &rcar_rst_gen2 },

drivers/soc/renesas/rcar-sysc.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -273,6 +273,9 @@ static int __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd) 
}

}





static const struct of_device_id rcar_sysc_matches[] __initconst = {

static const struct of_device_id rcar_sysc_matches[] __initconst = {

#ifdef CONFIG_SYSC_R8A7742

	{ .compatible = "renesas,r8a7742-sysc", .data = &r8a7742_sysc_info },

#endif

#ifdef CONFIG_SYSC_R8A7743

#ifdef CONFIG_SYSC_R8A7743

	{ .compatible = "renesas,r8a7743-sysc", .data = &r8a7743_sysc_info },

	{ .compatible = "renesas,r8a7743-sysc", .data = &r8a7743_sysc_info },

	/* RZ/G1N is identical to RZ/G2M w.r.t. power domains. */

	/* RZ/G1N is identical to RZ/G2M w.r.t. power domains. */