Skip to content

Commit 622e3a7

Browse files
author
Herton R. Krzesinski
committed
Merge: ALSA: Add Intel RaptorLake-P support
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/1957 Bugzilla: https://bugzilla.redhat.com/2140419 Signed-off-by: Jaroslav Kysela <jkysela@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: John W. Linville <linville@redhat.com> Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
2 parents 07ded64 + 26783ca commit 622e3a7

File tree

13 files changed

+1998
-289
lines changed

13 files changed

+1998
-289
lines changed

sound/soc/codecs/Kconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ config SND_SOC_ALL_CODECS
198198
imply SND_SOC_RT715_SDCA_SDW
199199
imply SND_SOC_RT1308_SDW
200200
imply SND_SOC_RT1316_SDW
201+
imply SND_SOC_RT1318_SDW
201202
imply SND_SOC_RT9120
202203
imply SND_SOC_SDW_MOCKUP
203204
imply SND_SOC_SGTL5000
@@ -1293,6 +1294,11 @@ config SND_SOC_RT1316_SDW
12931294
depends on SOUNDWIRE
12941295
select REGMAP_SOUNDWIRE
12951296

1297+
config SND_SOC_RT1318_SDW
1298+
tristate "Realtek RT1318 Codec - SDW"
1299+
depends on SOUNDWIRE
1300+
select REGMAP_SOUNDWIRE
1301+
12961302
config SND_SOC_RT5514
12971303
tristate
12981304
depends on I2C

sound/soc/codecs/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ snd-soc-rt1305-objs := rt1305.o
193193
snd-soc-rt1308-objs := rt1308.o
194194
snd-soc-rt1308-sdw-objs := rt1308-sdw.o
195195
snd-soc-rt1316-sdw-objs := rt1316-sdw.o
196+
snd-soc-rt1318-sdw-objs := rt1318-sdw.o
196197
snd-soc-rt274-objs := rt274.o
197198
snd-soc-rt286-objs := rt286.o
198199
snd-soc-rt298-objs := rt298.o
@@ -543,6 +544,7 @@ obj-$(CONFIG_SND_SOC_RT1305) += snd-soc-rt1305.o
543544
obj-$(CONFIG_SND_SOC_RT1308) += snd-soc-rt1308.o
544545
obj-$(CONFIG_SND_SOC_RT1308_SDW) += snd-soc-rt1308-sdw.o
545546
obj-$(CONFIG_SND_SOC_RT1316_SDW) += snd-soc-rt1316-sdw.o
547+
obj-$(CONFIG_SND_SOC_RT1318_SDW) += snd-soc-rt1318-sdw.o
546548
obj-$(CONFIG_SND_SOC_RT274) += snd-soc-rt274.o
547549
obj-$(CONFIG_SND_SOC_RT286) += snd-soc-rt286.o
548550
obj-$(CONFIG_SND_SOC_RT298) += snd-soc-rt298.o

0 commit comments

Comments
 (0)