|
@@ -950,6 +950,7 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {
|
|
|
static char byt_rt5640_codec_name[SND_ACPI_I2C_ID_LEN];
|
|
|
static char byt_rt5640_codec_aif_name[12]; /* = "rt5640-aif[1|2]" */
|
|
|
static char byt_rt5640_cpu_dai_name[10]; /* = "ssp[0|2]-port" */
|
|
|
+static char byt_rt5640_long_name[40]; /* = "bytcr-rt5640-*-spk-*-mic" */
|
|
|
|
|
|
static int byt_rt5640_suspend(struct snd_soc_card *card)
|
|
|
{
|
|
@@ -1021,6 +1022,7 @@ struct acpi_chan_package { /* ACPICA seems to require 64 bit integers */
|
|
|
|
|
|
static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
|
|
|
{
|
|
|
+ const char * const map_name[] = { "dmic1", "dmic2", "in1", "in3" };
|
|
|
const struct dmi_system_id *dmi_id;
|
|
|
struct byt_rt5640_private *priv;
|
|
|
struct snd_soc_acpi_mach *mach;
|
|
@@ -1184,6 +1186,13 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ snprintf(byt_rt5640_long_name, sizeof(byt_rt5640_long_name),
|
|
|
+ "bytcr-rt5640-%s-spk-%s-mic",
|
|
|
+ (byt_rt5640_quirk & BYT_RT5640_MONO_SPEAKER) ?
|
|
|
+ "mono" : "stereo",
|
|
|
+ map_name[BYT_RT5640_MAP(byt_rt5640_quirk)]);
|
|
|
+ byt_rt5640_card.long_name = byt_rt5640_long_name;
|
|
|
+
|
|
|
ret_val = devm_snd_soc_register_card(&pdev->dev, &byt_rt5640_card);
|
|
|
|
|
|
if (ret_val) {
|