clk: versatile: Rename ICST to CLK_ICST

For consistency, prefix the ICST config option with CLK as all other
clock source drivers have.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Stephen Boyd <sboyd@kernel.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20210901180833.4558932d@endymion
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
index 7a9808b01763e60149405460b88e962f15ffc5ae..63a0ca82659a1109949b36c9392d97a358a067a1 100644 (file)
--- a/arch/arm/mach-integrator/Kconfig
+++ b/arch/arm/mach-integrator/Kconfig
@@ -6,7 +6,7 @@ menuconfig ARCH_INTEGRATOR
        select CMA
        select DMA_CMA
        select HAVE_TCM
-       select ICST
+       select CLK_ICST
        select MFD_SYSCON
        select PLAT_VERSATILE
        select POWER_RESET

diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig
index 5c6031b144c87aca7e5de5b2bf8250042865cf7a..a4c36024b5e82b4960b51ab50d700d2c8078e934 100644 (file)
--- a/arch/arm/mach-realview/Kconfig
+++ b/arch/arm/mach-realview/Kconfig
@@ -11,7 +11,7 @@ menuconfig ARCH_REALVIEW
        select HAVE_ARM_TWD if SMP
        select HAVE_PATA_PLATFORM
        select HAVE_TCM
-       select ICST
+       select CLK_ICST
        select MACH_REALVIEW_EB if ARCH_MULTI_V5
        select MFD_SYSCON
        select PLAT_VERSATILE

diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig
index d88e7725bf99341368582d8e74feb91b2815b51f..f78a1d358031d3f17d4c75c7dc6838079fb9e0c0 100644 (file)
--- a/arch/arm/mach-versatile/Kconfig
+++ b/arch/arm/mach-versatile/Kconfig
@@ -7,7 +7,7 @@ config ARCH_VERSATILE
        select ARM_VIC
        select CLKSRC_VERSATILE
        select CPU_ARM926T
-       select ICST
+       select CLK_ICST
        select MFD_SYSCON
        select PLAT_VERSATILE
        select POWER_RESET

diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
index 065e129916631bae5e94da329330aabe51ee2623..2e6aff5a0f1745ffbd2a7008046dabcd3c34a430 100644 (file)
--- a/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@ -11,7 +11,7 @@ menuconfig ARCH_VEXPRESS
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
        select HAVE_PATA_PLATFORM
-       select ICST
+       select CLK_ICST
        select NO_IOPORT_MAP
        select PLAT_VERSATILE
        select POWER_RESET

diff --git a/drivers/clk/versatile/Kconfig b/drivers/clk/versatile/Kconfig
index 481de5657d85457b96373434907aa9a1777e6215..29b82037e16780f2c6fab8e71f86356fed883fd0 100644 (file)
--- a/drivers/clk/versatile/Kconfig
+++ b/drivers/clk/versatile/Kconfig
@@ -3,7 +3,7 @@
 menu "Clock driver for ARM Reference designs"
        depends on HAS_IOMEM
 
-config ICST
+config CLK_ICST
        bool "Clock driver for ARM Reference designs ICST"
        select REGMAP_MMIO
        help

diff --git a/drivers/clk/versatile/Makefile b/drivers/clk/versatile/Makefile
index 4ff563e6e3a0be8b4c299fe7688002c60e8a8d2a..e7d05308e4f0b869fe2f41cadfc27723439dd4e1 100644 (file)
--- a/drivers/clk/versatile/Makefile
+++ b/drivers/clk/versatile/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 # Makefile for Versatile-specific clocks
-obj-$(CONFIG_ICST)             += icst.o clk-icst.o clk-versatile.o
+obj-$(CONFIG_CLK_ICST)         += icst.o clk-icst.o clk-versatile.o
 obj-$(CONFIG_INTEGRATOR_IMPD1) += clk-impd1.o
 obj-$(CONFIG_CLK_SP810)                += clk-sp810.o
 obj-$(CONFIG_CLK_VEXPRESS_OSC) += clk-vexpress-osc.o