aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHai Pham <hai.pham.ud@renesas.com>2023-01-26 21:02:01 +0100
committerMarek Vasut <marek.vasut+renesas@gmail.com>2023-02-02 01:49:20 +0100
commit9d16ed44f04c71d8f536678c6a995d756562b5e6 (patch)
treef45138163c34ace41dcc3245a58677c90b7babb5
parent83fc4729a591399c955bc804d403c49a37f2165d (diff)
downloadu-boot-9d16ed44f04c71d8f536678c6a995d756562b5e6.zip
u-boot-9d16ed44f04c71d8f536678c6a995d756562b5e6.tar.gz
u-boot-9d16ed44f04c71d8f536678c6a995d756562b5e6.tar.bz2
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>
-rw-r--r--arch/arm/mach-rmobile/Kconfig.642
-rw-r--r--drivers/clk/renesas/Kconfig6
-rw-r--r--drivers/clk/renesas/Makefile2
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-rmobile/Kconfig.64 b/arch/arm/mach-rmobile/Kconfig.64
index 3e73acc..b84aae0 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 f4d6ef9..939aa8d 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 36a5ca6..8c0354b 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