| Message ID | 20221108042716.2930255-2-ajye_huang@compal.corp-partner.google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1a9a5ebe1175537dc817531fe74c5949c3a823c1 |
| Headers | show |
| Series | Adds the combination of headset codec ALC5682I-VD + amp rt1019p | expand |
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", > .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", > -- > 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-1-ajye_huang@compal.corp-partner.google.com/) Please you have a look when you are in free, thanks
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",
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(-)