Skip to content

Commit f83d1cf

Browse files
dlezcanoJassiBrar
authored andcommitted
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 3a49afb ("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 <[email protected]> Signed-off-by: Leo Yan <[email protected]> Signed-off-by: Jassi Brar <[email protected]>
1 parent 05e99a7 commit f83d1cf

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

drivers/mailbox/Kconfig

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,20 @@ config TI_MESSAGE_MANAGER
109109
platform has support for the hardware block.
110110

111111
config HI3660_MBOX
112-
tristate "Hi3660 Mailbox"
113-
depends on ARCH_HISI && OF
112+
tristate "Hi3660 Mailbox" if EXPERT
113+
depends on (ARCH_HISI || COMPILE_TEST)
114+
depends on OF
115+
default ARCH_HISI
114116
help
115117
An implementation of the hi3660 mailbox. It is used to send message
116118
between application processors and other processors/MCU/DSP. Select
117119
Y here if you want to use Hi3660 mailbox controller.
118120

119121
config HI6220_MBOX
120-
tristate "Hi6220 Mailbox"
121-
depends on ARCH_HISI
122+
tristate "Hi6220 Mailbox" if EXPERT
123+
depends on (ARCH_HISI || COMPILE_TEST)
124+
depends on OF
125+
default ARCH_HISI
122126
help
123127
An implementation of the hi6220 mailbox. It is used to send message
124128
between application processors and MCU. Say Y here if you want to

0 commit comments

Comments
 (0)