summaryrefslogtreecommitdiff
path: root/drivers/clk
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2021-05-31 11:48:49 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-12-14 19:47:46 +0100
commitd08932bb6e38e4a430c75eab6139ee1eb7b995bc (patch)
tree77db19ba583447a7c5006c813ae0b5ede148689b /drivers/clk
parente48e204f364a36351e6ef1859b2e285a05f1ebe3 (diff)
downloadlinux-d08932bb6e38e4a430c75eab6139ee1eb7b995bc.tar.gz
linux-d08932bb6e38e4a430c75eab6139ee1eb7b995bc.tar.bz2
linux-d08932bb6e38e4a430c75eab6139ee1eb7b995bc.zip
clkdev: remove CONFIG_CLKDEV_LOOKUP
[ Upstream commit 2f4574dd6dd19eb3e8ab0415a3ae960d04be3a65 ] This option is now synonymous with CONFIG_HAVE_CLK, so use the latter globally. Any out-of-tree platform ports that still use a private clk_get()/clk_put() implementation should move to CONFIG_COMMON_CLK. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Stable-dep-of: 0309f714a090 ("clocksource/drivers:sp804: Make user selectable") Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/Kconfig6
-rw-r--r--drivers/clk/Makefile3
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index df739665f206..1a4cd684a437 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -6,10 +6,6 @@ config HAVE_CLK
The <linux/clk.h> calls support software clock gating and
thus are a key power management tool on many systems.
-config CLKDEV_LOOKUP
- bool
- select HAVE_CLK
-
config HAVE_CLK_PREPARE
bool
@@ -26,7 +22,7 @@ menuconfig COMMON_CLK
bool "Common Clock Framework"
depends on !HAVE_LEGACY_CLK
select HAVE_CLK_PREPARE
- select CLKDEV_LOOKUP
+ select HAVE_CLK
select SRCU
select RATIONAL
help
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index da8fcf147eb1..707b59233391 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -1,7 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
# common clock types
-obj-$(CONFIG_HAVE_CLK) += clk-devres.o clk-bulk.o
-obj-$(CONFIG_CLKDEV_LOOKUP) += clkdev.o
+obj-$(CONFIG_HAVE_CLK) += clk-devres.o clk-bulk.o clkdev.o
obj-$(CONFIG_COMMON_CLK) += clk.o
obj-$(CONFIG_COMMON_CLK) += clk-divider.o
obj-$(CONFIG_COMMON_CLK) += clk-fixed-factor.o