From 9d16ed44f04c71d8f536678c6a995d756562b5e6 Mon Sep 17 00:00:00 2001 From: Hai Pham Date: Thu, 26 Jan 2023 21:02:01 +0100 Subject: [PATCH] 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. Based on Linux commit 92d1ebae9abf ("clk: renesas: Rename CLK_R8A7796 to CLK_R8A77960") Reviewed-by: Marek Vasut Signed-off-by: Hai Pham Signed-off-by: Marek Vasut --- arch/arm/mach-rmobile/Kconfig.64 | 2 +- drivers/clk/renesas/Kconfig | 6 +++--- drivers/clk/renesas/Makefile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-rmobile/Kconfig.64 b/arch/arm/mach-rmobile/Kconfig.64 index 3e73acce66..b84aae0c83 100644 --- a/arch/arm/mach-rmobile/Kconfig.64 +++ b/arch/arm/mach-rmobile/Kconfig.64 @@ -35,7 +35,7 @@ config R8A7795 config R8A7796 bool "Renesas SoC R8A7796" select GICV2 - imply CLK_R8A7796 + imply CLK_R8A77960 imply PINCTRL_PFC_R8A77960 imply PINCTRL_PFC_R8A77961 diff --git a/drivers/clk/renesas/Kconfig b/drivers/clk/renesas/Kconfig index f4d6ef9f93..939aa8d7e6 100644 --- a/drivers/clk/renesas/Kconfig +++ b/drivers/clk/renesas/Kconfig @@ -79,11 +79,11 @@ config CLK_R8A7795 help Enable this to support the clocks on Renesas R8A7795 SoC. -config CLK_R8A7796 - bool "Renesas R8A7796 clock driver" +config CLK_R8A77960 + bool "Renesas R8A77960 clock driver" depends on CLK_RCAR_GEN3 help - Enable this to support the clocks on Renesas R8A7796 SoC. + Enable this to support the clocks on Renesas R8A77960 SoC. config CLK_R8A77965 bool "Renesas R8A77965 clock driver" diff --git a/drivers/clk/renesas/Makefile b/drivers/clk/renesas/Makefile index 36a5ca65f4..8c0354b787 100644 --- a/drivers/clk/renesas/Makefile +++ b/drivers/clk/renesas/Makefile @@ -11,7 +11,7 @@ obj-$(CONFIG_CLK_R8A7793) += r8a7791-cpg-mssr.o obj-$(CONFIG_CLK_R8A7794) += r8a7794-cpg-mssr.o obj-$(CONFIG_CLK_RCAR_GEN3) += clk-rcar-gen3.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 -- 2.39.5