Commit 43fefaea authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Ulf Hansson
Browse files

pmdomain: renesas: rcar-sysc: Split R-Car M3-W and M3-W+ sub-drivers 



Currently R-Car M3-W and M3-W+ are handled by a single sub-driver,
but using separate Kconfig symbols and separate rcar_sysc_info
structures, and fixup code to handle the remaining differences.

Prepare for handling more differences by splitting them in two separate
sub-drivers.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/a416e2bae7227c08d7e7d158366ab021f4d6cc18.1713348705.git.geert+renesas@glider.be


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent ce5e8392

drivers/pmdomain/renesas/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 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_R8A77960)	+= r8a7796-sysc.o

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

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

obj-$(CONFIG_SYSC_R8A77961)	+= r8a77961-sysc.o

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

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

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

drivers/pmdomain/renesas/r8a7796-sysc.c→drivers/pmdomain/renesas/r8a77960-sysc.c

+4 −24
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Renesas R-Car M3-W/W+ System Controller

 * Renesas R-Car M3-W System Controller

 *

 * Copyright (C) 2016 Glider bvba

 * Copyright (C) 2018-2019 Renesas Electronics Corporation
@@ -13,7 +13,7 @@ 


#include "rcar-sysc.h"



static struct rcar_sysc_area r8a7796_areas[] __initdata = {

static const struct rcar_sysc_area r8a77960_areas[] __initconst = {

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

	{ "ca57-scu",	0x1c0, 0, R8A7796_PD_CA57_SCU,	R8A7796_PD_ALWAYS_ON,

	  PD_SCU },
@@ -41,27 +41,7 @@ static struct rcar_sysc_area r8a7796_areas[] __initdata = { 
};





#ifdef CONFIG_SYSC_R8A77960

const struct rcar_sysc_info r8a77960_sysc_info __initconst = {

	.areas = r8a7796_areas,

	.num_areas = ARRAY_SIZE(r8a7796_areas),

	.areas = r8a77960_areas,

	.num_areas = ARRAY_SIZE(r8a77960_areas),

};
 
#endif /* CONFIG_SYSC_R8A77960 */



#ifdef CONFIG_SYSC_R8A77961

static int __init r8a77961_sysc_init(void)

{

	rcar_sysc_nullify(r8a7796_areas, ARRAY_SIZE(r8a7796_areas),

			  R8A7796_PD_A2VC0);



	return 0;

}



const struct rcar_sysc_info r8a77961_sysc_info __initconst = {

	.init = r8a77961_sysc_init,

	.areas = r8a7796_areas,

	.num_areas = ARRAY_SIZE(r8a7796_areas),

	.extmask_offs = 0x2f8,

	.extmask_val = BIT(0),

};

#endif /* CONFIG_SYSC_R8A77961 */

drivers/pmdomain/renesas/r8a77961-sysc.c

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

/*

 * Renesas R-Car M3-W+ System Controller

 *

 * Copyright (C) 2016 Glider bvba

 * Copyright (C) 2018-2019 Renesas Electronics Corporation

 */



#include <linux/bits.h>

#include <linux/kernel.h>



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



#include "rcar-sysc.h"



static const struct rcar_sysc_area r8a77961_areas[] __initconst = {

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

	{ "ca57-scu",	0x1c0, 0, R8A7796_PD_CA57_SCU,	R8A7796_PD_ALWAYS_ON,

	  PD_SCU },

	{ "ca57-cpu0",	 0x80, 0, R8A7796_PD_CA57_CPU0,	R8A7796_PD_CA57_SCU,

	  PD_CPU_NOCR },

	{ "ca57-cpu1",	 0x80, 1, R8A7796_PD_CA57_CPU1,	R8A7796_PD_CA57_SCU,

	  PD_CPU_NOCR },

	{ "ca53-scu",	0x140, 0, R8A7796_PD_CA53_SCU,	R8A7796_PD_ALWAYS_ON,

	  PD_SCU },

	{ "ca53-cpu0",	0x200, 0, R8A7796_PD_CA53_CPU0,	R8A7796_PD_CA53_SCU,

	  PD_CPU_NOCR },

	{ "ca53-cpu1",	0x200, 1, R8A7796_PD_CA53_CPU1,	R8A7796_PD_CA53_SCU,

	  PD_CPU_NOCR },

	{ "ca53-cpu2",	0x200, 2, R8A7796_PD_CA53_CPU2,	R8A7796_PD_CA53_SCU,

	  PD_CPU_NOCR },

	{ "ca53-cpu3",	0x200, 3, R8A7796_PD_CA53_CPU3,	R8A7796_PD_CA53_SCU,

	  PD_CPU_NOCR },

	{ "cr7",	0x240, 0, R8A7796_PD_CR7,	R8A7796_PD_ALWAYS_ON },

	{ "a3vc",	0x380, 0, R8A7796_PD_A3VC,	R8A7796_PD_ALWAYS_ON },

	{ "a2vc1",	0x3c0, 1, R8A7796_PD_A2VC1,	R8A7796_PD_A3VC },

	{ "3dg-a",	0x100, 0, R8A7796_PD_3DG_A,	R8A7796_PD_ALWAYS_ON },

	{ "3dg-b",	0x100, 1, R8A7796_PD_3DG_B,	R8A7796_PD_3DG_A },

	{ "a3ir",	0x180, 0, R8A7796_PD_A3IR,	R8A7796_PD_ALWAYS_ON },

};



const struct rcar_sysc_info r8a77961_sysc_info __initconst = {

	.areas = r8a77961_areas,

	.num_areas = ARRAY_SIZE(r8a77961_areas),

	.extmask_offs = 0x2f8,

	.extmask_val = BIT(0),

};