Skip to content

Commit 2f4574d

Browse files
arndbarndb
committed
clkdev: remove CONFIG_CLKDEV_LOOKUP
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>
1 parent 007f84e commit 2f4574d

12 files changed

Lines changed: 16 additions & 29 deletions

File tree

‎arch/arm/Kconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,6 @@ config ARCH_EP93XX
353353
select ARM_VIC
354354
select GENERIC_IRQ_MULTI_HANDLER
355355
select AUTO_ZRELADDR
356-
select CLKDEV_LOOKUP
357356
select CLKSRC_MMIO
358357
select CPU_ARM920T
359358
select GPIOLIB
@@ -504,7 +503,6 @@ config ARCH_OMAP1
504503
bool "TI OMAP1"
505504
depends on MMU
506505
select ARCH_OMAP
507-
select CLKDEV_LOOKUP
508506
select CLKSRC_MMIO
509507
select GENERIC_IRQ_CHIP
510508
select GENERIC_IRQ_MULTI_HANDLER

‎arch/m68k/Kconfig.cpu‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ config COLDFIRE
2929
select CPU_HAS_NO_MULDIV64
3030
select GENERIC_CSUM
3131
select GPIOLIB
32-
select CLKDEV_LOOKUP
3332
select HAVE_LEGACY_CLK
3433

3534
endchoice

‎arch/mips/Kconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,6 @@ config BCM63XX
332332
select SWAP_IO_SPACE
333333
select GPIOLIB
334334
select MIPS_L1_CACHE_SHIFT_4
335-
select CLKDEV_LOOKUP
336335
select HAVE_LEGACY_CLK
337336
help
338337
Support for BCM63XX based boards
@@ -446,7 +445,6 @@ config LANTIQ
446445
select GPIOLIB
447446
select SWAP_IO_SPACE
448447
select BOOT_RAW
449-
select CLKDEV_LOOKUP
450448
select HAVE_LEGACY_CLK
451449
select USE_OF
452450
select PINCTRL
@@ -643,7 +641,6 @@ config RALINK
643641
select SYS_SUPPORTS_MIPS16
644642
select SYS_SUPPORTS_ZBOOT
645643
select SYS_HAS_EARLY_PRINTK
646-
select CLKDEV_LOOKUP
647644
select ARCH_HAS_RESET_CONTROLLER
648645
select RESET_CONTROLLER
649646

‎arch/mips/pic32/Kconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ config PIC32MZDA
1717
select SYS_SUPPORTS_LITTLE_ENDIAN
1818
select GPIOLIB
1919
select COMMON_CLK
20-
select CLKDEV_LOOKUP
2120
select LIBFDT
2221
select USE_OF
2322
select PINCTRL

‎arch/sh/Kconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ config SUPERH
1414
select ARCH_HIBERNATION_POSSIBLE if MMU
1515
select ARCH_MIGHT_HAVE_PC_PARPORT
1616
select ARCH_WANT_IPC_PARSE_VERSION
17-
select CLKDEV_LOOKUP
1817
select CPU_NO_EFFICIENT_FFS
1918
select DMA_DECLARE_COHERENT
2019
select GENERIC_ATOMIC64

‎drivers/clk/Kconfig‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ config HAVE_CLK
66
The <linux/clk.h> calls support software clock gating and
77
thus are a key power management tool on many systems.
88

9-
config CLKDEV_LOOKUP
10-
bool
11-
select HAVE_CLK
12-
139
config HAVE_CLK_PREPARE
1410
bool
1511

@@ -26,7 +22,7 @@ menuconfig COMMON_CLK
2622
bool "Common Clock Framework"
2723
depends on !HAVE_LEGACY_CLK
2824
select HAVE_CLK_PREPARE
29-
select CLKDEV_LOOKUP
25+
select HAVE_CLK
3026
select SRCU
3127
select RATIONAL
3228
help

‎drivers/clk/Makefile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0
22
# common clock types
3-
obj-$(CONFIG_HAVE_CLK) += clk-devres.o clk-bulk.o
4-
obj-$(CONFIG_CLKDEV_LOOKUP) += clkdev.o
3+
obj-$(CONFIG_HAVE_CLK) += clk-devres.o clk-bulk.o clkdev.o
54
obj-$(CONFIG_COMMON_CLK) += clk.o
65
obj-$(CONFIG_COMMON_CLK) += clk-divider.o
76
obj-$(CONFIG_COMMON_CLK) += clk-fixed-factor.o

‎drivers/clocksource/Kconfig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ config ARM_GLOBAL_TIMER
360360

361361
config ARM_TIMER_SP804
362362
bool "Support for Dual Timer SP804 module" if COMPILE_TEST
363-
depends on GENERIC_SCHED_CLOCK && CLKDEV_LOOKUP
363+
depends on GENERIC_SCHED_CLOCK && HAVE_CLK
364364
select CLKSRC_MMIO
365365
select TIMER_OF if OF
366366

@@ -570,12 +570,12 @@ config H8300_TPU
570570

571571
config CLKSRC_IMX_GPT
572572
bool "Clocksource using i.MX GPT" if COMPILE_TEST
573-
depends on (ARM || ARM64) && CLKDEV_LOOKUP
573+
depends on (ARM || ARM64) && HAVE_CLK
574574
select CLKSRC_MMIO
575575

576576
config CLKSRC_IMX_TPM
577577
bool "Clocksource using i.MX TPM" if COMPILE_TEST
578-
depends on (ARM || ARM64) && CLKDEV_LOOKUP
578+
depends on (ARM || ARM64) && HAVE_CLK
579579
select CLKSRC_MMIO
580580
select TIMER_OF
581581
help

‎drivers/mmc/host/Kconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ config MMC_SDHCI_S3C
329329

330330
config MMC_SDHCI_PXAV3
331331
tristate "Marvell MMP2 SD Host Controller support (PXAV3)"
332-
depends on CLKDEV_LOOKUP
332+
depends on HAVE_CLK
333333
depends on MMC_SDHCI_PLTFM
334334
depends on ARCH_BERLIN || ARCH_MMP || ARCH_MVEBU || COMPILE_TEST
335335
default CPU_MMP2
@@ -342,7 +342,7 @@ config MMC_SDHCI_PXAV3
342342

343343
config MMC_SDHCI_PXAV2
344344
tristate "Marvell PXA9XX SD Host Controller support (PXAV2)"
345-
depends on CLKDEV_LOOKUP
345+
depends on HAVE_CLK
346346
depends on MMC_SDHCI_PLTFM
347347
depends on ARCH_MMP || COMPILE_TEST
348348
default CPU_PXA910

‎drivers/staging/board/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
config STAGING_BOARD
33
bool "Staging Board Support"
4-
depends on OF_ADDRESS && OF_IRQ && CLKDEV_LOOKUP
4+
depends on OF_ADDRESS && OF_IRQ && HAVE_CLK
55
help
66
Staging board base is to support continuous upstream
77
in-tree development and integration of platform devices.

0 commit comments

Comments
 (0)