[PATCH v1 0/2] Adds the combination of headset codec ALC5682I-VD + amp rt1019p
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(-)
This patch adds the driver data for two rt1019 speaker amplifiers on SSP1 and ALC5682I-VD on SSP0 for ADL platform.
Signed-off-by: Ajye Huang ajye_huang@compal.corp-partner.google.com --- sound/soc/intel/boards/sof_rt5682.c | 3 +-- sound/soc/intel/common/soc-acpi-intel-adl-match.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index 2358be208c1f..0e803c1c2b06 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -1092,10 +1092,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) | diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c index 9990d5502d26..3ca0a96d94de 100644 --- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c @@ -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",
As per discussed with Ajye, the board co-layouts 5682VS and 5682VD and verified. Hi Pierre, could we have your reviews?
This patch adds the driver data for two rt1019 speaker amplifiers on SSP1 and ALC5682I-VD on SSP0 for ADL platform.
Signed-off-by: Ajye Huang ajye_huang@compal.corp-partner.google.com
sound/soc/intel/boards/sof_rt5682.c | 3 +-- sound/soc/intel/common/soc-acpi-intel-adl-match.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index 2358be208c1f..0e803c1c2b06 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -1092,10 +1092,9 @@ static const struct platform_device_id board_ids[] = { SOF_SSP_BT_OFFLOAD_PRESENT), }, {
.name = "adl_rt1019_rt5682s",
.name = "adl_rt1019_rt5682",
- SOF_RT5682S_HEADPHONE_CODEC_PRESENT | SOF_SPEAKER_AMP_PRESENT | SOF_RT1019_SPEAKER_AMP_PRESENT
| SOF_RT5682_SSP_AMP(1) | diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c index 9990d5502d26..3ca0a96d94de 100644 --- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c @@ -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",-- 2.25.1
Dear Mark,
On Mon, Nov 14, 2022 at 3:37 PM Chiang, Mac mac.chiang@intel.com wrote:
As per discussed with Ajye, the board co-layouts 5682VS and 5682VD and verified. Hi Pierre, could we have your reviews?
First of all, I apologize for this letter of inquiry.
I got "Acked-by" from Pierre for the series patches, ( https://patchwork.kernel.org/project/alsa-devel/cover/20221108042716.2930255...) Please you have a look when you are in free, thanks
Remove the redundant code to prevent user confuse.
Signed-off-by: Ajye Huang ajye_huang@compal.corp-partner.google.com --- sound/soc/intel/boards/sof_rt5682.c | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index 0e803c1c2b06..4a2f91249b10 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -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;
On 11/7/22 22:27, Ajye Huang wrote:
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
Nice catch on the second patch, this sort of duplicates are hard to detect in code reviews.
For the series:
Acked-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
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(-)
On Tue, 8 Nov 2022 12:27:14 +0800, Ajye Huang wrote:
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
[...]
Applied to
broonie/sound.git for-next
Thanks!
[1/2] ASoC: Intel: sof_rt5682: add support for ALC5682I-VD with amp rt1019p commit: 1a9a5ebe1175537dc817531fe74c5949c3a823c1 [2/2] ASoC: Intel: sof rt5682: remove the duplicate codes commit: c7a79f546100300d18585506f8fd0460a874df4a
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
participants (4)
-
Ajye Huang -
Chiang, Mac -
Mark Brown -
Pierre-Louis Bossart