Skip to content

Commit 59960e6

Browse files
committed
ASoC: Intel: machine driver updates for 6.5
Merge series from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>: An unusually large set of patches to deal with new SoundWire-based platforms. The bulk of the patches addresses support for MTL using RT712, RT713, MAX98363, CS42L42 jack codec and amplifiers. The sof_sdw machine driver had to be updated to remove limitations on number of codecs per links, dai types, dai naming, etc. We also moved parts of the Realtek and Maxim support in common code to avoid duplication. Community users also reported two Dell SKUs which were not supported in the mainline due to hardware permutations.
2 parents c7e076d + a050381 commit 59960e6

15 files changed

Lines changed: 1044 additions & 225 deletions

sound/soc/intel/boards/Kconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -662,18 +662,22 @@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH
662662
depends on MFD_INTEL_LPSS || COMPILE_TEST
663663
depends on SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES || COMPILE_TEST
664664
depends on SOUNDWIRE
665+
select SND_SOC_MAX98363
665666
select SND_SOC_MAX98373_I2C
666667
select SND_SOC_MAX98373_SDW
667668
select SND_SOC_RT700_SDW
668669
select SND_SOC_RT711_SDW
669670
select SND_SOC_RT711_SDCA_SDW
671+
select SND_SOC_RT712_SDCA_SDW
672+
select SND_SOC_RT712_SDCA_DMIC_SDW
670673
select SND_SOC_RT1308_SDW
671674
select SND_SOC_RT1308
672675
select SND_SOC_RT1316_SDW
673676
select SND_SOC_RT1318_SDW
674677
select SND_SOC_RT715_SDW
675678
select SND_SOC_RT715_SDCA_SDW
676679
select SND_SOC_RT5682_SDW
680+
select SND_SOC_CS42L42_SDW
677681
select SND_SOC_DMIC
678682
select SND_SOC_INTEL_HDA_DSP_COMMON
679683
select SND_SOC_INTEL_SOF_MAXIM_COMMON

sound/soc/intel/boards/Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,13 @@ snd-soc-sof_da7219_max98373-objs := sof_da7219_max98373.o
3737
snd-soc-ehl-rt5660-objs := ehl_rt5660.o
3838
snd-soc-sof-ssp-amp-objs := sof_ssp_amp.o
3939
snd-soc-sof-sdw-objs += sof_sdw.o \
40-
sof_sdw_max98373.o sof_sdw_rt_amp.o \
40+
sof_sdw_maxim.o sof_sdw_rt_amp.o \
4141
sof_sdw_rt5682.o sof_sdw_rt700.o \
42-
sof_sdw_rt711.o sof_sdw_rt711_sdca.o \
43-
sof_sdw_rt715.o sof_sdw_rt715_sdca.o \
44-
sof_sdw_dmic.o sof_sdw_hdmi.o
42+
sof_sdw_rt711.o sof_sdw_rt_sdca_jack_common.o \
43+
sof_sdw_rt712_sdca.o sof_sdw_rt715.o \
44+
sof_sdw_rt715_sdca.o sof_sdw_dmic.o \
45+
sof_sdw_cs42l42.o \
46+
sof_sdw_hdmi.o
4547
obj-$(CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH) += snd-soc-sof_rt5682.o
4648
obj-$(CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH) += snd-soc-sof_cs42l42.o
4749
obj-$(CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH) += snd-soc-sof_es8336.o

sound/soc/intel/boards/sof_rt5682.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,6 +1119,17 @@ static const struct platform_device_id board_ids[] = {
11191119
SOF_BT_OFFLOAD_SSP(2) |
11201120
SOF_SSP_BT_OFFLOAD_PRESENT),
11211121
},
1122+
{
1123+
.name = "rpl_rt1019_rt5682",
1124+
.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
1125+
SOF_RT5682_SSP_CODEC(0) |
1126+
SOF_SPEAKER_AMP_PRESENT |
1127+
SOF_RT1019_SPEAKER_AMP_PRESENT |
1128+
SOF_RT5682_SSP_AMP(1) |
1129+
SOF_RT5682_NUM_HDMIDEV(4) |
1130+
SOF_BT_OFFLOAD_SSP(2) |
1131+
SOF_SSP_BT_OFFLOAD_PRESENT),
1132+
},
11221133
{
11231134
.name = "mtl_mx98357_rt5682",
11241135
.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

0 commit comments

Comments
 (0)