clk: versatile: Rework kconfig structure

CONFIG_COMMON_CLK_VERSATILE doesn't really do anything other than hiding
Arm Ltd reference platform clock drivers. It is both selected by the
platforms that need it and has a 'depends on' for those platforms. Let's
drop the selects and convert CONFIG_COMMON_CLK_VERSATILE into a
menuconfig entry. With this make CONFIG_ICST visible.

Move the 'select REGMAP_MMIO' to the drivers that require it (SP810 did
not).

This also has the side effect of enabling CONFIG_ICST for COMPILE_TEST
as it was not visible before.

Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>
Reviewed-by: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Rob Herring <robh@kernel.org>

diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
index 982eabc361635e609d6ca6e4ee346018f3954b99..d59ba15a6b69901b094aaca6f875169b47b334df 100644 (file)
--- a/arch/arm/mach-integrator/Kconfig
+++ b/arch/arm/mach-integrator/Kconfig
@@ -3,7 +3,6 @@ menuconfig ARCH_INTEGRATOR
        bool "ARM Ltd. Integrator family"
        depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V6
        select ARM_AMBA
-       select COMMON_CLK_VERSATILE
        select HAVE_TCM
        select ICST
        select MFD_SYSCON

diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig
index 44ebbf9ec67364db338948a2ad6772654619b74d..002404fafc14919927bbe60ebff4985fe17a586c 100644 (file)
--- a/arch/arm/mach-realview/Kconfig
+++ b/arch/arm/mach-realview/Kconfig
@@ -6,7 +6,6 @@ menuconfig ARCH_REALVIEW
        select ARM_GIC
        select ARM_TIMER_SP804
        select CLK_SP810
-       select COMMON_CLK_VERSATILE
        select GPIO_PL061 if GPIOLIB
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP

diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig
index f5c275434d6cb51958a36432221287c09d677184..d88e7725bf99341368582d8e74feb91b2815b51f 100644 (file)
--- a/arch/arm/mach-versatile/Kconfig
+++ b/arch/arm/mach-versatile/Kconfig
@@ -6,7 +6,6 @@ config ARCH_VERSATILE
        select ARM_TIMER_SP804
        select ARM_VIC
        select CLKSRC_VERSATILE
-       select COMMON_CLK_VERSATILE
        select CPU_ARM926T
        select ICST
        select MFD_SYSCON

diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
index 18951cd20d9d88f1619e14f4368620aa067011be..2d1fdec4c2303e113438accfe90267f49180e279 100644 (file)
--- a/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@ -7,7 +7,6 @@ menuconfig ARCH_VEXPRESS
        select ARM_GIC
        select ARM_GLOBAL_TIMER
        select ARM_TIMER_SP804
-       select COMMON_CLK_VERSATILE
        select GPIOLIB
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 5c38dc56b8083b671e55cca687dfbcbc5f253cb8..25cbb556d86309eb65e967ab56008318b2922813 100644 (file)
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -274,7 +274,6 @@ config ARCH_UNIPHIER
 
 config ARCH_VEXPRESS
        bool "ARMv8 software model (Versatile Express)"
-       select COMMON_CLK_VERSATILE
        select GPIOLIB
        select PM
        select PM_GENERIC_DOMAINS

diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index f4169cc2fd3182e2a2df0c0d49c5b3e71c2a45ae..fb30c16e1596d1105b73e85f1c085acacf262fc9 100644 (file)
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -114,7 +114,7 @@ obj-$(CONFIG_ARCH_TEGRA)            += tegra/
 obj-y                                  += ti/
 obj-$(CONFIG_CLK_UNIPHIER)             += uniphier/
 obj-$(CONFIG_ARCH_U8500)               += ux500/
-obj-$(CONFIG_COMMON_CLK_VERSATILE)     += versatile/
+obj-y                                  += versatile/
 ifeq ($(CONFIG_COMMON_CLK), y)
 obj-$(CONFIG_X86)                      += x86/
 endif

diff --git a/drivers/clk/versatile/Kconfig b/drivers/clk/versatile/Kconfig
index c2618f1477a2284d545f8e4ba1b2d731ba5baf29..df0d50bb846c55a8d976d8686079fbc855fb2492 100644 (file)
--- a/drivers/clk/versatile/Kconfig
+++ b/drivers/clk/versatile/Kconfig
@@ -1,22 +1,22 @@
 # SPDX-License-Identifier: GPL-2.0-only
-config ICST
-       bool
 
-config COMMON_CLK_VERSATILE
-       bool "Clock driver for ARM Reference designs"
-       depends on ARCH_INTEGRATOR || ARCH_REALVIEW || \
-               ARCH_VERSATILE || ARCH_VEXPRESS || ARM64 || \
-               COMPILE_TEST
+menuconfig COMMON_CLK_VERSATILE
+       bool "Clock driver for ARM Reference designs" if COMPILE_TEST
+       default y if ARCH_INTEGRATOR || ARCH_REALVIEW || \
+               ARCH_VERSATILE || ARCH_VEXPRESS
+
+if COMMON_CLK_VERSATILE
+
+config ICST
+       bool "Clock driver for ARM Reference designs ICST"
        select REGMAP_MMIO
        ---help---
          Supports clocking on ARM Reference designs:
          - Integrator/AP and Integrator/CP
          - RealView PB1176, EB, PB11MP and PBX
-         - Versatile Express
 
 config CLK_SP810
        bool "Clock driver for ARM SP810 System Controller"
-       depends on COMMON_CLK_VERSATILE
        default y if ARCH_VEXPRESS
        ---help---
          Supports clock muxing (REFCLK/TIMCLK to TIMERCLKEN0-3) capabilities
@@ -24,10 +24,12 @@ config CLK_SP810
 
 config CLK_VEXPRESS_OSC
        bool "Clock driver for Versatile Express OSC clock generators"
-       depends on COMMON_CLK_VERSATILE
        depends on VEXPRESS_CONFIG
+       select REGMAP_MMIO
        default y if ARCH_VEXPRESS
        ---help---
          Simple regmap-based driver driving clock generators on Versatile
          Express platforms hidden behind its configuration infrastructure,
          commonly known as OSCs.
+
+endif