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: 1cb8744a36c7 ("ALSA: hda/cirrus: Split to cs420x and cs421x drivers")
Link: https://lore.kernel.org/10172c80-daec-4e20-ab57-a483cf1afc02@molgen.mpg.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20250806192541.21949-4-tiwai@suse.de

diff --git a/sound/hda/codecs/cirrus/Kconfig b/sound/hda/codecs/cirrus/Kconfig
index 33cfe52713bc9ae64d4c6b3cda704b869ac7ac55..ec6cbcaf64f0eb53f32e9349ff183520d9e87dcb 100644 (file)
--- a/sound/hda/codecs/cirrus/Kconfig
+++ b/sound/hda/codecs/cirrus/Kconfig
@@ -2,27 +2,31 @@
 
 menuconfig SND_HDA_CODEC_CIRRUS
        tristate "Cirrus Logic HD-audio codec support"
+       help
+         Say Y or M here to include Cirrus Logic HD-audio codec support.
+
+         This will enable both CS420x and CS421x HD-audio codec drivers
+         as default, but you can enable/disable each codec driver
+         individually, too (only when CONFIG_EXPERT is set).
 
 if SND_HDA_CODEC_CIRRUS
 
 config SND_HDA_CODEC_CS420X
-       tristate "Build Cirrus Logic CS420x codec support"
+       tristate "Build Cirrus Logic CS420x codec support" if EXPERT
        select SND_HDA_GENERIC
        default y
        help
-         Say Y or M here to include Cirrus Logic CS420x codec support in
-         snd-hda-intel driver
+         Say Y or M here to include Cirrus Logic CS420x codec support
 
 comment "Set to Y if you want auto-loading the codec driver"
        depends on SND_HDA=y && SND_HDA_CODEC_CS420X=m
 
 config SND_HDA_CODEC_CS421X
-       tristate "Build Cirrus Logic CS421x codec support"
+       tristate "Build Cirrus Logic CS421x codec support" if EXPERT
        select SND_HDA_GENERIC
        default y
        help
-         Say Y or M here to include Cirrus Logic CS421x codec support in
-         snd-hda-intel driver
+         Say Y or M here to include Cirrus Logic CS421x codec support
 
 comment "Set to Y if you want auto-loading the codec driver"
        depends on SND_HDA=y && SND_HDA_CODEC_CS421X=m
@@ -31,8 +35,8 @@ config SND_HDA_CODEC_CS8409
        tristate "Build Cirrus Logic HDA bridge support"
        select SND_HDA_GENERIC
        help
-         Say Y or M here to include Cirrus Logic HDA bridge support in
-         snd-hda-intel driver, such as CS8409.
+         Say Y or M here to include Cirrus Logic HDA bridge support
+         such as CS8409.
 
 comment "Set to Y if you want auto-loading the codec driver"
        depends on SND_HDA=y && SND_HDA_CODEC_CS8409=m