Skip to contentSkip to conversation

ASoC: Intel: bxt-da7219-max98357a: support MAX98390 speaker amp

PATCH In review Brent Lu 4 participants 5 messages Jul 1, 2020 – Jul 7, 2020

Subsystems (3)
lore
Share & tools
lore

Brent Lu

author
#0 lore raw

PATCH v2 1/1 ASoC: Intel: bxt-da7219-max98357a: support MAX98390 speaker amp

Support MAX98390 speaker amplifier on cometlake platform. Driver now detects amplifier type in the probe function and installs corresponding controls and DAPM widgets/routes in the late_probe function.

---
 sound/soc/intel/boards/Kconfig                    |   5 +-
 sound/soc/intel/boards/bxt_da7219_max98357a.c     | 117 ++++++++++++++++++++--
 sound/soc/intel/common/soc-acpi-intel-cml-match.c |  13 +++
 3 files changed, 127 insertions(+), 8 deletions(-)
sound/soc/intel/boards/Kconfig +3 -2
index 3d820e1..f176df2 100644
@@ -288,6 +288,7 @@ config SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
 	tristate
 	select SND_SOC_DA7219
 	select SND_SOC_MAX98357A
+	select SND_SOC_MAX98390
 	select SND_SOC_DMIC
 	select SND_SOC_HDAC_HDMI
 
@@ -298,14 +299,14 @@ config SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
 if SND_SOC_INTEL_APL
 
 config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
-	tristate "Broxton with DA7219 and MAX98357A in I2S Mode"
+	tristate "Broxton with DA7219 and MAX98357A/MAX98390 in I2S Mode"
 	depends on I2C && ACPI && GPIOLIB
 	depends on MFD_INTEL_LPSS || COMPILE_TEST
 	depends on SND_HDA_CODEC_HDMI
 	select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
 	help
 	   This adds support for ASoC machine driver for Broxton-P platforms
-	   with DA7219 + MAX98357A I2S audio codec.
+	   with DA7219 + MAX98357A/MAX98390 I2S audio codec.
 	   Say Y or m if you have such a device. This is a recommended option.
 	   If unsure select "N".
 
sound/soc/intel/boards/bxt_da7219_max98357a.c +111 -6

205 lines not on this page · raw message

sound/soc/intel/common/soc-acpi-intel-cml-match.c +13 -0
index cdea0c0..dee1f0f 100644
@@ -19,6 +19,11 @@ static struct snd_soc_acpi_codecs max98357a_spk_codecs = {
 	.codecs = {"MX98357A"}
 };
 
+static struct snd_soc_acpi_codecs max98390_spk_codecs = {
+	.num_codecs = 1,
+	.codecs = {"MX98390"}
+};
+
 /*
  * The order of the three entries with .id = "10EC5682" matters
  * here, because DSDT tables expose an ACPI HID for the MAX98357A
@@ -55,6 +60,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_machines[] = {
 		.sof_fw_filename = "sof-cml.ri",
 		.sof_tplg_filename = "sof-cml-da7219-max98357a.tplg",
 	},
+	{
+		.id = "DLGS7219",
+		.drv_name = "cml_da7219_max98357a",
+		.machine_quirk = snd_soc_acpi_codec_list,
+		.quirk_data = &max98390_spk_codecs,
+		.sof_fw_filename = "sof-cml.ri",
+		.sof_tplg_filename = "sof-cml-da7219-max98357a.tplg",
+	},
 	{},
 };
 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_cml_machines);
Signature · 1 line
2.7.4
maintainer
#2 lore raw
In reply to Brent Lu
Quoted 3 lines · Brent Lu

Support MAX98390 speaker amplifier on cometlake platform. Driver now detects amplifier type in the probe function and installs corresponding controls and DAPM widgets/routes in the late_probe function.

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: Intel: bxt-da7219-max98357a: support MAX98390 speaker amp

      commit: e1435a1feb18e198155d16d3d6b500d46e0625c0

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

#3 lore raw
In reply to Brent Lu

Hi Brent,

url:    https://github.com/0day-ci/linux/commits/Brent-Lu/ASoC-Intel-bxt-da7219-max98357a-support-MAX98390-speaker-amp/20200701-174420
base:   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
config: i386-randconfig-m021-20200701 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-14) 9.3.0

If you fix the issue, kindly add following tag as appropriate

smatch warnings:
sound/soc/intel/boards/bxt_da7219_max98357a.c:683 bxt_card_late_probe() error: uninitialized symbol 'widgets'. sound/soc/intel/boards/bxt_da7219_max98357a.c:683 bxt_card_late_probe() error: uninitialized symbol 'num_widgets'. sound/soc/intel/boards/bxt_da7219_max98357a.c:689 bxt_card_late_probe() error: uninitialized symbol 'controls'. sound/soc/intel/boards/bxt_da7219_max98357a.c:689 bxt_card_late_probe() error: uninitialized symbol 'num_controls'. sound/soc/intel/boards/bxt_da7219_max98357a.c:695 bxt_card_late_probe() error: uninitialized symbol 'routes'. sound/soc/intel/boards/bxt_da7219_max98357a.c:695 bxt_card_late_probe() error: uninitialized symbol 'num_routes'.

# https://github.com/0day-ci/linux/commit/27dccaf17142fa2cfe38b279782b1d72aa6dd041
git remote add linux-review https://github.com/0day-ci/linux
git remote update linux-review
git checkout 27dccaf17142fa2cfe38b279782b1d72aa6dd041
vim +/widgets +683 sound/soc/intel/boards/bxt_da7219_max98357a.c

ba210346779464 Jeeja KP              2017-01-24  650  static int bxt_card_late_probe(struct snd_soc_card *card)
ba210346779464 Jeeja KP              2017-01-24  651  {
ba210346779464 Jeeja KP              2017-01-24  652  	struct bxt_card_private *ctx = snd_soc_card_get_drvdata(card);
ba210346779464 Jeeja KP              2017-01-24  653  	struct bxt_hdmi_pcm *pcm;
4510112217116d Kuninori Morimoto     2018-01-29  654  	struct snd_soc_component *component = NULL;
27dccaf17142fa Brent Lu              2020-07-01  655  	const struct snd_kcontrol_new *controls;
27dccaf17142fa Brent Lu              2020-07-01  656  	const struct snd_soc_dapm_widget *widgets;
27dccaf17142fa Brent Lu              2020-07-01  657  	const struct snd_soc_dapm_route *routes;
27dccaf17142fa Brent Lu              2020-07-01  658  	int num_controls, num_widgets, num_routes, err, i = 0;
625de2bf2ed163 Jeeja KP              2017-02-07  659  	char jack_name[NAME_SIZE];
ba210346779464 Jeeja KP              2017-01-24  660  
27dccaf17142fa Brent Lu              2020-07-01  661  	switch (ctx->spkamp) {
27dccaf17142fa Brent Lu              2020-07-01  662  	case SPKAMP_MAX98357A:
27dccaf17142fa Brent Lu              2020-07-01  663  		controls = max98357a_controls;
27dccaf17142fa Brent Lu              2020-07-01  664  		num_controls = ARRAY_SIZE(max98357a_controls);
27dccaf17142fa Brent Lu              2020-07-01  665  		widgets = max98357a_widgets;
27dccaf17142fa Brent Lu              2020-07-01  666  		num_widgets = ARRAY_SIZE(max98357a_widgets);
27dccaf17142fa Brent Lu              2020-07-01  667  		routes = max98357a_routes;
27dccaf17142fa Brent Lu              2020-07-01  668  		num_routes = ARRAY_SIZE(max98357a_routes);
27dccaf17142fa Brent Lu              2020-07-01  669  		break;
27dccaf17142fa Brent Lu              2020-07-01  670  	case SPKAMP_MAX98390:
27dccaf17142fa Brent Lu              2020-07-01  671  		controls = max98390_controls;
27dccaf17142fa Brent Lu              2020-07-01  672  		num_controls = ARRAY_SIZE(max98390_controls);
27dccaf17142fa Brent Lu              2020-07-01  673  		widgets = max98390_widgets;
27dccaf17142fa Brent Lu              2020-07-01  674  		num_widgets = ARRAY_SIZE(max98390_widgets);
27dccaf17142fa Brent Lu              2020-07-01  675  		routes = max98390_routes;
27dccaf17142fa Brent Lu              2020-07-01  676  		num_routes = ARRAY_SIZE(max98390_routes);
27dccaf17142fa Brent Lu              2020-07-01  677  		break;
27dccaf17142fa Brent Lu              2020-07-01  678  	default:
27dccaf17142fa Brent Lu              2020-07-01  679  		dev_err(card->dev, "Invalid speaker amplifier %d\n", ctx->spkamp);
27dccaf17142fa Brent Lu              2020-07-01  680  		break;

return -EINVAL; ?

27dccaf17142fa Brent Lu              2020-07-01  681  	}
27dccaf17142fa Brent Lu              2020-07-01  682  
27dccaf17142fa Brent Lu              2020-07-01 @683  	err = snd_soc_dapm_new_controls(&card->dapm, widgets, num_widgets);
27dccaf17142fa Brent Lu              2020-07-01  684  	if (err) {
27dccaf17142fa Brent Lu              2020-07-01  685  		dev_err(card->dev, "Fail to new widgets\n");
27dccaf17142fa Brent Lu              2020-07-01  686  		return err;
27dccaf17142fa Brent Lu              2020-07-01  687  	}
27dccaf17142fa Brent Lu              2020-07-01  688  
27dccaf17142fa Brent Lu              2020-07-01 @689  	err = snd_soc_add_card_controls(card, controls, num_controls);
27dccaf17142fa Brent Lu              2020-07-01  690  	if (err) {
27dccaf17142fa Brent Lu              2020-07-01  691  		dev_err(card->dev, "Fail to add controls\n");
27dccaf17142fa Brent Lu              2020-07-01  692  		return err;
27dccaf17142fa Brent Lu              2020-07-01  693  	}
27dccaf17142fa Brent Lu              2020-07-01  694  
27dccaf17142fa Brent Lu              2020-07-01 @695  	err = snd_soc_dapm_add_routes(&card->dapm, routes, num_routes);
27dccaf17142fa Brent Lu              2020-07-01  696  	if (err) {
27dccaf17142fa Brent Lu              2020-07-01  697  		dev_err(card->dev, "Fail to add routes\n");
27dccaf17142fa Brent Lu              2020-07-01  698  		return err;
27dccaf17142fa Brent Lu              2020-07-01  699  	}
27dccaf17142fa Brent Lu              2020-07-01  700  
536cfd2f375d36 Pierre-Louis Bossart  2019-05-30  701  	if (soc_intel_is_glk())
c011245a197017 Yong Zhi              2019-02-13  702  		snd_soc_dapm_add_routes(&card->dapm, gemini_map,
c011245a197017 Yong Zhi              2019-02-13  703  					ARRAY_SIZE(gemini_map));
c011245a197017 Yong Zhi              2019-02-13  704  	else
c011245a197017 Yong Zhi              2019-02-13  705  		snd_soc_dapm_add_routes(&card->dapm, broxton_map,
c011245a197017 Yong Zhi              2019-02-13  706  					ARRAY_SIZE(broxton_map));
c011245a197017 Yong Zhi              2019-02-13  707  
98ff5c262f27aa Guennadi Liakhovetski 2020-01-24  708  	if (list_empty(&ctx->hdmi_pcm_list))
98ff5c262f27aa Guennadi Liakhovetski 2020-01-24  709  		return -EINVAL;
98ff5c262f27aa Guennadi Liakhovetski 2020-01-24  710  
98ff5c262f27aa Guennadi Liakhovetski 2020-01-24  711  	if (ctx->common_hdmi_codec_drv) {
57ad18906f2427 Kai Vehmanen          2019-10-29  712  		pcm = list_first_entry(&ctx->hdmi_pcm_list, struct bxt_hdmi_pcm,
57ad18906f2427 Kai Vehmanen          2019-10-29  713  				       head);
57ad18906f2427 Kai Vehmanen          2019-10-29  714  		component = pcm->codec_dai->component;
57ad18906f2427 Kai Vehmanen          2019-10-29  715  		return hda_dsp_hdmi_build_controls(card, component);
98ff5c262f27aa Guennadi Liakhovetski 2020-01-24  716  	}
57ad18906f2427 Kai Vehmanen          2019-10-29  717  
ba210346779464 Jeeja KP              2017-01-24  718  	list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) {
4510112217116d Kuninori Morimoto     2018-01-29  719  		component = pcm->codec_dai->component;
625de2bf2ed163 Jeeja KP              2017-02-07  720  		snprintf(jack_name, sizeof(jack_name),
625de2bf2ed163 Jeeja KP              2017-02-07  721  			"HDMI/DP, pcm=%d Jack", pcm->device);
625de2bf2ed163 Jeeja KP              2017-02-07  722  		err = snd_soc_card_jack_new(card, jack_name,
625de2bf2ed163 Jeeja KP              2017-02-07  723  					SND_JACK_AVOUT, &broxton_hdmi[i],
625de2bf2ed163 Jeeja KP              2017-02-07  724  					NULL, 0);
625de2bf2ed163 Jeeja KP              2017-02-07  725  
625de2bf2ed163 Jeeja KP              2017-02-07  726  		if (err)
625de2bf2ed163 Jeeja KP              2017-02-07  727  			return err;
625de2bf2ed163 Jeeja KP              2017-02-07  728  
625de2bf2ed163 Jeeja KP              2017-02-07  729  		err = hdac_hdmi_jack_init(pcm->codec_dai, pcm->device,
625de2bf2ed163 Jeeja KP              2017-02-07  730  						&broxton_hdmi[i]);
ba210346779464 Jeeja KP              2017-01-24  731  		if (err < 0)
ba210346779464 Jeeja KP              2017-01-24  732  			return err;
625de2bf2ed163 Jeeja KP              2017-02-07  733  
625de2bf2ed163 Jeeja KP              2017-02-07  734  		i++;
ba210346779464 Jeeja KP              2017-01-24  735  	}
ba210346779464 Jeeja KP              2017-01-24  736  
4510112217116d Kuninori Morimoto     2018-01-29  737  	return hdac_hdmi_jack_port_init(component, &card->dapm);
ba210346779464 Jeeja KP              2017-01-24  738  }

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

#4 lore raw
Quoted 8 lines


27dccaf17142fa Brent Lu              2020-07-01  678  	default:
27dccaf17142fa Brent Lu              2020-07-01  679  		dev_err(card->dev, "Invalid speaker amplifier %d\n", ctx->spkamp);
27dccaf17142fa Brent Lu              2020-07-01  680  		break;

return -EINVAL; ?

yes, this was fixed by Colin King on July 2

[PATCH][next] ASoC: Intel: bxt-da7219-max98357a: return -EINVAL on unrecognized speaker amplifier