Skip to content

Commit 1cb8744

Browse files
committed
ALSA: hda/cirrus: Split to cs420x and cs421x drivers
Since the codec ops for CS420x and CS421x are fairly independent, split the cirrus codec driver into two drivers, snd-hda-codec-cs420x and snd-hda-code-cs421x. Together with the split, convert to the new hda_codec_ops probe. Signed-off-by: Takashi Iwai <[email protected]> Link: https://patch.msgid.link/[email protected]
1 parent dbe3e4a commit 1cb8744

File tree

4 files changed

+643
-499
lines changed

4 files changed

+643
-499
lines changed

sound/hda/codecs/cirrus/Kconfig

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22

3-
config SND_HDA_CODEC_CIRRUS
4-
tristate "Build Cirrus Logic codec support"
3+
config SND_HDA_CODEC_CS420X
4+
tristate "Build Cirrus Logic CS420x codec support"
55
select SND_HDA_GENERIC
66
help
7-
Say Y or M here to include Cirrus Logic codec support in
8-
snd-hda-intel driver, such as CS4206.
7+
Say Y or M here to include Cirrus Logic CS420x codec support in
8+
snd-hda-intel driver
99

1010
comment "Set to Y if you want auto-loading the codec driver"
11-
depends on SND_HDA=y && SND_HDA_CODEC_CIRRUS=m
11+
depends on SND_HDA=y && SND_HDA_CODEC_CS420X=m
12+
13+
config SND_HDA_CODEC_CS421X
14+
tristate "Build Cirrus Logic CS421x codec support"
15+
select SND_HDA_GENERIC
16+
help
17+
Say Y or M here to include Cirrus Logic CS421x codec support in
18+
snd-hda-intel driver
19+
20+
comment "Set to Y if you want auto-loading the codec driver"
21+
depends on SND_HDA=y && SND_HDA_CODEC_CS421X=m
1222

1323
config SND_HDA_CODEC_CS8409
1424
tristate "Build Cirrus Logic HDA bridge support"

sound/hda/codecs/cirrus/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
# SPDX-License-Identifier: GPL-2.0
22
subdir-ccflags-y += -I$(src)/../../common
33

4-
snd-hda-codec-cirrus-y := cirrus.o
4+
snd-hda-codec-cs420x-y := cs420x.o
5+
snd-hda-codec-cs421x-y := cs421x.o
56
snd-hda-codec-cs8409-y := cs8409.o cs8409-tables.o
67

7-
obj-$(CONFIG_SND_HDA_CODEC_CIRRUS) += snd-hda-codec-cirrus.o
8+
obj-$(CONFIG_SND_HDA_CODEC_CS420X) += snd-hda-codec-cs420x.o
9+
obj-$(CONFIG_SND_HDA_CODEC_CS421X) += snd-hda-codec-cs421x.o
810
obj-$(CONFIG_SND_HDA_CODEC_CS8409) += snd-hda-codec-cs8409.o

0 commit comments

Comments
 (0)