Skip to content

Commit 6bd05db

Browse files
committed
ALSA: hda/realtek: Restrict prompt only for CONFIG_EXPERT
The split of Realtek HD-audio codec driver may cause confusions especially when migrating from the previous kernel configurations because it's hard to know which driver to be enabled. Although we've already set default=y for those codec drivers, it may still make people changing the stuff unnecessarily without knowing its side effect. This patch is for avoiding such pitfalls by marking the prompt of each Realtek codec driver with CONFIG_EXPERT. For "normal" users (that is, unless CONFIG_EXPERT is set), all Realtek HD-audio codecs are enabled together with CONFIG_SND_HDA_CODEC_REALTEK; this is the very same situation like the previous kernels, after all. For users who really care about the minimalistic configuration, they can turn each driver on/off individually after setting CONFIG_EXPERT=y. The patch also adds the missing help text to the top-level CONFIG_SND_HDA_CODEC_REALTEK together with the explanation of individual choices, too. Fixes: aeeb85f ("ALSA: hda: Split Realtek HD-audio codec driver") Link: https://lore.kernel.org/[email protected] Signed-off-by: Takashi Iwai <[email protected]> Link: https://patch.msgid.link/[email protected]
1 parent ed42668 commit 6bd05db

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

sound/hda/codecs/realtek/Kconfig

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

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

612
if SND_HDA_CODEC_REALTEK
713

@@ -12,23 +18,23 @@ config SND_HDA_CODEC_REALTEK_LIB
1218
select SND_HDA_SCODEC_COMPONENT
1319

1420
config SND_HDA_CODEC_ALC260
15-
tristate "Build Realtek ALC260 HD-audio codec support"
21+
tristate "Build Realtek ALC260 HD-audio codec support" if EXPERT
1622
depends on INPUT
1723
select SND_HDA_CODEC_REALTEK_LIB
1824
default y
1925
help
2026
Say Y or M here to include Realtek ALC260 HD-audio codec support
2127

2228
config SND_HDA_CODEC_ALC262
23-
tristate "Build Realtek ALC262 HD-audio codec support"
29+
tristate "Build Realtek ALC262 HD-audio codec support" if EXPERT
2430
depends on INPUT
2531
select SND_HDA_CODEC_REALTEK_LIB
2632
default y
2733
help
2834
Say Y or M here to include Realtek ALC262 HD-audio codec support
2935

3036
config SND_HDA_CODEC_ALC268
31-
tristate "Build Realtek ALC268 HD-audio codec support"
37+
tristate "Build Realtek ALC268 HD-audio codec support" if EXPERT
3238
depends on INPUT
3339
select SND_HDA_CODEC_REALTEK_LIB
3440
default y
@@ -37,7 +43,7 @@ config SND_HDA_CODEC_ALC268
3743
codec support
3844

3945
config SND_HDA_CODEC_ALC269
40-
tristate "Build Realtek ALC269 HD-audio codecs support"
46+
tristate "Build Realtek ALC269 HD-audio codecs support" if EXPERT
4147
depends on INPUT
4248
select SND_HDA_CODEC_REALTEK_LIB
4349
default y
@@ -46,7 +52,7 @@ config SND_HDA_CODEC_ALC269
4652
codec support
4753

4854
config SND_HDA_CODEC_ALC662
49-
tristate "Build Realtek ALC662 HD-audio codecs support"
55+
tristate "Build Realtek ALC662 HD-audio codecs support" if EXPERT
5056
depends on INPUT
5157
select SND_HDA_CODEC_REALTEK_LIB
5258
default y
@@ -55,39 +61,39 @@ config SND_HDA_CODEC_ALC662
5561
codec support
5662

5763
config SND_HDA_CODEC_ALC680
58-
tristate "Build Realtek ALC680 HD-audio codecs support"
64+
tristate "Build Realtek ALC680 HD-audio codecs support" if EXPERT
5965
depends on INPUT
6066
select SND_HDA_CODEC_REALTEK_LIB
6167
default y
6268
help
6369
Say Y or M here to include Realtek ALC680 HD-audio codec support
6470

6571
config SND_HDA_CODEC_ALC861
66-
tristate "Build Realtek ALC861 HD-audio codecs support"
72+
tristate "Build Realtek ALC861 HD-audio codecs support" if EXPERT
6773
depends on INPUT
6874
select SND_HDA_CODEC_REALTEK_LIB
6975
default y
7076
help
7177
Say Y or M here to include Realtek ALC861 HD-audio codec support
7278

7379
config SND_HDA_CODEC_ALC861VD
74-
tristate "Build Realtek ALC861-VD HD-audio codecs support"
80+
tristate "Build Realtek ALC861-VD HD-audio codecs support" if EXPERT
7581
depends on INPUT
7682
select SND_HDA_CODEC_REALTEK_LIB
7783
default y
7884
help
7985
Say Y or M here to include Realtek ALC861-VD HD-audio codec support
8086

8187
config SND_HDA_CODEC_ALC880
82-
tristate "Build Realtek ALC880 HD-audio codecs support"
88+
tristate "Build Realtek ALC880 HD-audio codecs support" if EXPERT
8389
depends on INPUT
8490
select SND_HDA_CODEC_REALTEK_LIB
8591
default y
8692
help
8793
Say Y or M here to include Realtek ALC880 HD-audio codec support
8894

8995
config SND_HDA_CODEC_ALC882
90-
tristate "Build Realtek ALC882 HD-audio codecs support"
96+
tristate "Build Realtek ALC882 HD-audio codecs support" if EXPERT
9197
depends on INPUT
9298
select SND_HDA_CODEC_REALTEK_LIB
9399
default y
@@ -96,5 +102,3 @@ config SND_HDA_CODEC_ALC882
96102
codec support
97103

98104
endif
99-
100-

0 commit comments

Comments
 (0)