Revert "clkdev: remove CONFIG_CLKDEV_LOOKUP"

This reverts commit d08932bb6e38 which is
commit 2f4574dd6dd19eb3e8ab0415a3ae960d04be3a65 upstream.

It is reported to cause build errors in m68k, so revert it.

Link: https://lore.kernel.org/r/68b0559e-47e8-4756-b3de-67d59242756e@roeck-us.net
Reported-by: Guenter Roeck <linux@roeck-us.net>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Ross Burton <ross.burton@arm.com>
Cc: Sudeep Holla <sudeep.holla@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 27db1bddfb6c5a656e56a5280c2739a0807b0fa8..335308aff6ce0a200982044316a3aeaf9ae03dff 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -366,6 +366,7 @@ config ARCH_EP93XX
        imply ARM_PATCH_PHYS_VIRT
        select ARM_VIC
        select AUTO_ZRELADDR
+       select CLKDEV_LOOKUP
        select CLKSRC_MMIO
        select CPU_ARM920T
        select GENERIC_CLOCKEVENTS
@@ -522,6 +523,7 @@ config ARCH_OMAP1
        bool "TI OMAP1"
        depends on MMU
        select ARCH_OMAP
+       select CLKDEV_LOOKUP
        select CLKSRC_MMIO
        select GENERIC_CLOCKEVENTS
        select GENERIC_IRQ_CHIP

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 7aeb3a7d4926d5c75d0841252d58ea4c4a7df828..57839f63074f75ef093da100d9ef64f3fe31346c 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -327,6 +327,7 @@ 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
@@ -441,6 +442,7 @@ config LANTIQ
        select GPIOLIB
        select SWAP_IO_SPACE
        select BOOT_RAW
+       select CLKDEV_LOOKUP
        select HAVE_LEGACY_CLK
        select USE_OF
        select PINCTRL
@@ -625,6 +627,7 @@ 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
 

diff --git a/arch/mips/pic32/Kconfig b/arch/mips/pic32/Kconfig
index bb6ab1f3e80dcf35a1a681f7098330dbf1d5c3be..7acbb50c1dcd5c1352560084f3ce3886d8dd13ec 100644 (file)
--- a/arch/mips/pic32/Kconfig
+++ b/arch/mips/pic32/Kconfig
@@ -17,6 +17,7 @@ config PIC32MZDA
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select GPIOLIB
        select COMMON_CLK
+       select CLKDEV_LOOKUP
        select LIBFDT
        select USE_OF
        select PINCTRL

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 51f9ca675c416bcae28dbac5bfd45a986f237985..44dffe7ce50addb44a0d391104766bc6040d271e 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -13,6 +13,7 @@ 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

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 1a4cd684a43710be8142f5bd2330531c2bcb6b96..df739665f2063cf73f93adfe9d9b53117b471e59 100644 (file)
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -6,6 +6,10 @@ 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
 
@@ -22,7 +26,7 @@ menuconfig COMMON_CLK
        bool "Common Clock Framework"
        depends on !HAVE_LEGACY_CLK
        select HAVE_CLK_PREPARE
-       select HAVE_CLK
+       select CLKDEV_LOOKUP
        select SRCU
        select RATIONAL
        help

diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index 707b592333918877e6627015729e1de65b21ba57..da8fcf147eb132ce2a15f5f748912775d893ac5a 100644 (file)
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 # common clock types
-obj-$(CONFIG_HAVE_CLK)         += clk-devres.o clk-bulk.o clkdev.o
+obj-$(CONFIG_HAVE_CLK)         += clk-devres.o clk-bulk.o
+obj-$(CONFIG_CLKDEV_LOOKUP)    += clkdev.o
 obj-$(CONFIG_COMMON_CLK)       += clk.o
 obj-$(CONFIG_COMMON_CLK)       += clk-divider.o
 obj-$(CONFIG_COMMON_CLK)       += clk-fixed-factor.o

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index be4bb4008d6e64cb05e76a39529bd538a1def1ec..a0c6e88bebe084bfc20fcdcd61a1e72992775abd 100644 (file)
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -399,7 +399,7 @@ config ARM_GLOBAL_TIMER
 
 config ARM_TIMER_SP804
        bool "Support for Dual Timer SP804 module" if COMPILE_TEST
-       depends on GENERIC_SCHED_CLOCK && HAVE_CLK
+       depends on GENERIC_SCHED_CLOCK && CLKDEV_LOOKUP
        select CLKSRC_MMIO
        select TIMER_OF if OF
 
@@ -617,12 +617,12 @@ config H8300_TPU
 
 config CLKSRC_IMX_GPT
        bool "Clocksource using i.MX GPT" if COMPILE_TEST
-       depends on (ARM || ARM64) && HAVE_CLK
+       depends on (ARM || ARM64) && CLKDEV_LOOKUP
        select CLKSRC_MMIO
 
 config CLKSRC_IMX_TPM
        bool "Clocksource using i.MX TPM" if COMPILE_TEST
-       depends on (ARM || ARM64) && HAVE_CLK
+       depends on (ARM || ARM64) && CLKDEV_LOOKUP
        select CLKSRC_MMIO
        select TIMER_OF
        help

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 9a6a94d5bdbdb6b0cb2f5479b2b13a4d0bbaa00d..8fe4a0fd6ef181ccd46285e6830d68b029a4cfc9 100644 (file)
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -326,7 +326,7 @@ config MMC_SDHCI_SIRF
 
 config MMC_SDHCI_PXAV3
        tristate "Marvell MMP2 SD Host Controller support (PXAV3)"
-       depends on HAVE_CLK
+       depends on CLKDEV_LOOKUP
        depends on MMC_SDHCI_PLTFM
        depends on ARCH_BERLIN || ARCH_MMP || ARCH_MVEBU || COMPILE_TEST
        default CPU_MMP2
@@ -339,7 +339,7 @@ config MMC_SDHCI_PXAV3
 
 config MMC_SDHCI_PXAV2
        tristate "Marvell PXA9XX SD Host Controller support (PXAV2)"
-       depends on HAVE_CLK
+       depends on CLKDEV_LOOKUP
        depends on MMC_SDHCI_PLTFM
        depends on ARCH_MMP || COMPILE_TEST
        default CPU_PXA910

diff --git a/drivers/staging/board/Kconfig b/drivers/staging/board/Kconfig
index ff5e417dd85281ce5956b3fde7c3b4c93f0285a4..d0c6e42eadda40fe12fea13059e545a5794d89dd 100644 (file)
--- a/drivers/staging/board/Kconfig
+++ b/drivers/staging/board/Kconfig
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 config STAGING_BOARD
        bool "Staging Board Support"
-       depends on OF_ADDRESS && OF_IRQ && HAVE_CLK
+       depends on OF_ADDRESS && OF_IRQ && CLKDEV_LOOKUP
        help
          Select to enable per-board staging support code.
 

diff --git a/sound/soc/dwc/Kconfig b/sound/soc/dwc/Kconfig
index 71a58f7ac13a9ee8e48112b1564fac9856f17f8a..0cd1a15f40aaed26143e5cf08c740eee1aed6efc 100644 (file)
--- a/sound/soc/dwc/Kconfig
+++ b/sound/soc/dwc/Kconfig
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config SND_DESIGNWARE_I2S
        tristate "Synopsys I2S Device Driver"
-       depends on HAVE_CLK
+       depends on CLKDEV_LOOKUP
        select SND_SOC_GENERIC_DMAENGINE_PCM
        help
         Say Y or M if you want to add support for I2S driver for

diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig
index 053097b73e28d33b85b790c84a4c437850c385dd..d610b553ea3b28e0285dfcd44a2befe8617aa118 100644 (file)
--- a/sound/soc/rockchip/Kconfig
+++ b/sound/soc/rockchip/Kconfig
@@ -9,7 +9,7 @@ config SND_SOC_ROCKCHIP
 
 config SND_SOC_ROCKCHIP_I2S
        tristate "Rockchip I2S Device Driver"
-       depends on HAVE_CLK && SND_SOC_ROCKCHIP
+       depends on CLKDEV_LOOKUP && 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 HAVE_CLK && SND_SOC_ROCKCHIP
+       depends on CLKDEV_LOOKUP && 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 HAVE_CLK && SND_SOC_ROCKCHIP
+       depends on CLKDEV_LOOKUP && 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 && HAVE_CLK
+       depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && CLKDEV_LOOKUP
        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 && HAVE_CLK
+       depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && CLKDEV_LOOKUP
        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 && HAVE_CLK
+       depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && CLKDEV_LOOKUP
        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 && HAVE_CLK && SPI
+       depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && CLKDEV_LOOKUP && SPI
        select SND_SOC_ROCKCHIP_I2S
        select SND_SOC_MAX98357A
        select SND_SOC_RT5514