mailbox/drivers/hisi: Consolidate the Kconfig for the MAILBOX

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: Jassi Brar <jaswinder.singh@linaro.org>

1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/mailbox/Kconfig b/drivers/mailbox/Kconfig
index fb3f250e587b..e63d29a95e76 100644
--- a/drivers/mailbox/Kconfig
+++ b/drivers/mailbox/Kconfig
@@ -109,16 +109,20 @@ config TI_MESSAGE_MANAGER
           platform has support for the hardware block.
 
 config HI3660_MBOX
-        tristate "Hi3660 Mailbox"
-        depends on ARCH_HISI && OF
+        tristate "Hi3660 Mailbox" if EXPERT
+        depends on (ARCH_HISI || COMPILE_TEST)
+        depends on OF
+        default ARCH_HISI
         help
           An implementation of the hi3660 mailbox. It is used to send message
           between application processors and other processors/MCU/DSP. Select
           Y here if you want to use Hi3660 mailbox controller.
 
 config HI6220_MBOX
-        tristate "Hi6220 Mailbox"
-        depends on ARCH_HISI
+        tristate "Hi6220 Mailbox" if EXPERT
+        depends on (ARCH_HISI || COMPILE_TEST)
+        depends on OF
+        default ARCH_HISI
         help
           An implementation of the hi6220 mailbox. It is used to send message
           between application processors and MCU. Say Y here if you want to