Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: Intel: sof_rt5682: add supports for new

Merge series from Bard Liao <yung-chuan.liao@linux.intel.com>:

Add HDMI-In support for MTL and rt5682 support for PTL.

+35
+15
sound/soc/intel/boards/sof_rt5682.c
··· 871 871 SOF_BT_OFFLOAD_PRESENT), 872 872 }, 873 873 { 874 + .name = "mtl_rt5682_c1_h02", 875 + .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | 876 + SOF_SSP_PORT_CODEC(1) | 877 + /* SSP 0 and SSP 2 are used for HDMI IN */ 878 + SOF_SSP_MASK_HDMI_CAPTURE(0x5)), 879 + }, 880 + { 874 881 .name = "arl_rt5682_c1_h02", 875 882 .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | 876 883 SOF_SSP_PORT_CODEC(1) | 877 884 /* SSP 0 and SSP 2 are used for HDMI IN */ 878 885 SOF_SSP_MASK_HDMI_CAPTURE(0x5)), 886 + }, 887 + { 888 + .name = "ptl_rt5682_def", 889 + .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | 890 + SOF_SSP_PORT_CODEC(0) | 891 + SOF_SSP_PORT_AMP(1) | 892 + SOF_SSP_PORT_BT_OFFLOAD(2) | 893 + SOF_BT_OFFLOAD_PRESENT), 879 894 }, 880 895 { } 881 896 };
+7
sound/soc/intel/common/soc-acpi-intel-mtl-match.c
··· 42 42 SND_SOC_ACPI_TPLG_INTEL_SSP_MSB | 43 43 SND_SOC_ACPI_TPLG_INTEL_DMIC_NUMBER, 44 44 }, 45 + { 46 + .comp_ids = &mtl_rt5682_rt5682s_hp, 47 + .drv_name = "mtl_rt5682_c1_h02", 48 + .machine_quirk = snd_soc_acpi_codec_list, 49 + .quirk_data = &mtl_lt6911_hdmi, 50 + .sof_tplg_filename = "sof-mtl-rt5682-ssp1-hdmi-ssp02.tplg", 51 + }, 45 52 /* place boards for each headphone codec: sof driver will complete the 46 53 * tplg name and machine driver will detect the amp type 47 54 */
+13
sound/soc/intel/common/soc-acpi-intel-ptl-match.c
··· 9 9 #include <sound/soc-acpi.h> 10 10 #include <sound/soc-acpi-intel-match.h> 11 11 #include "soc-acpi-intel-sdw-mockup-match.h" 12 + #include <sound/soc-acpi-intel-ssp-common.h> 13 + 14 + static const struct snd_soc_acpi_codecs ptl_rt5682_rt5682s_hp = { 15 + .num_codecs = 2, 16 + .codecs = {RT5682_ACPI_HID, RT5682S_ACPI_HID}, 17 + }; 12 18 13 19 struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_machines[] = { 20 + { 21 + .comp_ids = &ptl_rt5682_rt5682s_hp, 22 + .drv_name = "ptl_rt5682_def", 23 + .sof_tplg_filename = "sof-ptl", /* the tplg suffix is added at run time */ 24 + .tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_AMP_NAME | 25 + SND_SOC_ACPI_TPLG_INTEL_CODEC_NAME, 26 + }, 14 27 {}, 15 28 }; 16 29 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_ptl_machines);