Skip to content

Commit e8e4f3c

Browse files
committed
ALSA: hda/cirrus: Restrict prompt only for CONFIG_EXPERT
The split of Cirrus HD-audio codec driver may confuse users when migrating from the previous kernel configs and leave the needed drivers disabled. Although we've already set y as default, it's still safer to paper over the wrong choices. This patch marks the prompt of split CS420x and CS421x codec drivers with CONFIG_EXPERT, so that they are all enabled when the top-level CONFIG_SND_HDA_CODEC_CIRRUS is set. For users who really care about the minimalistic configuration, they can turn each driver on/off individually after setting CONFIG_EXPERT=y. This patch adds the missing help text to the top-level CONFIG_SND_HDA_CIRRUS_CODEC together with the explanation of individual choices, and corrects the help texts that don't fit well nowadays, too. Fixes: 1cb8744 ("ALSA: hda/cirrus: Split to cs420x and cs421x drivers") Link: https://lore.kernel.org/[email protected] Signed-off-by: Takashi Iwai <[email protected]> Link: https://patch.msgid.link/[email protected]
1 parent 606fcab commit e8e4f3c

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

sound/hda/codecs/cirrus/Kconfig

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,31 @@
22

33
menuconfig SND_HDA_CODEC_CIRRUS
44
tristate "Cirrus Logic HD-audio codec support"
5+
help
6+
Say Y or M here to include Cirrus Logic HD-audio codec support.
7+
8+
This will enable both CS420x and CS421x HD-audio codec drivers
9+
as default, but you can enable/disable each codec driver
10+
individually, too (only when CONFIG_EXPERT is set).
511

612
if SND_HDA_CODEC_CIRRUS
713

814
config SND_HDA_CODEC_CS420X
9-
tristate "Build Cirrus Logic CS420x codec support"
15+
tristate "Build Cirrus Logic CS420x codec support" if EXPERT
1016
select SND_HDA_GENERIC
1117
default y
1218
help
13-
Say Y or M here to include Cirrus Logic CS420x codec support in
14-
snd-hda-intel driver
19+
Say Y or M here to include Cirrus Logic CS420x codec support
1520

1621
comment "Set to Y if you want auto-loading the codec driver"
1722
depends on SND_HDA=y && SND_HDA_CODEC_CS420X=m
1823

1924
config SND_HDA_CODEC_CS421X
20-
tristate "Build Cirrus Logic CS421x codec support"
25+
tristate "Build Cirrus Logic CS421x codec support" if EXPERT
2126
select SND_HDA_GENERIC
2227
default y
2328
help
24-
Say Y or M here to include Cirrus Logic CS421x codec support in
25-
snd-hda-intel driver
29+
Say Y or M here to include Cirrus Logic CS421x codec support
2630

2731
comment "Set to Y if you want auto-loading the codec driver"
2832
depends on SND_HDA=y && SND_HDA_CODEC_CS421X=m
@@ -31,8 +35,8 @@ config SND_HDA_CODEC_CS8409
3135
tristate "Build Cirrus Logic HDA bridge support"
3236
select SND_HDA_GENERIC
3337
help
34-
Say Y or M here to include Cirrus Logic HDA bridge support in
35-
snd-hda-intel driver, such as CS8409.
38+
Say Y or M here to include Cirrus Logic HDA bridge support
39+
such as CS8409.
3640

3741
comment "Set to Y if you want auto-loading the codec driver"
3842
depends on SND_HDA=y && SND_HDA_CODEC_CS8409=m

0 commit comments

Comments
 (0)