clk/driver/hisi: Consolidate the Kconfig for the CLOCK_STUB

The current defconfig is inconsistent as it selects the mailbox and
the clock for the hi6220 and the hi3660 without having their Kconfigs
making sure the dependencies are correct. It ends up when selecting
different versions for the kernel (for example when git bisecting)
those options disappear and they don't get back, leading to unexpected
behaviors. In our case, the cpufreq driver does no longer work because
the clock fails to initialize due to the clock stub and the mailbox
missing.

In order to have the dependencies correctly set when defaulting, let's
do the same as commit 3a49afb84ca074e ("clk: enable hi655x common clk
automatically") where we select automatically the driver when the
parent driver is selected. With sensible defaults in place, we can leave
other choices for EXPERT.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Leo Yan <leo.yan@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/hisilicon/Kconfig b/drivers/clk/hisilicon/Kconfig
index 1bd4355..becdb1d 100644 (file)
--- a/drivers/clk/hisilicon/Kconfig
+++ b/drivers/clk/hisilicon/Kconfig
@@ -44,14 +44,17 @@ config RESET_HISI
          Build reset controller driver for HiSilicon device chipsets.
 
 config STUB_CLK_HI6220
-       bool "Hi6220 Stub Clock Driver"
-       depends on COMMON_CLK_HI6220 && MAILBOX
-       default ARCH_HISI
+       bool "Hi6220 Stub Clock Driver" if EXPERT
+       depends on (COMMON_CLK_HI6220 || COMPILE_TEST)
+       depends on MAILBOX
+       default COMMON_CLK_HI6220
        help
          Build the Hisilicon Hi6220 stub clock driver.
 
 config STUB_CLK_HI3660
-       bool "Hi3660 Stub Clock Driver"
-       depends on COMMON_CLK_HI3660 && MAILBOX
+       bool "Hi3660 Stub Clock Driver" if EXPERT
+       depends on (COMMON_CLK_HI3660 || COMPILE_TEST)
+       depends on MAILBOX
+       default COMMON_CLK_HI3660
        help
          Build the Hisilicon Hi3660 stub clock driver.