Unverified Commit f56814af authored by Mark Brown's avatar Mark Brown
Browse files

Adds the combination of headset codec ALC5682I-VD + amp rt1019p 

Merge series from Ajye Huang <ajye_huang@compal.corp-partner.google.com>:

v1:
- machine driver:
  - Adds the combination of headset codec ALC5682I-VD + amp rt1019p.
  - Remove the duplicate code in machine driver.

Ajye Huang (2):
  ASoC: Intel: sof_rt5682: add support for ALC5682I-VD with amp rt1019p
  ASoC: Intel: sof rt5682: remove the duplicate codes

 sound/soc/intel/boards/sof_rt5682.c               | 7 +------
 sound/soc/intel/common/soc-acpi-intel-adl-match.c | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

--
2.25.1
parents 6ad73a2b c7a79f54

sound/soc/intel/boards/sof_rt5682.c

+1 −6
Original line number Diff line number Diff line
@@ -867,10 +867,6 @@ static int sof_audio_probe(struct platform_device *pdev) 
	if (acpi_dev_present("RTL5682", NULL, -1))

		sof_rt5682_quirk |= SOF_RT5682S_HEADPHONE_CODEC_PRESENT;



	/* Detect the headset codec variant to support machines in DMI quirk */

	if (acpi_dev_present("RTL5682", NULL, -1))

		sof_rt5682_quirk |= SOF_RT5682S_HEADPHONE_CODEC_PRESENT;



	if (soc_intel_is_byt() || soc_intel_is_cht()) {

		is_legacy_cpu = 1;

		dmic_be_num = 0;
@@ -1092,10 +1088,9 @@ static const struct platform_device_id board_ids[] = { 
					SOF_SSP_BT_OFFLOAD_PRESENT),

	},

	{

		.name = "adl_rt1019_rt5682s",

		.name = "adl_rt1019_rt5682",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

					SOF_RT5682_SSP_CODEC(0) |

					SOF_RT5682S_HEADPHONE_CODEC_PRESENT |

					SOF_SPEAKER_AMP_PRESENT |

					SOF_RT1019_SPEAKER_AMP_PRESENT |

					SOF_RT5682_SSP_AMP(1) |

sound/soc/intel/common/soc-acpi-intel-adl-match.c

+2 −2
Original line number Diff line number Diff line
@@ -489,8 +489,8 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { 
		.sof_tplg_filename = "sof-adl-max98360a-nau8825.tplg",

	},

	{

		.id = "RTL5682",

		.drv_name = "adl_rt1019_rt5682s",

		.comp_ids = &adl_rt5682_rt5682s_hp,

		.drv_name = "adl_rt1019_rt5682",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &adl_rt1019p_amp,

		.sof_tplg_filename = "sof-adl-rt1019-rt5682.tplg",