Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Link: https://lore.kernel.org/r/20191023122941.12342-4-geert+renesas@glider.be

+4 -4
+2 -2
drivers/clk/renesas/Kconfig
··· 21 21 select CLK_R8A7792 if ARCH_R8A7792 22 22 select CLK_R8A7794 if ARCH_R8A7794 23 23 select CLK_R8A7795 if ARCH_R8A7795 24 - select CLK_R8A7796 if ARCH_R8A7796 24 + select CLK_R8A77960 if ARCH_R8A77960 || ARCH_R8A7796 25 25 select CLK_R8A77965 if ARCH_R8A77965 26 26 select CLK_R8A77970 if ARCH_R8A77970 27 27 select CLK_R8A77980 if ARCH_R8A77980 ··· 109 109 bool "R-Car H3 clock support" if COMPILE_TEST 110 110 select CLK_RCAR_GEN3_CPG 111 111 112 - config CLK_R8A7796 112 + config CLK_R8A77960 113 113 bool "R-Car M3-W clock support" if COMPILE_TEST 114 114 select CLK_RCAR_GEN3_CPG 115 115
+1 -1
drivers/clk/renesas/Makefile
··· 18 18 obj-$(CONFIG_CLK_R8A7792) += r8a7792-cpg-mssr.o 19 19 obj-$(CONFIG_CLK_R8A7794) += r8a7794-cpg-mssr.o 20 20 obj-$(CONFIG_CLK_R8A7795) += r8a7795-cpg-mssr.o 21 - obj-$(CONFIG_CLK_R8A7796) += r8a7796-cpg-mssr.o 21 + obj-$(CONFIG_CLK_R8A77960) += r8a7796-cpg-mssr.o 22 22 obj-$(CONFIG_CLK_R8A77965) += r8a77965-cpg-mssr.o 23 23 obj-$(CONFIG_CLK_R8A77970) += r8a77970-cpg-mssr.o 24 24 obj-$(CONFIG_CLK_R8A77980) += r8a77980-cpg-mssr.o
+1 -1
drivers/clk/renesas/renesas-cpg-mssr.c
··· 749 749 .data = &r8a7795_cpg_mssr_info, 750 750 }, 751 751 #endif 752 - #ifdef CONFIG_CLK_R8A7796 752 + #ifdef CONFIG_CLK_R8A77960 753 753 { 754 754 .compatible = "renesas,r8a7796-cpg-mssr", 755 755 .data = &r8a7796_cpg_mssr_info,