All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v1] ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp on SSP2
@ 2022-03-24  8:47 ` Ajye Huang
  0 siblings, 0 replies; 8+ messages in thread
From: Ajye Huang @ 2022-03-24  8:47 UTC (permalink / raw)
  To: linux-kernel
  Cc: Cezary Rojewski, Pierre-Louis Bossart, Liam Girdwood, Jie Yang,
	Mark Brown, Jaroslav Kysela, Takashi Iwai, Ranjani Sridharan,
	Kai Vehmanen, Daniel Baluta, Brent Lu, Bard Liao, Yong Zhi,
	Ajye Huang, Mac Chiang, Vamshi Krishna Gopal, alsa-devel,
	sound-open-firmware

Follow Intel's design to replace max98360a amp SSP2 reather than SSP1
by judging DMI_OEM_STRING in sof_rt5682_quirk_table struct.
And reusing max98357's topology since DAI setting could be leveraged.

Signed-off-by: Ajye Huang <ajye_huang@compal.corp-partner.google.com>
---
 sound/soc/intel/boards/sof_rt5682.c | 13 +++++++++++++
 sound/soc/sof/sof-pci-dev.c         |  9 ++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
index ebec4d15edaa..7126fcb63d90 100644
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -212,6 +212,19 @@ static const struct dmi_system_id sof_rt5682_quirk_table[] = {
 					SOF_SSP_BT_OFFLOAD_PRESENT),
 
 	},
+	{
+		.callback = sof_rt5682_quirk_cb,
+		.matches = {
+			DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Brya"),
+			DMI_MATCH(DMI_OEM_STRING, "AUDIO-MAX98360_ALC5682I_I2S_AMP_SSP2"),
+		},
+		.driver_data = (void *)(SOF_RT5682_MCLK_EN |
+					SOF_RT5682_SSP_CODEC(0) |
+					SOF_SPEAKER_AMP_PRESENT |
+					SOF_MAX98360A_SPEAKER_AMP_PRESENT |
+					SOF_RT5682_SSP_AMP(2) |
+					SOF_RT5682_NUM_HDMIDEV(4)),
+	},
 	{}
 };
 
diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c
index 4c9596742844..12f5cff22448 100644
--- a/sound/soc/sof/sof-pci-dev.c
+++ b/sound/soc/sof/sof-pci-dev.c
@@ -83,7 +83,14 @@ static const struct dmi_system_id sof_tplg_table[] = {
 		},
 		.driver_data = "sof-adl-max98357a-rt5682-2way.tplg",
 	},
-
+	{
+		.callback = sof_tplg_cb,
+		.matches = {
+			DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Brya"),
+			DMI_MATCH(DMI_OEM_STRING, "AUDIO-MAX98360_ALC5682I_I2S_AMP_SSP2"),
+		},
+		.driver_data = "sof-adl-max98357a-rt5682.tplg",
+	},
 	{}
 };
 
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH v1] ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp on SSP2
@ 2022-03-24  8:47 ` Ajye Huang
  0 siblings, 0 replies; 8+ messages in thread
From: Ajye Huang @ 2022-03-24  8:47 UTC (permalink / raw)
  To: linux-kernel
  Cc: alsa-devel, Cezary Rojewski, sound-open-firmware, Kai Vehmanen,
	Bard Liao, Takashi Iwai, Jie Yang, Pierre-Louis Bossart,
	Liam Girdwood, Mac Chiang, Mark Brown, Ranjani Sridharan,
	Ajye Huang, Daniel Baluta, Brent Lu, Vamshi Krishna Gopal,
	Yong Zhi

Follow Intel's design to replace max98360a amp SSP2 reather than SSP1
by judging DMI_OEM_STRING in sof_rt5682_quirk_table struct.
And reusing max98357's topology since DAI setting could be leveraged.

Signed-off-by: Ajye Huang <ajye_huang@compal.corp-partner.google.com>
---
 sound/soc/intel/boards/sof_rt5682.c | 13 +++++++++++++
 sound/soc/sof/sof-pci-dev.c         |  9 ++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
index ebec4d15edaa..7126fcb63d90 100644
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -212,6 +212,19 @@ static const struct dmi_system_id sof_rt5682_quirk_table[] = {
 					SOF_SSP_BT_OFFLOAD_PRESENT),
 
 	},
+	{
+		.callback = sof_rt5682_quirk_cb,
+		.matches = {
+			DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Brya"),
+			DMI_MATCH(DMI_OEM_STRING, "AUDIO-MAX98360_ALC5682I_I2S_AMP_SSP2"),
+		},
+		.driver_data = (void *)(SOF_RT5682_MCLK_EN |
+					SOF_RT5682_SSP_CODEC(0) |
+					SOF_SPEAKER_AMP_PRESENT |
+					SOF_MAX98360A_SPEAKER_AMP_PRESENT |
+					SOF_RT5682_SSP_AMP(2) |
+					SOF_RT5682_NUM_HDMIDEV(4)),
+	},
 	{}
 };
 
diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c
index 4c9596742844..12f5cff22448 100644
--- a/sound/soc/sof/sof-pci-dev.c
+++ b/sound/soc/sof/sof-pci-dev.c
@@ -83,7 +83,14 @@ static const struct dmi_system_id sof_tplg_table[] = {
 		},
 		.driver_data = "sof-adl-max98357a-rt5682-2way.tplg",
 	},
-
+	{
+		.callback = sof_tplg_cb,
+		.matches = {
+			DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Brya"),
+			DMI_MATCH(DMI_OEM_STRING, "AUDIO-MAX98360_ALC5682I_I2S_AMP_SSP2"),
+		},
+		.driver_data = "sof-adl-max98357a-rt5682.tplg",
+	},
 	{}
 };
 
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* Re: [PATCH v1] ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp on SSP2
  2022-03-24  8:47 ` Ajye Huang
@ 2022-03-30  3:55   ` ajye huang
  -1 siblings, 0 replies; 8+ messages in thread
From: ajye huang @ 2022-03-30  3:55 UTC (permalink / raw)
  To: Linux Kernel Mailing List
  Cc: Cezary Rojewski, Pierre-Louis Bossart, Liam Girdwood, Jie Yang,
	Mark Brown, Jaroslav Kysela, Takashi Iwai, Ranjani Sridharan,
	Kai Vehmanen, Daniel Baluta, Brent Lu, Bard Liao, Yong Zhi,
	Ajye Huang, Mac Chiang, Vamshi Krishna Gopal, ALSA development,
	sound-open-firmware

The relevant modification on coreboot FW was merged on coreboot
upstream,https://review.coreboot.org/c/coreboot/+/62998.
Based on coreboot modification, the OEM string
"AUDIO-MAX98360_ALC5682I_I2S_AMP_SSP2" is correct by cmd dmidecode -t
11.

Could reviewers kindly review this Linux patch? thanks

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH v1] ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp on SSP2
@ 2022-03-30  3:55   ` ajye huang
  0 siblings, 0 replies; 8+ messages in thread
From: ajye huang @ 2022-03-30  3:55 UTC (permalink / raw)
  To: Linux Kernel Mailing List
  Cc: ALSA development, Cezary Rojewski, sound-open-firmware,
	Kai Vehmanen, Bard Liao, Takashi Iwai, Jie Yang,
	Pierre-Louis Bossart, Liam Girdwood, Mac Chiang, Mark Brown,
	Ranjani Sridharan, Ajye Huang, Daniel Baluta, Brent Lu,
	Vamshi Krishna Gopal, Yong Zhi

The relevant modification on coreboot FW was merged on coreboot
upstream,https://review.coreboot.org/c/coreboot/+/62998.
Based on coreboot modification, the OEM string
"AUDIO-MAX98360_ALC5682I_I2S_AMP_SSP2" is correct by cmd dmidecode -t
11.

Could reviewers kindly review this Linux patch? thanks

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH v1] ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp on SSP2
  2022-03-24  8:47 ` Ajye Huang
@ 2022-04-04 15:58   ` Pierre-Louis Bossart
  -1 siblings, 0 replies; 8+ messages in thread
From: Pierre-Louis Bossart @ 2022-04-04 15:58 UTC (permalink / raw)
  To: Ajye Huang, linux-kernel
  Cc: alsa-devel, Cezary Rojewski, sound-open-firmware, Kai Vehmanen,
	Bard Liao, Jie Yang, Takashi Iwai, Liam Girdwood, Mac Chiang,
	Mark Brown, Ranjani Sridharan, Ajye Huang, Daniel Baluta,
	Brent Lu, Vamshi Krishna Gopal, Yong Zhi



On 3/24/22 03:47, Ajye Huang wrote:
> Follow Intel's design to replace max98360a amp SSP2 reather than SSP1
> by judging DMI_OEM_STRING in sof_rt5682_quirk_table struct.
> And reusing max98357's topology since DAI setting could be leveraged.
> 
> Signed-off-by: Ajye Huang <ajye_huang@compal.corp-partner.google.com>

Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

> ---
>   sound/soc/intel/boards/sof_rt5682.c | 13 +++++++++++++
>   sound/soc/sof/sof-pci-dev.c         |  9 ++++++++-
>   2 files changed, 21 insertions(+), 1 deletion(-)
> 
> diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
> index ebec4d15edaa..7126fcb63d90 100644
> --- a/sound/soc/intel/boards/sof_rt5682.c
> +++ b/sound/soc/intel/boards/sof_rt5682.c
> @@ -212,6 +212,19 @@ static const struct dmi_system_id sof_rt5682_quirk_table[] = {
>   					SOF_SSP_BT_OFFLOAD_PRESENT),
>   
>   	},
> +	{
> +		.callback = sof_rt5682_quirk_cb,
> +		.matches = {
> +			DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Brya"),
> +			DMI_MATCH(DMI_OEM_STRING, "AUDIO-MAX98360_ALC5682I_I2S_AMP_SSP2"),
> +		},
> +		.driver_data = (void *)(SOF_RT5682_MCLK_EN |
> +					SOF_RT5682_SSP_CODEC(0) |
> +					SOF_SPEAKER_AMP_PRESENT |
> +					SOF_MAX98360A_SPEAKER_AMP_PRESENT |
> +					SOF_RT5682_SSP_AMP(2) |
> +					SOF_RT5682_NUM_HDMIDEV(4)),
> +	},
>   	{}
>   };
>   
> diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c
> index 4c9596742844..12f5cff22448 100644
> --- a/sound/soc/sof/sof-pci-dev.c
> +++ b/sound/soc/sof/sof-pci-dev.c
> @@ -83,7 +83,14 @@ static const struct dmi_system_id sof_tplg_table[] = {
>   		},
>   		.driver_data = "sof-adl-max98357a-rt5682-2way.tplg",
>   	},
> -
> +	{
> +		.callback = sof_tplg_cb,
> +		.matches = {
> +			DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Brya"),
> +			DMI_MATCH(DMI_OEM_STRING, "AUDIO-MAX98360_ALC5682I_I2S_AMP_SSP2"),
> +		},
> +		.driver_data = "sof-adl-max98357a-rt5682.tplg",
> +	},
>   	{}
>   };
>   

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH v1] ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp on SSP2
@ 2022-04-04 15:58   ` Pierre-Louis Bossart
  0 siblings, 0 replies; 8+ messages in thread
From: Pierre-Louis Bossart @ 2022-04-04 15:58 UTC (permalink / raw)
  To: Ajye Huang, linux-kernel
  Cc: Cezary Rojewski, Liam Girdwood, Jie Yang, Mark Brown,
	Jaroslav Kysela, Takashi Iwai, Ranjani Sridharan, Kai Vehmanen,
	Daniel Baluta, Brent Lu, Bard Liao, Yong Zhi, Ajye Huang,
	Mac Chiang, Vamshi Krishna Gopal, alsa-devel,
	sound-open-firmware



On 3/24/22 03:47, Ajye Huang wrote:
> Follow Intel's design to replace max98360a amp SSP2 reather than SSP1
> by judging DMI_OEM_STRING in sof_rt5682_quirk_table struct.
> And reusing max98357's topology since DAI setting could be leveraged.
> 
> Signed-off-by: Ajye Huang <ajye_huang@compal.corp-partner.google.com>

Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

> ---
>   sound/soc/intel/boards/sof_rt5682.c | 13 +++++++++++++
>   sound/soc/sof/sof-pci-dev.c         |  9 ++++++++-
>   2 files changed, 21 insertions(+), 1 deletion(-)
> 
> diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
> index ebec4d15edaa..7126fcb63d90 100644
> --- a/sound/soc/intel/boards/sof_rt5682.c
> +++ b/sound/soc/intel/boards/sof_rt5682.c
> @@ -212,6 +212,19 @@ static const struct dmi_system_id sof_rt5682_quirk_table[] = {
>   					SOF_SSP_BT_OFFLOAD_PRESENT),
>   
>   	},
> +	{
> +		.callback = sof_rt5682_quirk_cb,
> +		.matches = {
> +			DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Brya"),
> +			DMI_MATCH(DMI_OEM_STRING, "AUDIO-MAX98360_ALC5682I_I2S_AMP_SSP2"),
> +		},
> +		.driver_data = (void *)(SOF_RT5682_MCLK_EN |
> +					SOF_RT5682_SSP_CODEC(0) |
> +					SOF_SPEAKER_AMP_PRESENT |
> +					SOF_MAX98360A_SPEAKER_AMP_PRESENT |
> +					SOF_RT5682_SSP_AMP(2) |
> +					SOF_RT5682_NUM_HDMIDEV(4)),
> +	},
>   	{}
>   };
>   
> diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c
> index 4c9596742844..12f5cff22448 100644
> --- a/sound/soc/sof/sof-pci-dev.c
> +++ b/sound/soc/sof/sof-pci-dev.c
> @@ -83,7 +83,14 @@ static const struct dmi_system_id sof_tplg_table[] = {
>   		},
>   		.driver_data = "sof-adl-max98357a-rt5682-2way.tplg",
>   	},
> -
> +	{
> +		.callback = sof_tplg_cb,
> +		.matches = {
> +			DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Brya"),
> +			DMI_MATCH(DMI_OEM_STRING, "AUDIO-MAX98360_ALC5682I_I2S_AMP_SSP2"),
> +		},
> +		.driver_data = "sof-adl-max98357a-rt5682.tplg",
> +	},
>   	{}
>   };
>   

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH v1] ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp on SSP2
  2022-03-24  8:47 ` Ajye Huang
@ 2022-04-07  9:38   ` Mark Brown
  -1 siblings, 0 replies; 8+ messages in thread
From: Mark Brown @ 2022-04-07  9:38 UTC (permalink / raw)
  To: ajye.huang, linux-kernel
  Cc: mac.chiang, vamshi.krishna.gopal, daniel.baluta, Jaroslav Kysela,
	ranjani.sridharan, yung-chuan.liao, sound-open-firmware,
	alsa-devel, Takashi Iwai, yang.jie, yong.zhi, liam.r.girdwood,
	pierre-louis.bossart, kai.vehmanen, brent.lu, ajye_huang,
	cezary.rojewski

On Thu, 24 Mar 2022 16:47:08 +0800, Ajye Huang wrote:
> Follow Intel's design to replace max98360a amp SSP2 reather than SSP1
> by judging DMI_OEM_STRING in sof_rt5682_quirk_table struct.
> And reusing max98357's topology since DAI setting could be leveraged.
> 
> 

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 on SSP2
      commit: fcd1e39cca6e3a262f2badfcd5edd76c910ad3bc

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] 8+ messages in thread
* Re: [PATCH v1] ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp on SSP2
@ 2022-04-07  9:38   ` Mark Brown
  0 siblings, 0 replies; 8+ messages in thread
From: Mark Brown @ 2022-04-07  9:38 UTC (permalink / raw)
  To: ajye.huang, linux-kernel
  Cc: pierre-louis.bossart, alsa-devel, ajye_huang, kai.vehmanen,
	daniel.baluta, cezary.rojewski, Takashi Iwai, yang.jie,
	ranjani.sridharan, liam.r.girdwood, mac.chiang, yong.zhi,
	yung-chuan.liao, brent.lu, vamshi.krishna.gopal,
	sound-open-firmware

On Thu, 24 Mar 2022 16:47:08 +0800, Ajye Huang wrote:
> Follow Intel's design to replace max98360a amp SSP2 reather than SSP1
> by judging DMI_OEM_STRING in sof_rt5682_quirk_table struct.
> And reusing max98357's topology since DAI setting could be leveraged.
> 
> 

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 on SSP2
      commit: fcd1e39cca6e3a262f2badfcd5edd76c910ad3bc

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] 8+ messages in thread
end of thread, other threads:[~2022-04-07  9:39 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-24  8:47 [PATCH v1] ASoC: Intel: sof_rt5682: Add support for max98360a speaker amp on SSP2 Ajye Huang
2022-03-24  8:47 ` Ajye Huang
2022-03-30  3:55 ` ajye huang
2022-03-30  3:55   ` ajye huang
2022-04-04 15:58 ` Pierre-Louis Bossart
2022-04-04 15:58   ` Pierre-Louis Bossart
2022-04-07  9:38 ` Mark Brown
2022-04-07  9:38   ` Mark Brown

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.