niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

clk: versatile: Rework kconfig structure

Browse source 
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>
This commit is contained in:
Rob Herring 2020-04-29 15:58:13 -05:00
parent 039599c92d
commit 81134fb541
7 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/mach-integrator/Kconfig
View file

@ -3,7 +3,6 @@ menuconfig ARCH_INTEGRATOR
bool "ARM Ltd. Integrator family" bool "ARM Ltd. Integrator family"
depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V6 depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V6
select ARM_AMBA select ARM_AMBA
select COMMON_CLK_VERSATILE
select HAVE_TCM select HAVE_TCM
select ICST select ICST
select MFD_SYSCON select MFD_SYSCON

1
arch/arm/mach-realview/Kconfig
View file

@ -6,7 +6,6 @@ menuconfig ARCH_REALVIEW
select ARM_GIC select ARM_GIC
select ARM_TIMER_SP804 select ARM_TIMER_SP804
select CLK_SP810 select CLK_SP810
select COMMON_CLK_VERSATILE
select GPIO_PL061 if GPIOLIB select GPIO_PL061 if GPIOLIB
select HAVE_ARM_SCU if SMP select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP

1
arch/arm/mach-versatile/Kconfig
View file

@ -6,7 +6,6 @@ config ARCH_VERSATILE
select ARM_TIMER_SP804 select ARM_TIMER_SP804
select ARM_VIC select ARM_VIC
select CLKSRC_VERSATILE select CLKSRC_VERSATILE
select COMMON_CLK_VERSATILE
select CPU_ARM926T select CPU_ARM926T
select ICST select ICST
select MFD_SYSCON select MFD_SYSCON

1
arch/arm/mach-vexpress/Kconfig
View file

@ -7,7 +7,6 @@ menuconfig ARCH_VEXPRESS
select ARM_GIC select ARM_GIC
select ARM_GLOBAL_TIMER select ARM_GLOBAL_TIMER
select ARM_TIMER_SP804 select ARM_TIMER_SP804
select COMMON_CLK_VERSATILE
select GPIOLIB select GPIOLIB
select HAVE_ARM_SCU if SMP select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP

1
arch/arm64/Kconfig.platforms
View file

@ -274,7 +274,6 @@ config ARCH_UNIPHIER
config ARCH_VEXPRESS config ARCH_VEXPRESS
bool "ARMv8 software model (Versatile Express)" bool "ARMv8 software model (Versatile Express)"
select COMMON_CLK_VERSATILE
select GPIOLIB select GPIOLIB
select PM select PM
select PM_GENERIC_DOMAINS select PM_GENERIC_DOMAINS

2
drivers/clk/Makefile
View file

@ -114,7 +114,7 @@ obj-$(CONFIG_ARCH_TEGRA) += tegra/
obj-y += ti/ obj-y += ti/
obj-$(CONFIG_CLK_UNIPHIER) += uniphier/ obj-$(CONFIG_CLK_UNIPHIER) += uniphier/
obj-$(CONFIG_ARCH_U8500) += ux500/ obj-$(CONFIG_ARCH_U8500) += ux500/
obj-$(CONFIG_COMMON_CLK_VERSATILE) += versatile/ obj-y += versatile/
ifeq ($(CONFIG_COMMON_CLK), y) ifeq ($(CONFIG_COMMON_CLK), y)
obj-$(CONFIG_X86) += x86/ obj-$(CONFIG_X86) += x86/
endif endif

22
drivers/clk/versatile/Kconfig
View file

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