From: Jean Delvare Date: Wed, 1 Sep 2021 16:08:33 +0000 (+0200) Subject: clk: versatile: Rename ICST to CLK_ICST X-Git-Tag: microblaze-v5.18~492^2~20^3~1 X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=commitdiff_plain;h=323fd5955f844d1b6acf1a1af488da460f657ff2 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 Cc: Linus Walleij Cc: Michael Turquette Cc: Stephen Boyd Reviewed-by: Linus Walleij Link: https://lore.kernel.org/r/20210901180833.4558932d@endymion Signed-off-by: Stephen Boyd --- diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig index 7a9808b01763..63a0ca82659a 100644 --- 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 5c6031b144c8..a4c36024b5e8 100644 --- 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 d88e7725bf99..f78a1d358031 100644 --- 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 065e12991663..2e6aff5a0f17 100644 --- 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 481de5657d85..29b82037e167 100644 --- 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 4ff563e6e3a0..e7d05308e4f0 100644 --- 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