From: Rob Herring <robh@kernel.org>
To: Linus Walleij <linus.walleij@linaro.org>,
Liviu Dudau <liviu.dudau@arm.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Sudeep Holla <sudeep.holla@arm.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
linux-pm@vger.kernel.org, Stephen Boyd <sboyd@kernel.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Kevin Brodsky <Kevin.Brodsky@arm.com>,
Sebastian Reichel <sre@kernel.org>, Will Deacon <will@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Lee Jones <lee.jones@linaro.org>,
linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/17] clk: versatile: Kill CONFIG_COMMON_CLK_VERSATILE
Date: Sun, 19 Apr 2020 12:07:58 -0500 [thread overview]
Message-ID: <20200419170810.5738-6-robh@kernel.org> (raw)
In-Reply-To: <20200419170810.5738-1-robh@kernel.org>
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. It
selects REGMAP_MMIO, but really CONFIG_ICST should do that. Also,
CONFIG_ICST can't be enabled for COMPILE_TEST unless something else
selected it.
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Sudeep Holla <sudeep.holla@arm.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Stephen Boyd <sboyd@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Rob Herring <robh@kernel.org>
---
arch/arm/mach-integrator/Kconfig | 1 -
arch/arm/mach-realview/Kconfig | 1 -
arch/arm/mach-versatile/Kconfig | 1 -
arch/arm/mach-vexpress/Kconfig | 1 -
arch/arm64/Kconfig.platforms | 1 -
drivers/clk/Makefile | 2 +-
drivers/clk/versatile/Kconfig | 13 ++-----------
7 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
index 982eabc36163..d59ba15a6b69 100644
--- 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 e7633c0aaae7..83ec9eeb3e5f 100644
--- 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 f5c275434d6c..d88e7725bf99 100644
--- 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 18951cd20d9d..2d1fdec4c230 100644
--- 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 5c38dc56b808..25cbb556d863 100644
--- 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 f4169cc2fd31..fb30c16e1596 100644
--- 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 c2618f1477a2..3465fb291998 100644
--- a/drivers/clk/versatile/Kconfig
+++ b/drivers/clk/versatile/Kconfig
@@ -1,22 +1,14 @@
# 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
+ bool "Clock driver for ARM Reference designs ICST" if COMPILE_TEST
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,8 +16,7 @@ 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
+ depends on VEXPRESS_CONFIG || COMPILE_TEST
default y if ARCH_VEXPRESS
---help---
Simple regmap-based driver driving clock generators on Versatile
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-04-19 17:10 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-19 17:07 [PATCH 00/17] Modularizing Versatile Express Rob Herring
2020-04-19 17:07 ` [PATCH 01/17] ARM: vexpress: Move vexpress_flags_set() into arch code Rob Herring
2020-04-20 15:17 ` Arnd Bergmann
2020-04-22 10:15 ` Liviu Dudau
2020-04-22 19:04 ` Sudeep Holla
2020-04-19 17:07 ` [PATCH 02/17] arm64: vexpress: Don't select CONFIG_POWER_RESET_VEXPRESS Rob Herring
2020-04-20 15:18 ` Arnd Bergmann
2020-04-22 10:16 ` Liviu Dudau
2020-04-22 19:08 ` Sudeep Holla
2020-04-19 17:07 ` [PATCH 03/17] arm64: vexpress: Don't select CONFIG_VEXPRESS_CONFIG Rob Herring
2020-04-20 15:18 ` Arnd Bergmann
2020-04-22 19:09 ` Sudeep Holla
2020-04-19 17:07 ` [PATCH 04/17] power/reset: vexpress: Support building as a module Rob Herring
2020-04-20 15:23 ` Arnd Bergmann
2020-04-20 17:23 ` Rob Herring
2020-04-28 19:31 ` Sebastian Reichel
2020-04-22 19:11 ` Sudeep Holla
2020-04-19 17:07 ` Rob Herring [this message]
2020-04-20 6:44 ` [PATCH 05/17] clk: versatile: Kill CONFIG_COMMON_CLK_VERSATILE Linus Walleij
2020-04-22 9:47 ` Stephen Boyd
2020-04-22 22:34 ` Rob Herring
2020-04-22 19:17 ` Sudeep Holla
2020-04-19 17:07 ` [PATCH 06/17] clk: versatile: Only enable SP810 on 32-bit by default Rob Herring
2020-04-20 15:26 ` Arnd Bergmann
2020-04-20 17:48 ` Rob Herring
2020-04-20 20:07 ` Arnd Bergmann
2020-04-22 9:48 ` Stephen Boyd
2020-04-22 10:20 ` Liviu Dudau
2020-04-22 20:52 ` Sudeep Holla
2020-04-23 15:38 ` Rob Herring
2020-04-19 17:08 ` [PATCH 07/17] clk: vexpress-osc: Use the devres clock API variants Rob Herring
2020-04-20 15:26 ` Arnd Bergmann
2020-04-22 9:51 ` Stephen Boyd
2020-04-22 10:21 ` Liviu Dudau
2020-04-22 20:56 ` Sudeep Holla
2020-04-19 17:08 ` [PATCH 08/17] clk: vexpress-osc: Support building as a module Rob Herring
2020-04-20 15:27 ` Arnd Bergmann
2020-04-20 17:18 ` Rob Herring
2020-04-22 11:01 ` Liviu Dudau
2020-04-22 21:08 ` Sudeep Holla
2020-04-23 13:45 ` Sudeep Holla
2020-04-23 15:53 ` Rob Herring
2020-04-23 16:58 ` Sudeep Holla
2020-04-19 17:08 ` [PATCH 09/17] mfd: vexpress-sysreg: Drop selecting CONFIG_CLKSRC_MMIO Rob Herring
2020-04-20 15:29 ` Arnd Bergmann
2020-04-22 11:02 ` Liviu Dudau
2020-04-19 17:08 ` [PATCH 10/17] mfd: vexpress-sysreg: Drop unused syscon child devices Rob Herring
2020-04-20 15:30 ` Arnd Bergmann
2020-04-22 11:18 ` Liviu Dudau
2020-04-19 17:08 ` [PATCH 11/17] mfd: vexpress-sysreg: Use devres API variants Rob Herring
2020-04-20 15:31 ` Arnd Bergmann
2020-04-22 11:18 ` Liviu Dudau
2020-04-19 17:08 ` [PATCH 12/17] mfd: vexpress-sysreg: Support building as a module Rob Herring
2020-04-20 15:32 ` Arnd Bergmann
2020-04-20 17:05 ` Rob Herring
2020-04-19 17:08 ` [PATCH 13/17] bus: vexpress-config: Merge vexpress-syscfg into vexpress-config Rob Herring
2020-04-20 11:45 ` Greg Kroah-Hartman
2020-04-22 11:22 ` Liviu Dudau
2020-04-19 17:08 ` [PATCH 14/17] bus: vexpress-config: simplify config bus probing Rob Herring
2020-04-22 11:58 ` Liviu Dudau
2020-04-19 17:08 ` [PATCH 15/17] vexpress: Move site master init to vexpress-config bus Rob Herring
2020-04-22 9:51 ` Stephen Boyd
2020-04-22 12:03 ` Liviu Dudau
2020-04-23 0:54 ` Rob Herring
2020-04-19 17:08 ` [PATCH 16/17] bus: vexpress-config: Support building as module Rob Herring
2020-04-22 12:04 ` Liviu Dudau
2020-04-19 17:08 ` [PATCH 17/17] ARM: vexpress: Don't select VEXPRESS_CONFIG Rob Herring
2020-04-22 12:05 ` Liviu Dudau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200419170810.5738-6-robh@kernel.org \
--to=robh@kernel.org \
--cc=Kevin.Brodsky@arm.com \
--cc=arnd@arndb.de \
--cc=catalin.marinas@arm.com \
--cc=gregkh@linuxfoundation.org \
--cc=lee.jones@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=liviu.dudau@arm.com \
--cc=lorenzo.pieralisi@arm.com \
--cc=sboyd@kernel.org \
--cc=sre@kernel.org \
--cc=sudeep.holla@arm.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).