* [PATCH] ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp
@ 2021-10-01 15:03 ` Brent Lu
0 siblings, 0 replies; 12+ messages in thread
From: Brent Lu @ 2021-10-01 15:03 UTC (permalink / raw)
To: alsa-devel
Cc: Cezary Rojewski, Pierre-Louis Bossart, Liam Girdwood, Jie Yang,
Mark Brown, Jaroslav Kysela, Takashi Iwai, Brent Lu,
Kai Vehmanen, Guennadi Liakhovetski, Yong Zhi,
Vamshi Krishna Gopal, Tzung-Bi Shih, Bard Liao, Rander Wang,
Malik_Hsu, Libin Yang, linux-kernel
From: Malik_Hsu <malik_hsu@wistron.corp-partner.google.com>
Add a board config adl_mx98360a_rt5682 to support alc5682 headset
codec and max98360a speaker amplifier. Follow Intel BT offload design
by connecting alc5682 to SSP0 and max98360a to SSP1.
Signed-off-by: Malik_Hsu <malik_hsu@wistron.corp-partner.google.com>
Signed-off-by: Brent Lu <brent.lu@intel.com>
---
sound/soc/intel/boards/sof_rt5682.c | 11 +++++++++++
sound/soc/intel/common/soc-acpi-intel-adl-match.c | 13 +++++++++++++
2 files changed, 24 insertions(+)
diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
index ad42d4c7ade5..613662eedd0d 100644
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -1076,6 +1076,17 @@ static const struct platform_device_id board_ids[] = {
SOF_MAX98360A_SPEAKER_AMP_PRESENT |
SOF_RT5682_SSP_AMP(1)),
},
+ {
+ .name = "adl_mx98360_rt5682",
+ .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
+ SOF_RT5682_SSP_CODEC(0) |
+ SOF_SPEAKER_AMP_PRESENT |
+ SOF_MAX98360A_SPEAKER_AMP_PRESENT |
+ SOF_RT5682_SSP_AMP(1) |
+ SOF_RT5682_NUM_HDMIDEV(4) |
+ SOF_BT_OFFLOAD_SSP(2) |
+ SOF_SSP_BT_OFFLOAD_PRESENT),
+ },
{ }
};
MODULE_DEVICE_TABLE(platform, board_ids);
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 e4ff280eac23..f5b21a95d222 100644
--- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
@@ -280,6 +280,11 @@ static const struct snd_soc_acpi_codecs adl_max98357a_amp = {
.codecs = {"MX98357A"}
};
+static const struct snd_soc_acpi_codecs adl_max98360a_amp = {
+ .num_codecs = 1,
+ .codecs = {"MX98360A"}
+};
+
struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
{
.id = "10EC5682",
@@ -297,6 +302,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
.sof_fw_filename = "sof-adl.ri",
.sof_tplg_filename = "sof-adl-max98357a-rt5682.tplg",
},
+ {
+ .id = "10EC5682",
+ .drv_name = "adl_mx98360_rt5682",
+ .machine_quirk = snd_soc_acpi_codec_list,
+ .quirk_data = &adl_max98360a_amp,
+ .sof_fw_filename = "sof-adl.ri",
+ .sof_tplg_filename = "sof-adl-max98360a-rt5682.tplg",
+ },
{},
};
EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_adl_machines);
--
2.25.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH] ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp
@ 2021-10-01 15:03 ` Brent Lu
0 siblings, 0 replies; 12+ messages in thread
From: Brent Lu @ 2021-10-01 15:03 UTC (permalink / raw)
To: alsa-devel
Cc: Libin Yang, Guennadi Liakhovetski, Cezary Rojewski, Malik_Hsu,
Kai Vehmanen, linux-kernel, Takashi Iwai, Jie Yang,
Pierre-Louis Bossart, Liam Girdwood, Tzung-Bi Shih, Mark Brown,
Bard Liao, Rander Wang, Brent Lu, Vamshi Krishna Gopal, Yong Zhi
From: Malik_Hsu <malik_hsu@wistron.corp-partner.google.com>
Add a board config adl_mx98360a_rt5682 to support alc5682 headset
codec and max98360a speaker amplifier. Follow Intel BT offload design
by connecting alc5682 to SSP0 and max98360a to SSP1.
Signed-off-by: Malik_Hsu <malik_hsu@wistron.corp-partner.google.com>
Signed-off-by: Brent Lu <brent.lu@intel.com>
---
sound/soc/intel/boards/sof_rt5682.c | 11 +++++++++++
sound/soc/intel/common/soc-acpi-intel-adl-match.c | 13 +++++++++++++
2 files changed, 24 insertions(+)
diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
index ad42d4c7ade5..613662eedd0d 100644
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -1076,6 +1076,17 @@ static const struct platform_device_id board_ids[] = {
SOF_MAX98360A_SPEAKER_AMP_PRESENT |
SOF_RT5682_SSP_AMP(1)),
},
+ {
+ .name = "adl_mx98360_rt5682",
+ .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
+ SOF_RT5682_SSP_CODEC(0) |
+ SOF_SPEAKER_AMP_PRESENT |
+ SOF_MAX98360A_SPEAKER_AMP_PRESENT |
+ SOF_RT5682_SSP_AMP(1) |
+ SOF_RT5682_NUM_HDMIDEV(4) |
+ SOF_BT_OFFLOAD_SSP(2) |
+ SOF_SSP_BT_OFFLOAD_PRESENT),
+ },
{ }
};
MODULE_DEVICE_TABLE(platform, board_ids);
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 e4ff280eac23..f5b21a95d222 100644
--- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
@@ -280,6 +280,11 @@ static const struct snd_soc_acpi_codecs adl_max98357a_amp = {
.codecs = {"MX98357A"}
};
+static const struct snd_soc_acpi_codecs adl_max98360a_amp = {
+ .num_codecs = 1,
+ .codecs = {"MX98360A"}
+};
+
struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
{
.id = "10EC5682",
@@ -297,6 +302,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
.sof_fw_filename = "sof-adl.ri",
.sof_tplg_filename = "sof-adl-max98357a-rt5682.tplg",
},
+ {
+ .id = "10EC5682",
+ .drv_name = "adl_mx98360_rt5682",
+ .machine_quirk = snd_soc_acpi_codec_list,
+ .quirk_data = &adl_max98360a_amp,
+ .sof_fw_filename = "sof-adl.ri",
+ .sof_tplg_filename = "sof-adl-max98360a-rt5682.tplg",
+ },
{},
};
EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_adl_machines);
--
2.25.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* RE: [PATCH] ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp
2021-10-01 15:03 ` Brent Lu
@ 2021-10-01 15:07 ` Lu, Brent
-1 siblings, 0 replies; 12+ messages in thread
From: Lu, Brent @ 2021-10-01 15:07 UTC (permalink / raw)
To: alsa-devel
Cc: Rojewski, Cezary, Pierre-Louis Bossart, Liam Girdwood, Jie Yang,
Mark Brown, Jaroslav Kysela, Takashi Iwai, Kai Vehmanen,
Guennadi Liakhovetski, Zhi, Yong, Gopal, Vamshi Krishna,
Tzung-Bi Shih, Liao, Bard, Wang, Rander, Malik_Hsu, Yang, Libin,
linux-kernel
>
> From: Malik_Hsu <malik_hsu@wistron.corp-partner.google.com>
>
> Add a board config adl_mx98360a_rt5682 to support alc5682 headset codec
> and max98360a speaker amplifier. Follow Intel BT offload design by
> connecting alc5682 to SSP0 and max98360a to SSP1.
>
> Signed-off-by: Malik_Hsu <malik_hsu@wistron.corp-partner.google.com>
> Signed-off-by: Brent Lu <brent.lu@intel.com>
Already accepted on SOF github. Merged with another fixup patch for the
platform device name.
^ permalink raw reply [flat|nested] 12+ messages in thread
* RE: [PATCH] ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp
@ 2021-10-01 15:07 ` Lu, Brent
0 siblings, 0 replies; 12+ messages in thread
From: Lu, Brent @ 2021-10-01 15:07 UTC (permalink / raw)
To: alsa-devel
Cc: Yang, Libin, Guennadi Liakhovetski, Rojewski, Cezary, Malik_Hsu,
Kai Vehmanen, linux-kernel, Takashi Iwai, Jie Yang,
Pierre-Louis Bossart, Liam Girdwood, Tzung-Bi Shih, Mark Brown,
Liao, Bard, Wang, Rander, Gopal, Vamshi Krishna, Zhi, Yong
>
> From: Malik_Hsu <malik_hsu@wistron.corp-partner.google.com>
>
> Add a board config adl_mx98360a_rt5682 to support alc5682 headset codec
> and max98360a speaker amplifier. Follow Intel BT offload design by
> connecting alc5682 to SSP0 and max98360a to SSP1.
>
> Signed-off-by: Malik_Hsu <malik_hsu@wistron.corp-partner.google.com>
> Signed-off-by: Brent Lu <brent.lu@intel.com>
Already accepted on SOF github. Merged with another fixup patch for the
platform device name.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp
2021-10-01 15:07 ` Lu, Brent
@ 2021-10-01 15:23 ` Pierre-Louis Bossart
-1 siblings, 0 replies; 12+ messages in thread
From: Pierre-Louis Bossart @ 2021-10-01 15:23 UTC (permalink / raw)
To: Lu, Brent, alsa-devel
Cc: Yang, Libin, Guennadi Liakhovetski, Rojewski, Cezary, Malik_Hsu,
Kai Vehmanen, linux-kernel, Jie Yang, Takashi Iwai,
Liam Girdwood, Tzung-Bi Shih, Mark Brown, Liao, Bard, Wang,
Rander, Gopal, Vamshi Krishna, Zhi, Yong
On 10/1/21 10:07 AM, Lu, Brent wrote:
>>
>> From: Malik_Hsu <malik_hsu@wistron.corp-partner.google.com>
>>
>> Add a board config adl_mx98360a_rt5682 to support alc5682 headset codec
>> and max98360a speaker amplifier. Follow Intel BT offload design by
>> connecting alc5682 to SSP0 and max98360a to SSP1.
>>
>> Signed-off-by: Malik_Hsu <malik_hsu@wistron.corp-partner.google.com>
>> Signed-off-by: Brent Lu <brent.lu@intel.com>
>
> Already accepted on SOF github. Merged with another fixup patch for the
> platform device name.
Yes this was reviewed by Bard and me on GitHub.
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp
@ 2021-10-01 15:23 ` Pierre-Louis Bossart
0 siblings, 0 replies; 12+ messages in thread
From: Pierre-Louis Bossart @ 2021-10-01 15:23 UTC (permalink / raw)
To: Lu, Brent, alsa-devel
Cc: Rojewski, Cezary, Liam Girdwood, Jie Yang, Mark Brown,
Jaroslav Kysela, Takashi Iwai, Kai Vehmanen,
Guennadi Liakhovetski, Zhi, Yong, Gopal, Vamshi Krishna,
Tzung-Bi Shih, Liao, Bard, Wang, Rander, Malik_Hsu, Yang, Libin,
linux-kernel
On 10/1/21 10:07 AM, Lu, Brent wrote:
>>
>> From: Malik_Hsu <malik_hsu@wistron.corp-partner.google.com>
>>
>> Add a board config adl_mx98360a_rt5682 to support alc5682 headset codec
>> and max98360a speaker amplifier. Follow Intel BT offload design by
>> connecting alc5682 to SSP0 and max98360a to SSP1.
>>
>> Signed-off-by: Malik_Hsu <malik_hsu@wistron.corp-partner.google.com>
>> Signed-off-by: Brent Lu <brent.lu@intel.com>
>
> Already accepted on SOF github. Merged with another fixup patch for the
> platform device name.
Yes this was reviewed by Bard and me on GitHub.
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp
2021-10-01 15:03 ` Brent Lu
@ 2021-10-02 0:16 ` Mark Brown
-1 siblings, 0 replies; 12+ messages in thread
From: Mark Brown @ 2021-10-02 0:16 UTC (permalink / raw)
To: Brent Lu, alsa-devel
Cc: Mark Brown, linux-kernel, Rander Wang, Malik_Hsu,
Guennadi Liakhovetski, Kai Vehmanen, Jie Yang,
Pierre-Louis Bossart, Takashi Iwai, Bard Liao, Libin Yang,
Tzung-Bi Shih, Cezary Rojewski, Vamshi Krishna Gopal, Yong Zhi,
Jaroslav Kysela, Liam Girdwood
On Fri, 1 Oct 2021 23:03:16 +0800, Brent Lu wrote:
> From: Malik_Hsu <malik_hsu@wistron.corp-partner.google.com>
>
> Add a board config adl_mx98360a_rt5682 to support alc5682 headset
> codec and max98360a speaker amplifier. Follow Intel BT offload design
> by connecting alc5682 to SSP0 and max98360a to SSP1.
>
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp
commit: 9c892547624ff277546a9d4fede3d95259e6faea
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
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp
@ 2021-10-02 0:16 ` Mark Brown
0 siblings, 0 replies; 12+ messages in thread
From: Mark Brown @ 2021-10-02 0:16 UTC (permalink / raw)
To: Brent Lu, alsa-devel
Cc: Libin Yang, Guennadi Liakhovetski, Cezary Rojewski, Malik_Hsu,
Kai Vehmanen, Takashi Iwai, Jie Yang, linux-kernel, Rander Wang,
Liam Girdwood, Tzung-Bi Shih, Mark Brown, Vamshi Krishna Gopal,
Pierre-Louis Bossart, Bard Liao, Yong Zhi
On Fri, 1 Oct 2021 23:03:16 +0800, Brent Lu wrote:
> From: Malik_Hsu <malik_hsu@wistron.corp-partner.google.com>
>
> Add a board config adl_mx98360a_rt5682 to support alc5682 headset
> codec and max98360a speaker amplifier. Follow Intel BT offload design
> by connecting alc5682 to SSP0 and max98360a to SSP1.
>
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp
commit: 9c892547624ff277546a9d4fede3d95259e6faea
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
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp
2021-08-03 8:30 ` Malik_Hsu
@ 2021-08-03 13:43 ` Pierre-Louis Bossart
-1 siblings, 0 replies; 12+ messages in thread
From: Pierre-Louis Bossart @ 2021-08-03 13:43 UTC (permalink / raw)
To: Malik_Hsu, alsa-devel
Cc: kai.vehmanen, mac.chiang, broonie, brent.lu, bard.liao,
liam.r.girdwood, yang.jie, perex, linux-kernel
On 8/3/21 3:30 AM, Malik_Hsu wrote:
missing commit message?
> Signed-off-by: Malik_Hsu <malik_hsu@wistron.corp-partner.google.com>
> ---
> sound/soc/intel/boards/sof_rt5682.c | 9 +++++++++
> sound/soc/intel/common/soc-acpi-intel-adl-match.c | 13 +++++++++++++
> 2 files changed, 22 insertions(+)
>
> diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
> index 39217223d50c..8d727dd37f12 100644
> --- a/sound/soc/intel/boards/sof_rt5682.c
> +++ b/sound/soc/intel/boards/sof_rt5682.c
> @@ -1043,6 +1043,15 @@ static const struct platform_device_id board_ids[] = {
> SOF_RT5682_SSP_AMP(2) |
> SOF_RT5682_NUM_HDMIDEV(4)),
> },
> + {
> + .name = "adl_max98360a_rt5682",
> + .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
> + SOF_RT5682_SSP_CODEC(0) |
> + SOF_SPEAKER_AMP_PRESENT |
> + SOF_RT5682_SSP_AMP(2) |
> + SOF_MAX98360A_SPEAKER_AMP_PRESENT |
> + SOF_RT5682_NUM_HDMIDEV(4)),
Can you clarify why BT offload is missing?
if it's supported in hardware, it doesn't hurt to add a capability in
the machine driver, you can always disable it in the topology file.
> + },
> { }
> };
> MODULE_DEVICE_TABLE(platform, board_ids);
> 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 a0f6a69c7038..6855c9e65236 100644
> --- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
> +++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
> @@ -280,6 +280,11 @@ static const struct snd_soc_acpi_codecs adl_max98357a_amp = {
> .codecs = {"MX98357A"}
> };
>
> +static const struct snd_soc_acpi_codecs adl_max98360a_amp = {
> + .num_codecs = 1,
> + .codecs = {"MX98360A"}
> +};
> +
> struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
> {
> .id = "10EC5682",
> @@ -297,6 +302,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
> .sof_fw_filename = "sof-adl.ri",
> .sof_tplg_filename = "sof-adl-max98357a-rt5682.tplg",
> },
> + {
> + .id = "10EC5682",
> + .drv_name = "adl_max98360a_rt5682",
> + .machine_quirk = snd_soc_acpi_codec_list,
> + .quirk_data = &adl_max98360a_amp,
> + .sof_fw_filename = "sof-adl.ri",
> + .sof_tplg_filename = "sof-adl-max98357a-rt5682.tplg",
> + },
> {},
> };
> EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_adl_machines);
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp
@ 2021-08-03 13:43 ` Pierre-Louis Bossart
0 siblings, 0 replies; 12+ messages in thread
From: Pierre-Louis Bossart @ 2021-08-03 13:43 UTC (permalink / raw)
To: Malik_Hsu, alsa-devel
Cc: kai.vehmanen, yang.jie, linux-kernel, liam.r.girdwood,
mac.chiang, broonie, brent.lu, bard.liao
On 8/3/21 3:30 AM, Malik_Hsu wrote:
missing commit message?
> Signed-off-by: Malik_Hsu <malik_hsu@wistron.corp-partner.google.com>
> ---
> sound/soc/intel/boards/sof_rt5682.c | 9 +++++++++
> sound/soc/intel/common/soc-acpi-intel-adl-match.c | 13 +++++++++++++
> 2 files changed, 22 insertions(+)
>
> diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
> index 39217223d50c..8d727dd37f12 100644
> --- a/sound/soc/intel/boards/sof_rt5682.c
> +++ b/sound/soc/intel/boards/sof_rt5682.c
> @@ -1043,6 +1043,15 @@ static const struct platform_device_id board_ids[] = {
> SOF_RT5682_SSP_AMP(2) |
> SOF_RT5682_NUM_HDMIDEV(4)),
> },
> + {
> + .name = "adl_max98360a_rt5682",
> + .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
> + SOF_RT5682_SSP_CODEC(0) |
> + SOF_SPEAKER_AMP_PRESENT |
> + SOF_RT5682_SSP_AMP(2) |
> + SOF_MAX98360A_SPEAKER_AMP_PRESENT |
> + SOF_RT5682_NUM_HDMIDEV(4)),
Can you clarify why BT offload is missing?
if it's supported in hardware, it doesn't hurt to add a capability in
the machine driver, you can always disable it in the topology file.
> + },
> { }
> };
> MODULE_DEVICE_TABLE(platform, board_ids);
> 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 a0f6a69c7038..6855c9e65236 100644
> --- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
> +++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
> @@ -280,6 +280,11 @@ static const struct snd_soc_acpi_codecs adl_max98357a_amp = {
> .codecs = {"MX98357A"}
> };
>
> +static const struct snd_soc_acpi_codecs adl_max98360a_amp = {
> + .num_codecs = 1,
> + .codecs = {"MX98360A"}
> +};
> +
> struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
> {
> .id = "10EC5682",
> @@ -297,6 +302,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
> .sof_fw_filename = "sof-adl.ri",
> .sof_tplg_filename = "sof-adl-max98357a-rt5682.tplg",
> },
> + {
> + .id = "10EC5682",
> + .drv_name = "adl_max98360a_rt5682",
> + .machine_quirk = snd_soc_acpi_codec_list,
> + .quirk_data = &adl_max98360a_amp,
> + .sof_fw_filename = "sof-adl.ri",
> + .sof_tplg_filename = "sof-adl-max98357a-rt5682.tplg",
> + },
> {},
> };
> EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_adl_machines);
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp
@ 2021-08-03 8:30 ` Malik_Hsu
0 siblings, 0 replies; 12+ messages in thread
From: Malik_Hsu @ 2021-08-03 8:30 UTC (permalink / raw)
To: alsa-devel
Cc: kai.vehmanen, pierre-louis.bossart, mac.chiang, broonie,
brent.lu, bard.liao, liam.r.girdwood, yang.jie, perex,
linux-kernel, Malik_Hsu
Signed-off-by: Malik_Hsu <malik_hsu@wistron.corp-partner.google.com>
---
sound/soc/intel/boards/sof_rt5682.c | 9 +++++++++
sound/soc/intel/common/soc-acpi-intel-adl-match.c | 13 +++++++++++++
2 files changed, 22 insertions(+)
diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
index 39217223d50c..8d727dd37f12 100644
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -1043,6 +1043,15 @@ static const struct platform_device_id board_ids[] = {
SOF_RT5682_SSP_AMP(2) |
SOF_RT5682_NUM_HDMIDEV(4)),
},
+ {
+ .name = "adl_max98360a_rt5682",
+ .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
+ SOF_RT5682_SSP_CODEC(0) |
+ SOF_SPEAKER_AMP_PRESENT |
+ SOF_RT5682_SSP_AMP(2) |
+ SOF_MAX98360A_SPEAKER_AMP_PRESENT |
+ SOF_RT5682_NUM_HDMIDEV(4)),
+ },
{ }
};
MODULE_DEVICE_TABLE(platform, board_ids);
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 a0f6a69c7038..6855c9e65236 100644
--- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
@@ -280,6 +280,11 @@ static const struct snd_soc_acpi_codecs adl_max98357a_amp = {
.codecs = {"MX98357A"}
};
+static const struct snd_soc_acpi_codecs adl_max98360a_amp = {
+ .num_codecs = 1,
+ .codecs = {"MX98360A"}
+};
+
struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
{
.id = "10EC5682",
@@ -297,6 +302,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
.sof_fw_filename = "sof-adl.ri",
.sof_tplg_filename = "sof-adl-max98357a-rt5682.tplg",
},
+ {
+ .id = "10EC5682",
+ .drv_name = "adl_max98360a_rt5682",
+ .machine_quirk = snd_soc_acpi_codec_list,
+ .quirk_data = &adl_max98360a_amp,
+ .sof_fw_filename = "sof-adl.ri",
+ .sof_tplg_filename = "sof-adl-max98357a-rt5682.tplg",
+ },
{},
};
EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_adl_machines);
--
2.25.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH] ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp
@ 2021-08-03 8:30 ` Malik_Hsu
0 siblings, 0 replies; 12+ messages in thread
From: Malik_Hsu @ 2021-08-03 8:30 UTC (permalink / raw)
To: alsa-devel
Cc: Malik_Hsu, kai.vehmanen, linux-kernel, yang.jie,
pierre-louis.bossart, liam.r.girdwood, mac.chiang, broonie,
brent.lu, bard.liao
Signed-off-by: Malik_Hsu <malik_hsu@wistron.corp-partner.google.com>
---
sound/soc/intel/boards/sof_rt5682.c | 9 +++++++++
sound/soc/intel/common/soc-acpi-intel-adl-match.c | 13 +++++++++++++
2 files changed, 22 insertions(+)
diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
index 39217223d50c..8d727dd37f12 100644
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -1043,6 +1043,15 @@ static const struct platform_device_id board_ids[] = {
SOF_RT5682_SSP_AMP(2) |
SOF_RT5682_NUM_HDMIDEV(4)),
},
+ {
+ .name = "adl_max98360a_rt5682",
+ .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
+ SOF_RT5682_SSP_CODEC(0) |
+ SOF_SPEAKER_AMP_PRESENT |
+ SOF_RT5682_SSP_AMP(2) |
+ SOF_MAX98360A_SPEAKER_AMP_PRESENT |
+ SOF_RT5682_NUM_HDMIDEV(4)),
+ },
{ }
};
MODULE_DEVICE_TABLE(platform, board_ids);
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 a0f6a69c7038..6855c9e65236 100644
--- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
@@ -280,6 +280,11 @@ static const struct snd_soc_acpi_codecs adl_max98357a_amp = {
.codecs = {"MX98357A"}
};
+static const struct snd_soc_acpi_codecs adl_max98360a_amp = {
+ .num_codecs = 1,
+ .codecs = {"MX98360A"}
+};
+
struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
{
.id = "10EC5682",
@@ -297,6 +302,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
.sof_fw_filename = "sof-adl.ri",
.sof_tplg_filename = "sof-adl-max98357a-rt5682.tplg",
},
+ {
+ .id = "10EC5682",
+ .drv_name = "adl_max98360a_rt5682",
+ .machine_quirk = snd_soc_acpi_codec_list,
+ .quirk_data = &adl_max98360a_amp,
+ .sof_fw_filename = "sof-adl.ri",
+ .sof_tplg_filename = "sof-adl-max98357a-rt5682.tplg",
+ },
{},
};
EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_adl_machines);
--
2.25.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2021-10-02 0:19 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-01 15:03 [PATCH] ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp Brent Lu
2021-10-01 15:03 ` Brent Lu
2021-10-01 15:07 ` Lu, Brent
2021-10-01 15:07 ` Lu, Brent
2021-10-01 15:23 ` Pierre-Louis Bossart
2021-10-01 15:23 ` Pierre-Louis Bossart
2021-10-02 0:16 ` Mark Brown
2021-10-02 0:16 ` Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2021-08-03 8:30 Malik_Hsu
2021-08-03 8:30 ` Malik_Hsu
2021-08-03 13:43 ` Pierre-Louis Bossart
2021-08-03 13:43 ` Pierre-Louis Bossart
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.