[PATCH] ASoC: SOF: Intel: Add topology overwrite for Felwinter
From: Ajye Huang ajye_huang@compal.corp-partner.google.com
The Felwinter uses four max98360a amplifiers on corresponding CH0~CH3. There are four amps on the board connecting to headphone to SSP0 port, amp to SSP1,and the DAI format would be DSP_A,8-slots, 32 bit slot-width.
CH0: L(Woofer), CH1:R(Woofer), CH2:L(Tweeter), CH3:R(Tweeter)
Signed-off-by: Ajye Huang ajye_huang@compal.corp-partner.google.com Signed-off-by: Brent Lu brent.lu@intel.com --- sound/soc/sof/sof-pci-dev.c | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c index 20c6ca37dbc4..61f2afd54c3e 100644 --- a/sound/soc/sof/sof-pci-dev.c +++ b/sound/soc/sof/sof-pci-dev.c @@ -67,6 +67,14 @@ static const struct dmi_system_id sof_tplg_table[] = { }, .driver_data = "sof-adl-max98390-ssp2-rt5682-ssp0.tplg", }, + { + .callback = sof_tplg_cb, + .matches = { + DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Brya"), + DMI_MATCH(DMI_OEM_STRING, "AUDIO_AMP-MAX98360_ALC5682VS_I2S_2WAY"), + }, + .driver_data = "sof-adl-max98360a-rt5682-2way.tplg", + },
{} };
The Felwinter uses four max98360a amplifiers on corresponding CH0~CH3. There are four amps on the board connecting to headphone to SSP0 port, amp to SSP1,and the DAI format would be DSP_A,8-slots, 32 bit slot-width.
CH0: L(Woofer), CH1:R(Woofer), CH2:L(Tweeter), CH3:R(Tweeter)
Signed-off-by: Ajye Huang ajye_huang@compal.corp-partner.google.com Signed-off-by: Brent Lu brent.lu@intel.com
Already merged on SOF tree: https://github.com/thesofproject/linux/pull/3271
sound/soc/sof/sof-pci-dev.c | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c index 20c6ca37dbc4..61f2afd54c3e 100644 --- a/sound/soc/sof/sof-pci-dev.c +++ b/sound/soc/sof/sof-pci-dev.c @@ -67,6 +67,14 @@ static const struct dmi_system_id sof_tplg_table[] = { }, .driver_data = "sof-adl-max98390-ssp2-rt5682-ssp0.tplg", },
- {
.callback = sof_tplg_cb,.matches = {DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Brya"),DMI_MATCH(DMI_OEM_STRING, "AUDIO_AMP-MAX98360_ALC5682VS_I2S_2WAY"),
},.driver_data = "sof-adl-max98360a-rt5682-2way.tplg",},
{}
};
2.25.1
On 2/18/22 02:27, Brent Lu wrote:
From: Ajye Huang ajye_huang@compal.corp-partner.google.com
The Felwinter uses four max98360a amplifiers on corresponding CH0~CH3. There are four amps on the board connecting to headphone to SSP0 port, amp to SSP1,and the DAI format would be DSP_A,8-slots, 32 bit slot-width.
CH0: L(Woofer), CH1:R(Woofer), CH2:L(Tweeter), CH3:R(Tweeter)
Signed-off-by: Ajye Huang ajye_huang@compal.corp-partner.google.com Signed-off-by: Brent Lu brent.lu@intel.com
This patch is already in the SOF tree and for some reason I didn't send it, sorry about the delay.
Here are the tags we collected during the reviews.
Reviewed-by: Curtis Malainey cujomalainey@chromium.org Reviewed-by: Bard Liao yung-chuan.liao@linux.intel.com Reviewed-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
sound/soc/sof/sof-pci-dev.c | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c index 20c6ca37dbc4..61f2afd54c3e 100644 --- a/sound/soc/sof/sof-pci-dev.c +++ b/sound/soc/sof/sof-pci-dev.c @@ -67,6 +67,14 @@ static const struct dmi_system_id sof_tplg_table[] = { }, .driver_data = "sof-adl-max98390-ssp2-rt5682-ssp0.tplg", },
{
.callback = sof_tplg_cb,.matches = {DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Brya"),DMI_MATCH(DMI_OEM_STRING, "AUDIO_AMP-MAX98360_ALC5682VS_I2S_2WAY"),},.driver_data = "sof-adl-max98360a-rt5682-2way.tplg",},
{}
};
This patch is already in the SOF tree and for some reason I didn't send it, sorry about the delay.
Here are the tags we collected during the reviews.
Reviewed-by: Curtis Malainey cujomalainey@chromium.org Reviewed-by: Bard Liao yung-chuan.liao@linux.intel.com Reviewed-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
Ok. Let me send a v2 patch.
Brent
On Fri, 18 Feb 2022 16:27:41 +0800, Brent Lu wrote:
From: Ajye Huang ajye_huang@compal.corp-partner.google.com
The Felwinter uses four max98360a amplifiers on corresponding CH0~CH3. There are four amps on the board connecting to headphone to SSP0 port, amp to SSP1,and the DAI format would be DSP_A,8-slots, 32 bit slot-width.
CH0: L(Woofer), CH1:R(Woofer), CH2:L(Tweeter), CH3:R(Tweeter)
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: SOF: Intel: Add topology overwrite for Felwinter commit: b9afe038b1fba24e815000606d5877de97f9f154
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)
-
Brent Lu -
Lu, Brent
-
Mark Brown -
Pierre-Louis Bossart