Unverified Commit f316c9d9 authored by Mac Chiang's avatar Mac Chiang Committed by Mark Brown
Browse files

ASoC: Intel: boards: add max98390 2/4 speakers support 



support 2 hw boards.
1. SSP2 connects max98390, 2 speakers.
2. SSP1 connects max98390, 2/4 speakers.

2 or 4 speakers playback
add echo reference capture
add bt offload support
add DMI_OEM_STRING for board variants
add ALC5682I-VS support

Signed-off-by: default avatarMark Hsieh <mark_hsieh@wistron.corp-partner.google.com>
Signed-off-by: default avatarMac Chiang <mac.chiang@intel.com>
Signed-off-by: default avatarKieth Tzeng <keith.tzeng@quantatw.com>
Signed-off-by: default avatarBrent Lu <brent.lu@intel.com>
Acked-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20211125030453.4382-1-mac.chiang@intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 91745b03

sound/soc/intel/boards/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -467,6 +467,7 @@ config SND_SOC_INTEL_SOF_RT5682_MACH 
		    (MFD_INTEL_LPSS || COMPILE_TEST)) ||\

		   (SND_SOC_SOF_BAYTRAIL && (X86_INTEL_LPSS || COMPILE_TEST))

	select SND_SOC_MAX98373_I2C

	select SND_SOC_MAX98390

	select SND_SOC_RT1011

	select SND_SOC_RT1015

	select SND_SOC_RT1015P

sound/soc/intel/boards/sof_maxim_common.c

+180 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/string.h>

#include <sound/pcm.h>

#include <sound/soc.h>

#include <sound/soc-acpi.h>

#include <sound/soc-dai.h>

#include <sound/soc-dapm.h>

#include <uapi/sound/asound.h>
@@ -133,6 +134,185 @@ void max_98373_set_codec_conf(struct snd_soc_card *card) 
}

EXPORT_SYMBOL_NS(max_98373_set_codec_conf, SND_SOC_INTEL_SOF_MAXIM_COMMON);



/*

 * Maxim MAX98390

 */

const struct snd_soc_dapm_route max_98390_dapm_routes[] = {

	/* speaker */

	{ "Left Spk", NULL, "Left BE_OUT" },

	{ "Right Spk", NULL, "Right BE_OUT" },

};



static const struct snd_kcontrol_new max_98390_tt_kcontrols[] = {

	SOC_DAPM_PIN_SWITCH("TL Spk"),

	SOC_DAPM_PIN_SWITCH("TR Spk"),

};



static const struct snd_soc_dapm_widget max_98390_tt_dapm_widgets[] = {

	SND_SOC_DAPM_SPK("TL Spk", NULL),

	SND_SOC_DAPM_SPK("TR Spk", NULL),

};



const struct snd_soc_dapm_route max_98390_tt_dapm_routes[] = {

	/* Tweeter speaker */

	{ "TL Spk", NULL, "Tweeter Left BE_OUT" },

	{ "TR Spk", NULL, "Tweeter Right BE_OUT" },

};



static struct snd_soc_codec_conf max_98390_codec_conf[] = {

	{

		.dlc = COMP_CODEC_CONF(MAX_98390_DEV0_NAME),

		.name_prefix = "Right",

	},

	{

		.dlc = COMP_CODEC_CONF(MAX_98390_DEV1_NAME),

		.name_prefix = "Left",

	},

};



static struct snd_soc_codec_conf max_98390_4spk_codec_conf[] = {

	{

		.dlc = COMP_CODEC_CONF(MAX_98390_DEV0_NAME),

		.name_prefix = "Right",

	},

	{

		.dlc = COMP_CODEC_CONF(MAX_98390_DEV1_NAME),

		.name_prefix = "Left",

	},

	{

		.dlc = COMP_CODEC_CONF(MAX_98390_DEV2_NAME),

		.name_prefix = "Tweeter Right",

	},

	{

		.dlc = COMP_CODEC_CONF(MAX_98390_DEV3_NAME),

		.name_prefix = "Tweeter Left",

	},

};



struct snd_soc_dai_link_component max_98390_components[] = {

	{

		.name = MAX_98390_DEV0_NAME,

		.dai_name = MAX_98390_CODEC_DAI,

	},

	{

		.name = MAX_98390_DEV1_NAME,

		.dai_name = MAX_98390_CODEC_DAI,

	},

};

EXPORT_SYMBOL_NS(max_98390_components, SND_SOC_INTEL_SOF_MAXIM_COMMON);



struct snd_soc_dai_link_component max_98390_4spk_components[] = {

	{

		.name = MAX_98390_DEV0_NAME,

		.dai_name = MAX_98390_CODEC_DAI,

	},

	{

		.name = MAX_98390_DEV1_NAME,

		.dai_name = MAX_98390_CODEC_DAI,

	},

	{

		.name = MAX_98390_DEV2_NAME,

		.dai_name = MAX_98390_CODEC_DAI,

	},

	{

		.name = MAX_98390_DEV3_NAME,

		.dai_name = MAX_98390_CODEC_DAI,

	},

};

EXPORT_SYMBOL_NS(max_98390_4spk_components, SND_SOC_INTEL_SOF_MAXIM_COMMON);



static int max_98390_hw_params(struct snd_pcm_substream *substream,

			       struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_dai *codec_dai;

	int i;



	for_each_rtd_codec_dais(rtd, i, codec_dai) {

		if (i >= ARRAY_SIZE(max_98390_4spk_components)) {

			dev_err(codec_dai->dev, "invalid codec index %d\n", i);

			return -ENODEV;

		}



		if (!strcmp(codec_dai->component->name, MAX_98390_DEV0_NAME)) {

			/* DEV0 tdm slot configuration Right */

			snd_soc_dai_set_tdm_slot(codec_dai, 0x01, 3, 4, 32);

		}

		if (!strcmp(codec_dai->component->name, MAX_98390_DEV1_NAME)) {

			/* DEV1 tdm slot configuration Left */

			snd_soc_dai_set_tdm_slot(codec_dai, 0x02, 3, 4, 32);

		}



		if (!strcmp(codec_dai->component->name, MAX_98390_DEV2_NAME)) {

			/* DEVi2 tdm slot configuration Tweeter Right */

			snd_soc_dai_set_tdm_slot(codec_dai, 0x04, 3, 4, 32);

		}

		if (!strcmp(codec_dai->component->name, MAX_98390_DEV3_NAME)) {

			/* DEV3 tdm slot configuration Tweeter Left */

			snd_soc_dai_set_tdm_slot(codec_dai, 0x08, 3, 4, 32);

		}

	}

	return 0;

}



int max_98390_spk_codec_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_card *card = rtd->card;

	int ret;



	/* add regular speakers dapm route */

	ret = snd_soc_dapm_add_routes(&card->dapm, max_98390_dapm_routes,

				      ARRAY_SIZE(max_98390_dapm_routes));

	if (ret) {

		dev_err(rtd->dev, "unable to add Left/Right Speaker dapm, ret %d\n", ret);

		return ret;

	}



	/* add widgets/controls/dapm for tweeter speakers */

	if (acpi_dev_present("MX98390", "3", -1)) {

		ret = snd_soc_dapm_new_controls(&card->dapm, max_98390_tt_dapm_widgets,

						ARRAY_SIZE(max_98390_tt_dapm_widgets));



		if (ret) {

			dev_err(rtd->dev, "unable to add tweeter dapm controls, ret %d\n", ret);

			/* Don't need to add routes if widget addition failed */

			return ret;

		}



		ret = snd_soc_add_card_controls(card, max_98390_tt_kcontrols,

						ARRAY_SIZE(max_98390_tt_kcontrols));

		if (ret) {

			dev_err(rtd->dev, "unable to add tweeter card controls, ret %d\n", ret);

			return ret;

		}



		ret = snd_soc_dapm_add_routes(&card->dapm, max_98390_tt_dapm_routes,

					      ARRAY_SIZE(max_98390_tt_dapm_routes));

		if (ret)

			dev_err(rtd->dev,

				"unable to add Tweeter Left/Right Speaker dapm, ret %d\n", ret);

	}

	return ret;

}

EXPORT_SYMBOL_NS(max_98390_spk_codec_init, SND_SOC_INTEL_SOF_MAXIM_COMMON);



const struct snd_soc_ops max_98390_ops = {

	.hw_params = max_98390_hw_params,

};

EXPORT_SYMBOL_NS(max_98390_ops, SND_SOC_INTEL_SOF_MAXIM_COMMON);



void max_98390_set_codec_conf(struct snd_soc_card *card, int ch)

{

	if (ch == ARRAY_SIZE(max_98390_4spk_codec_conf)) {

		card->codec_conf = max_98390_4spk_codec_conf;

		card->num_configs = ARRAY_SIZE(max_98390_4spk_codec_conf);

	} else {

		card->codec_conf = max_98390_codec_conf;

		card->num_configs = ARRAY_SIZE(max_98390_codec_conf);

	}

}

EXPORT_SYMBOL_NS(max_98390_set_codec_conf, SND_SOC_INTEL_SOF_MAXIM_COMMON);



/*

 * Maxim MAX98357A/MAX98360A

 */

sound/soc/intel/boards/sof_maxim_common.h

+16 −0
Original line number Diff line number Diff line
@@ -24,6 +24,22 @@ int max_98373_spk_codec_init(struct snd_soc_pcm_runtime *rtd); 
void max_98373_set_codec_conf(struct snd_soc_card *card);

int max_98373_trigger(struct snd_pcm_substream *substream, int cmd);



/*

 * Maxim MAX98390

 */

#define MAX_98390_CODEC_DAI     "max98390-aif1"

#define MAX_98390_DEV0_NAME     "i2c-MX98390:00"

#define MAX_98390_DEV1_NAME     "i2c-MX98390:01"

#define MAX_98390_DEV2_NAME     "i2c-MX98390:02"

#define MAX_98390_DEV3_NAME     "i2c-MX98390:03"



extern struct snd_soc_dai_link_component max_98390_components[2];

extern struct snd_soc_dai_link_component max_98390_4spk_components[4];

extern const struct snd_soc_ops max_98390_ops;



void max_98390_set_codec_conf(struct snd_soc_card *card, int ch);

int max_98390_spk_codec_init(struct snd_soc_pcm_runtime *rtd);



/*

 * Maxim MAX98357A/MAX98360A

 */

sound/soc/intel/boards/sof_rt5682.c

+72 −0
Original line number Diff line number Diff line
@@ -59,6 +59,9 @@ 
	(((quirk) << SOF_BT_OFFLOAD_SSP_SHIFT) & SOF_BT_OFFLOAD_SSP_MASK)

#define SOF_SSP_BT_OFFLOAD_PRESENT		BIT(22)

#define SOF_RT5682S_HEADPHONE_CODEC_PRESENT	BIT(23)

#define SOF_MAX98390_SPEAKER_AMP_PRESENT	BIT(24)

#define SOF_MAX98390_TWEETER_SPEAKER_PRESENT	BIT(25)





/* Default: MCLK on, MCLK 19.2M, SSP0  */

static unsigned long sof_rt5682_quirk = SOF_RT5682_MCLK_EN |
@@ -179,6 +182,36 @@ static const struct dmi_system_id sof_rt5682_quirk_table[] = { 
					SOF_RT5682_SSP_AMP(2) |

					SOF_RT5682_NUM_HDMIDEV(4)),

	},

	{

		.callback = sof_rt5682_quirk_cb,

		.matches = {

			DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Brya"),

			DMI_MATCH(DMI_OEM_STRING, "AUDIO-MAX98390_ALC5682I_I2S"),

		},

		.driver_data = (void *)(SOF_RT5682_MCLK_EN |

					SOF_RT5682_SSP_CODEC(0) |

					SOF_SPEAKER_AMP_PRESENT |

					SOF_MAX98390_SPEAKER_AMP_PRESENT |

					SOF_RT5682_SSP_AMP(2) |

					SOF_RT5682_NUM_HDMIDEV(4)),

	},

	{

		.callback = sof_rt5682_quirk_cb,

		.matches = {

			DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Brya"),

			DMI_MATCH(DMI_OEM_STRING, "AUDIO-MAX98390_ALC5682I_I2S_4SPK"),

		},

		.driver_data = (void *)(SOF_RT5682_MCLK_EN |

					SOF_RT5682_SSP_CODEC(0) |

					SOF_SPEAKER_AMP_PRESENT |

					SOF_MAX98390_SPEAKER_AMP_PRESENT |

					SOF_MAX98390_TWEETER_SPEAKER_PRESENT |

					SOF_RT5682_SSP_AMP(1) |

					SOF_RT5682_NUM_HDMIDEV(4) |

					SOF_BT_OFFLOAD_SSP(2) |

					SOF_SSP_BT_OFFLOAD_PRESENT),



	},

	{}

};
@@ -486,6 +519,7 @@ static int sof_card_late_probe(struct snd_soc_card *card) 
		if (err < 0)

			return err;

	}



	return hdac_hdmi_jack_port_init(component, &card->dapm);

}
@@ -784,6 +818,20 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, 
		} else if (sof_rt5682_quirk &

				SOF_RT1011_SPEAKER_AMP_PRESENT) {

			sof_rt1011_dai_link(&links[id]);

		} else if (sof_rt5682_quirk &

				SOF_MAX98390_SPEAKER_AMP_PRESENT) {

			if (sof_rt5682_quirk &

				SOF_MAX98390_TWEETER_SPEAKER_PRESENT) {

				links[id].codecs = max_98390_4spk_components;

				links[id].num_codecs = ARRAY_SIZE(max_98390_4spk_components);

			} else {

				links[id].codecs = max_98390_components;

				links[id].num_codecs = ARRAY_SIZE(max_98390_components);

			}

			links[id].init = max_98390_spk_codec_init;

			links[id].ops = &max_98390_ops;

			links[id].dpcm_capture = 1;



		} else {

			max_98357a_dai_link(&links[id]);

		}
@@ -868,6 +916,10 @@ static int sof_audio_probe(struct platform_device *pdev) 
	if (acpi_dev_present("RTL5682", NULL, -1))

		sof_rt5682_quirk |= SOF_RT5682S_HEADPHONE_CODEC_PRESENT;



	/* Detect the headset codec variant to support machines in DMI quirk */

	if (acpi_dev_present("RTL5682", NULL, -1))

		sof_rt5682_quirk |= SOF_RT5682S_HEADPHONE_CODEC_PRESENT;



	if (soc_intel_is_byt() || soc_intel_is_cht()) {

		is_legacy_cpu = 1;

		dmic_be_num = 0;
@@ -924,6 +976,14 @@ static int sof_audio_probe(struct platform_device *pdev) 
		sof_rt1011_codec_conf(&sof_audio_card_rt5682);

	else if (sof_rt5682_quirk & SOF_RT1015P_SPEAKER_AMP_PRESENT)

		sof_rt1015p_codec_conf(&sof_audio_card_rt5682);

	else if (sof_rt5682_quirk & SOF_MAX98390_SPEAKER_AMP_PRESENT) {

		if (sof_rt5682_quirk & SOF_MAX98390_TWEETER_SPEAKER_PRESENT)

			max_98390_set_codec_conf(&sof_audio_card_rt5682,

						 ARRAY_SIZE(max_98390_4spk_components));

		else

			max_98390_set_codec_conf(&sof_audio_card_rt5682,

						 ARRAY_SIZE(max_98390_components));

	}



	if (sof_rt5682_quirk & SOF_SSP_BT_OFFLOAD_PRESENT)

		sof_audio_card_rt5682.num_links++;
@@ -1050,6 +1110,17 @@ static const struct platform_device_id board_ids[] = { 
					SOF_RT5682_SSP_AMP(2) |

					SOF_RT5682_NUM_HDMIDEV(4)),

	},

	{

		.name = "adl_max98390_rt5682",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

					SOF_RT5682_SSP_CODEC(0) |

					SOF_SPEAKER_AMP_PRESENT |

					SOF_MAX98390_SPEAKER_AMP_PRESENT |

					SOF_RT5682_SSP_AMP(1) |

					SOF_RT5682_NUM_HDMIDEV(4) |

					SOF_BT_OFFLOAD_SSP(2) |

					SOF_SSP_BT_OFFLOAD_PRESENT),

	},

	{

		.name = "adl_mx98360_rt5682",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
@@ -1080,6 +1151,7 @@ MODULE_DESCRIPTION("SOF Audio Machine driver"); 
MODULE_AUTHOR("Bard Liao <bard.liao@intel.com>");

MODULE_AUTHOR("Sathya Prakash M R <sathya.prakash.m.r@intel.com>");

MODULE_AUTHOR("Brent Lu <brent.lu@intel.com>");

MODULE_AUTHOR("Mac Chiang <mac.chiang@intel.com>");

MODULE_LICENSE("GPL v2");

MODULE_IMPORT_NS(SND_SOC_INTEL_HDA_DSP_COMMON);

MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_MAXIM_COMMON);

sound/soc/intel/common/soc-acpi-intel-adl-match.c

+13 −0
Original line number Diff line number Diff line
@@ -379,6 +379,11 @@ static const struct snd_soc_acpi_codecs adl_rt1019p_amp = { 
	.codecs = {"RTL1019"}

};



static const struct snd_soc_acpi_codecs adl_max98390_amp = {

	.num_codecs = 1,

	.codecs = {"MX98390"}

};



struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {

	{

		.comp_ids = &adl_rt5682_rt5682s_hp,
@@ -434,6 +439,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { 
		.sof_fw_filename = "sof-adl.ri",

		.sof_tplg_filename = "sof-adl-nau8825.tplg",

	},

	{

		.comp_ids = &adl_rt5682_rt5682s_hp,

		.drv_name = "adl_max98390_rt5682",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &adl_max98390_amp,

		.sof_fw_filename = "sof-adl.ri",

		.sof_tplg_filename = "sof-adl-max98390-rt5682.tplg",

	},

	{},

};

EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_adl_machines);