Commit 92d1ebae authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

clk: renesas: Rename CLK_R8A7796 to CLK_R8A77960 



Rename CONFIG_CLK_R8A7796 for R-Car M3-W (R8A77960) to
CONFIG_CLK_R8A77960, to avoid confusion with R-Car M3-W+ (R8A77961),
which will use CONFIG_CLK_R8A77961.

Extend the dependency of CONFIG_CLK_R8A77960 from CONFIG_ARCH_R8A7796 to
CONFIG_ARCH_R8A77960, to relax dependencies for a future rename of the
SoC configuration symbol.

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/20191023122941.12342-4-geert+renesas@glider.be
parent e751a25b

drivers/clk/renesas/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ config CLK_RENESAS 
	select CLK_R8A7792 if ARCH_R8A7792

	select CLK_R8A7794 if ARCH_R8A7794

	select CLK_R8A7795 if ARCH_R8A7795

	select CLK_R8A7796 if ARCH_R8A7796

	select CLK_R8A77960 if ARCH_R8A77960 || ARCH_R8A7796

	select CLK_R8A77965 if ARCH_R8A77965

	select CLK_R8A77970 if ARCH_R8A77970

	select CLK_R8A77980 if ARCH_R8A77980
@@ -109,7 +109,7 @@ config CLK_R8A7795 
	bool "R-Car H3 clock support" if COMPILE_TEST

	select CLK_RCAR_GEN3_CPG



config CLK_R8A7796

config CLK_R8A77960

	bool "R-Car M3-W clock support" if COMPILE_TEST

	select CLK_RCAR_GEN3_CPG

drivers/clk/renesas/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ obj-$(CONFIG_CLK_R8A7791) += r8a7791-cpg-mssr.o 
obj-$(CONFIG_CLK_R8A7792)		+= r8a7792-cpg-mssr.o

obj-$(CONFIG_CLK_R8A7794)		+= r8a7794-cpg-mssr.o

obj-$(CONFIG_CLK_R8A7795)		+= r8a7795-cpg-mssr.o

obj-$(CONFIG_CLK_R8A7796)		+= r8a7796-cpg-mssr.o

obj-$(CONFIG_CLK_R8A77960)		+= r8a7796-cpg-mssr.o

obj-$(CONFIG_CLK_R8A77965)		+= r8a77965-cpg-mssr.o

obj-$(CONFIG_CLK_R8A77970)		+= r8a77970-cpg-mssr.o

obj-$(CONFIG_CLK_R8A77980)		+= r8a77980-cpg-mssr.o

drivers/clk/renesas/renesas-cpg-mssr.c

+1 −1
Original line number Diff line number Diff line
@@ -749,7 +749,7 @@ static const struct of_device_id cpg_mssr_match[] = { 
		.data = &r8a7795_cpg_mssr_info,

	},

#endif

#ifdef CONFIG_CLK_R8A7796

#ifdef CONFIG_CLK_R8A77960

	{

		.compatible = "renesas,r8a7796-cpg-mssr",

		.data = &r8a7796_cpg_mssr_info,

CRA Git | Maintained and supported by SUSTech CRA and CCSE