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 <marek.vasut+renesas@mailbox.org>
Signed-off-by: Hai Pham <hai.pham.ud@renesas.com>
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>

diff --git a/arch/arm/mach-rmobile/Kconfig.64 b/arch/arm/mach-rmobile/Kconfig.64
index 3e73acce6649084a8e899dbb98f26a3b40b13b9c..b84aae0c83aef1c5796d509c4e60b6d7e1727d56 100644 (file)
--- 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 f4d6ef9f93806df67a9d8a9b65333095c5146e99..939aa8d7e6a1d3e9997a047d6fa3da00ec37f620 100644 (file)
--- 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 36a5ca65f4b756bd3e3862e0c875943f8df781f0..8c0354b78722535b1ea9f2bcb222d6fc9ab29f03 100644 (file)
--- 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