Commit f79edb17 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

soc: renesas: Rename SYSC_R8A7796 to SYSC_R8A77960 



Rename CONFIG_SYSC_R8A7796 for R-Car M3-W (R8A77960) to
CONFIG_SYSC_R8A77960, to avoid confusion with R-Car M3-W+ (R8A77961),
which will use CONFIG_SYSC_R8A77961.

Rename r8a7796_sysc_info and r8a7796_sysc_init for consistency.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Link: https://lore.kernel.org/r/20191023123342.13100-2-geert+renesas@glider.be
parent 16208387

drivers/soc/renesas/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ config ARCH_R8A7795 
config ARCH_R8A7796

	bool "Renesas R-Car M3-W SoC Platform"

	select ARCH_RCAR_GEN3

	select SYSC_R8A7796

	select SYSC_R8A77960

	help

	  This enables support for the Renesas R-Car M3-W SoC.
@@ -292,7 +292,7 @@ config SYSC_R8A7795 
	bool "R-Car H3 System Controller support" if COMPILE_TEST

	select SYSC_RCAR



config SYSC_R8A7796

config SYSC_R8A77960

	bool "R-Car M3-W System Controller support" if COMPILE_TEST

	select SYSC_RCAR

drivers/soc/renesas/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ obj-$(CONFIG_SYSC_R8A7791) += r8a7791-sysc.o 
obj-$(CONFIG_SYSC_R8A7792)	+= r8a7792-sysc.o

obj-$(CONFIG_SYSC_R8A7794)	+= r8a7794-sysc.o

obj-$(CONFIG_SYSC_R8A7795)	+= r8a7795-sysc.o

obj-$(CONFIG_SYSC_R8A7796)	+= r8a7796-sysc.o

obj-$(CONFIG_SYSC_R8A77960)	+= r8a7796-sysc.o

obj-$(CONFIG_SYSC_R8A77965)	+= r8a77965-sysc.o

obj-$(CONFIG_SYSC_R8A77970)	+= r8a77970-sysc.o

obj-$(CONFIG_SYSC_R8A77980)	+= r8a77980-sysc.o

drivers/soc/renesas/r8a7796-sysc.c

+4 −4
Original line number Diff line number Diff line
@@ -47,16 +47,16 @@ static const struct soc_device_attribute r8a7796es1[] __initconst = { 
	{ /* sentinel */ }

};



static int __init r8a7796_sysc_init(void)

static int __init r8a77960_sysc_init(void)

{

	if (soc_device_match(r8a7796es1))

		r8a7796_sysc_info.extmask_val = 0;

		r8a77960_sysc_info.extmask_val = 0;



	return 0;

}



struct rcar_sysc_info r8a7796_sysc_info __initdata = {

	.init = r8a7796_sysc_init,

struct rcar_sysc_info r8a77960_sysc_info __initdata = {

	.init = r8a77960_sysc_init,

	.areas = r8a7796_areas,

	.num_areas = ARRAY_SIZE(r8a7796_areas),

	.extmask_offs = 0x2f8,

drivers/soc/renesas/rcar-sysc.c

+2 −2
Original line number Diff line number Diff line
@@ -313,8 +313,8 @@ static const struct of_device_id rcar_sysc_matches[] __initconst = { 
#ifdef CONFIG_SYSC_R8A7795

	{ .compatible = "renesas,r8a7795-sysc", .data = &r8a7795_sysc_info },

#endif

#ifdef CONFIG_SYSC_R8A7796

	{ .compatible = "renesas,r8a7796-sysc", .data = &r8a7796_sysc_info },

#ifdef CONFIG_SYSC_R8A77960

	{ .compatible = "renesas,r8a7796-sysc", .data = &r8a77960_sysc_info },

#endif

#ifdef CONFIG_SYSC_R8A77965

	{ .compatible = "renesas,r8a77965-sysc", .data = &r8a77965_sysc_info },

drivers/soc/renesas/rcar-sysc.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ extern const struct rcar_sysc_info r8a7791_sysc_info; 
extern const struct rcar_sysc_info r8a7792_sysc_info;

extern const struct rcar_sysc_info r8a7794_sysc_info;

extern struct rcar_sysc_info r8a7795_sysc_info;

extern struct rcar_sysc_info r8a7796_sysc_info;

extern struct rcar_sysc_info r8a77960_sysc_info;

extern const struct rcar_sysc_info r8a77965_sysc_info;

extern const struct rcar_sysc_info r8a77970_sysc_info;

extern const struct rcar_sysc_info r8a77980_sysc_info;

CRA Git | Maintained and supported by SUSTech CRA and CCSE