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>
This commit is contained in:
Родитель
007f84ede6
Коммит
2f4574dd6d
|
@ -353,7 +353,6 @@ config ARCH_EP93XX
|
|||
select ARM_VIC
|
||||
select GENERIC_IRQ_MULTI_HANDLER
|
||||
select AUTO_ZRELADDR
|
||||
select CLKDEV_LOOKUP
|
||||
select CLKSRC_MMIO
|
||||
select CPU_ARM920T
|
||||
select GPIOLIB
|
||||
|
@ -504,7 +503,6 @@ config ARCH_OMAP1
|
|||
bool "TI OMAP1"
|
||||
depends on MMU
|
||||
select ARCH_OMAP
|
||||
select CLKDEV_LOOKUP
|
||||
select CLKSRC_MMIO
|
||||
select GENERIC_IRQ_CHIP
|
||||
select GENERIC_IRQ_MULTI_HANDLER
|
||||
|
|
|
@ -29,7 +29,6 @@ config COLDFIRE
|
|||
select CPU_HAS_NO_MULDIV64
|
||||
select GENERIC_CSUM
|
||||
select GPIOLIB
|
||||
select CLKDEV_LOOKUP
|
||||
select HAVE_LEGACY_CLK
|
||||
|
||||
endchoice
|
||||
|
|
|
@ -332,7 +332,6 @@ config BCM63XX
|
|||
select SWAP_IO_SPACE
|
||||
select GPIOLIB
|
||||
select MIPS_L1_CACHE_SHIFT_4
|
||||
select CLKDEV_LOOKUP
|
||||
select HAVE_LEGACY_CLK
|
||||
help
|
||||
Support for BCM63XX based boards
|
||||
|
@ -446,7 +445,6 @@ config LANTIQ
|
|||
select GPIOLIB
|
||||
select SWAP_IO_SPACE
|
||||
select BOOT_RAW
|
||||
select CLKDEV_LOOKUP
|
||||
select HAVE_LEGACY_CLK
|
||||
select USE_OF
|
||||
select PINCTRL
|
||||
|
@ -643,7 +641,6 @@ config RALINK
|
|||
select SYS_SUPPORTS_MIPS16
|
||||
select SYS_SUPPORTS_ZBOOT
|
||||
select SYS_HAS_EARLY_PRINTK
|
||||
select CLKDEV_LOOKUP
|
||||
select ARCH_HAS_RESET_CONTROLLER
|
||||
select RESET_CONTROLLER
|
||||
|
||||
|
|
|
@ -17,7 +17,6 @@ config PIC32MZDA
|
|||
select SYS_SUPPORTS_LITTLE_ENDIAN
|
||||
select GPIOLIB
|
||||
select COMMON_CLK
|
||||
select CLKDEV_LOOKUP
|
||||
select LIBFDT
|
||||
select USE_OF
|
||||
select PINCTRL
|
||||
|
|
|
@ -14,7 +14,6 @@ config SUPERH
|
|||
select ARCH_HIBERNATION_POSSIBLE if MMU
|
||||
select ARCH_MIGHT_HAVE_PC_PARPORT
|
||||
select ARCH_WANT_IPC_PARSE_VERSION
|
||||
select CLKDEV_LOOKUP
|
||||
select CPU_NO_EFFICIENT_FFS
|
||||
select DMA_DECLARE_COHERENT
|
||||
select GENERIC_ATOMIC64
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -360,7 +360,7 @@ config ARM_GLOBAL_TIMER
|
|||
|
||||
config ARM_TIMER_SP804
|
||||
bool "Support for Dual Timer SP804 module" if COMPILE_TEST
|
||||
depends on GENERIC_SCHED_CLOCK && CLKDEV_LOOKUP
|
||||
depends on GENERIC_SCHED_CLOCK && HAVE_CLK
|
||||
select CLKSRC_MMIO
|
||||
select TIMER_OF if OF
|
||||
|
||||
|
@ -570,12 +570,12 @@ config H8300_TPU
|
|||
|
||||
config CLKSRC_IMX_GPT
|
||||
bool "Clocksource using i.MX GPT" if COMPILE_TEST
|
||||
depends on (ARM || ARM64) && CLKDEV_LOOKUP
|
||||
depends on (ARM || ARM64) && HAVE_CLK
|
||||
select CLKSRC_MMIO
|
||||
|
||||
config CLKSRC_IMX_TPM
|
||||
bool "Clocksource using i.MX TPM" if COMPILE_TEST
|
||||
depends on (ARM || ARM64) && CLKDEV_LOOKUP
|
||||
depends on (ARM || ARM64) && HAVE_CLK
|
||||
select CLKSRC_MMIO
|
||||
select TIMER_OF
|
||||
help
|
||||
|
|
|
@ -329,7 +329,7 @@ config MMC_SDHCI_S3C
|
|||
|
||||
config MMC_SDHCI_PXAV3
|
||||
tristate "Marvell MMP2 SD Host Controller support (PXAV3)"
|
||||
depends on CLKDEV_LOOKUP
|
||||
depends on HAVE_CLK
|
||||
depends on MMC_SDHCI_PLTFM
|
||||
depends on ARCH_BERLIN || ARCH_MMP || ARCH_MVEBU || COMPILE_TEST
|
||||
default CPU_MMP2
|
||||
|
@ -342,7 +342,7 @@ config MMC_SDHCI_PXAV3
|
|||
|
||||
config MMC_SDHCI_PXAV2
|
||||
tristate "Marvell PXA9XX SD Host Controller support (PXAV2)"
|
||||
depends on CLKDEV_LOOKUP
|
||||
depends on HAVE_CLK
|
||||
depends on MMC_SDHCI_PLTFM
|
||||
depends on ARCH_MMP || COMPILE_TEST
|
||||
default CPU_PXA910
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
config STAGING_BOARD
|
||||
bool "Staging Board Support"
|
||||
depends on OF_ADDRESS && OF_IRQ && CLKDEV_LOOKUP
|
||||
depends on OF_ADDRESS && OF_IRQ && HAVE_CLK
|
||||
help
|
||||
Staging board base is to support continuous upstream
|
||||
in-tree development and integration of platform devices.
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
config SND_DESIGNWARE_I2S
|
||||
tristate "Synopsys I2S Device Driver"
|
||||
depends on CLKDEV_LOOKUP
|
||||
depends on HAVE_CLK
|
||||
select SND_SOC_GENERIC_DMAENGINE_PCM
|
||||
help
|
||||
Say Y or M if you want to add support for I2S driver for
|
||||
|
|
|
@ -9,7 +9,7 @@ config SND_SOC_ROCKCHIP
|
|||
|
||||
config SND_SOC_ROCKCHIP_I2S
|
||||
tristate "Rockchip I2S Device Driver"
|
||||
depends on CLKDEV_LOOKUP && SND_SOC_ROCKCHIP
|
||||
depends on HAVE_CLK && SND_SOC_ROCKCHIP
|
||||
select SND_SOC_GENERIC_DMAENGINE_PCM
|
||||
help
|
||||
Say Y or M if you want to add support for I2S driver for
|
||||
|
@ -18,7 +18,7 @@ config SND_SOC_ROCKCHIP_I2S
|
|||
|
||||
config SND_SOC_ROCKCHIP_PDM
|
||||
tristate "Rockchip PDM Controller Driver"
|
||||
depends on CLKDEV_LOOKUP && SND_SOC_ROCKCHIP
|
||||
depends on HAVE_CLK && SND_SOC_ROCKCHIP
|
||||
select SND_SOC_GENERIC_DMAENGINE_PCM
|
||||
select RATIONAL
|
||||
help
|
||||
|
@ -28,7 +28,7 @@ config SND_SOC_ROCKCHIP_PDM
|
|||
|
||||
config SND_SOC_ROCKCHIP_SPDIF
|
||||
tristate "Rockchip SPDIF Device Driver"
|
||||
depends on CLKDEV_LOOKUP && SND_SOC_ROCKCHIP
|
||||
depends on HAVE_CLK && SND_SOC_ROCKCHIP
|
||||
select SND_SOC_GENERIC_DMAENGINE_PCM
|
||||
help
|
||||
Say Y or M if you want to add support for SPDIF driver for
|
||||
|
@ -36,7 +36,7 @@ config SND_SOC_ROCKCHIP_SPDIF
|
|||
|
||||
config SND_SOC_ROCKCHIP_MAX98090
|
||||
tristate "ASoC support for Rockchip boards using a MAX98090 codec"
|
||||
depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && CLKDEV_LOOKUP
|
||||
depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && HAVE_CLK
|
||||
select SND_SOC_ROCKCHIP_I2S
|
||||
select SND_SOC_MAX98090
|
||||
select SND_SOC_TS3A227E
|
||||
|
@ -47,7 +47,7 @@ config SND_SOC_ROCKCHIP_MAX98090
|
|||
|
||||
config SND_SOC_ROCKCHIP_RT5645
|
||||
tristate "ASoC support for Rockchip boards using a RT5645/RT5650 codec"
|
||||
depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && CLKDEV_LOOKUP
|
||||
depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && HAVE_CLK
|
||||
select SND_SOC_ROCKCHIP_I2S
|
||||
select SND_SOC_RT5645
|
||||
help
|
||||
|
@ -56,7 +56,7 @@ config SND_SOC_ROCKCHIP_RT5645
|
|||
|
||||
config SND_SOC_RK3288_HDMI_ANALOG
|
||||
tristate "ASoC support multiple codecs for Rockchip RK3288 boards"
|
||||
depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && CLKDEV_LOOKUP
|
||||
depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && HAVE_CLK
|
||||
select SND_SOC_ROCKCHIP_I2S
|
||||
select SND_SOC_HDMI_CODEC
|
||||
select SND_SOC_ES8328_I2C
|
||||
|
@ -68,7 +68,7 @@ config SND_SOC_RK3288_HDMI_ANALOG
|
|||
|
||||
config SND_SOC_RK3399_GRU_SOUND
|
||||
tristate "ASoC support multiple codecs for Rockchip RK3399 GRU boards"
|
||||
depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && CLKDEV_LOOKUP && SPI
|
||||
depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && HAVE_CLK && SPI
|
||||
select SND_SOC_ROCKCHIP_I2S
|
||||
select SND_SOC_MAX98357A
|
||||
select SND_SOC_RT5514
|
||||
|
|
Загрузка…
Ссылка в новой задаче