Unverified Commit 71013db5 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Intel: boards: Chromebook configuration updates 

Merge series from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

Two minor changes to enable DMIC and capture for CS35L41, and one new
configuration for AlderLake hardware.
parents 7b46eb1b cebbefbd

sound/soc/intel/boards/sof_realtek_common.c

+39 −0
Original line number Diff line number Diff line
@@ -459,5 +459,44 @@ void sof_rt1308_dai_link(struct snd_soc_dai_link *link) 
}

EXPORT_SYMBOL_NS(sof_rt1308_dai_link, SND_SOC_INTEL_SOF_REALTEK_COMMON);



/*

 * 2-amp Configuration for RT1019

 */



static const struct snd_soc_dapm_route rt1019_dapm_routes[] = {

	/* speaker */

	{ "Left Spk", NULL, "Speaker" },

	{ "Right Spk", NULL, "Speaker" },

};



static struct snd_soc_dai_link_component rt1019_components[] = {

	{

		.name = RT1019_DEV0_NAME,

		.dai_name = RT1019_CODEC_DAI,

	},

};



static int rt1019_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_card *card = rtd->card;

	int ret;



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

				      ARRAY_SIZE(rt1019_dapm_routes));

	if (ret) {

		dev_err(rtd->dev, "Speaker map addition failed: %d\n", ret);

		return ret;

	}

	return ret;

}



void sof_rt1019_dai_link(struct snd_soc_dai_link *link)

{

	link->codecs = rt1019_components;

	link->num_codecs = ARRAY_SIZE(rt1019_components);

	link->init = rt1019_init;

}

EXPORT_SYMBOL_NS(sof_rt1019_dai_link, SND_SOC_INTEL_SOF_REALTEK_COMMON);



MODULE_DESCRIPTION("ASoC Intel SOF Realtek helpers");

MODULE_LICENSE("GPL");

sound/soc/intel/boards/sof_realtek_common.h

+5 −0
Original line number Diff line number Diff line
@@ -39,4 +39,9 @@ void sof_rt1015_codec_conf(struct snd_soc_card *card); 
#define RT1308_DEV0_NAME	"i2c-10EC1308:00"

void sof_rt1308_dai_link(struct snd_soc_dai_link *link);



#define RT1019_CODEC_DAI	"HiFi"

#define RT1019_DEV0_NAME	"RTL1019:00"



void sof_rt1019_dai_link(struct snd_soc_dai_link *link);



#endif /* __SOF_REALTEK_COMMON_H */

sound/soc/intel/boards/sof_rt5682.c

+13 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#define SOF_RT5682S_HEADPHONE_CODEC_PRESENT	BIT(23)

#define SOF_MAX98390_SPEAKER_AMP_PRESENT	BIT(24)

#define SOF_MAX98390_TWEETER_SPEAKER_PRESENT	BIT(25)

#define SOF_RT1019_SPEAKER_AMP_PRESENT	BIT(26)





/* Default: MCLK on, MCLK 19.2M, SSP0  */
@@ -733,6 +734,8 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, 
					SOF_RT1015_SPEAKER_AMP_100FS) ? 100 : 64);

		} else if (sof_rt5682_quirk & SOF_RT1015P_SPEAKER_AMP_PRESENT) {

			sof_rt1015p_dai_link(&links[id]);

		} else if (sof_rt5682_quirk & SOF_RT1019_SPEAKER_AMP_PRESENT) {

			sof_rt1019_dai_link(&links[id]);

		} else if (sof_rt5682_quirk &

				SOF_MAX98373_SPEAKER_AMP_PRESENT) {

			links[id].codecs = max_98373_components;
@@ -1070,6 +1073,16 @@ static const struct platform_device_id board_ids[] = { 
					SOF_BT_OFFLOAD_SSP(2) |

					SOF_SSP_BT_OFFLOAD_PRESENT),

	},

	{

		.name = "adl_rt1019_rt5682s",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

					SOF_RT5682_SSP_CODEC(0) |

					SOF_RT5682S_HEADPHONE_CODEC_PRESENT |

					SOF_SPEAKER_AMP_PRESENT |

					SOF_RT1019_SPEAKER_AMP_PRESENT |

					SOF_RT5682_SSP_AMP(1) |

					SOF_RT5682_NUM_HDMIDEV(4)),

	},

	{ }

};

MODULE_DEVICE_TABLE(platform, board_ids);

sound/soc/intel/boards/sof_ssp_amp.c

+17 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include <linux/acpi.h>

#include <linux/delay.h>

#include <linux/dmi.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <sound/core.h>
@@ -78,6 +79,16 @@ struct sof_card_private { 
	bool idisp_codec;

};



static const struct dmi_system_id chromebook_platforms[] = {

	{

		.ident = "Google Chromebooks",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Google"),

		}

	},

	{},

};



static const struct snd_soc_dapm_widget sof_ssp_amp_dapm_widgets[] = {

	SND_SOC_DAPM_MIC("SoC DMIC", NULL),

};
@@ -247,6 +258,9 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, 
		sof_rt1308_dai_link(&links[id]);

	} else if (sof_ssp_amp_quirk & SOF_CS35L41_SPEAKER_AMP_PRESENT) {

		cs35l41_set_dai_link(&links[id]);



		/* feedback from amplifier */

		links[id].dpcm_capture = 1;

	}

	links[id].platforms = platform_component;

	links[id].num_platforms = ARRAY_SIZE(platform_component);
@@ -371,7 +385,7 @@ static int sof_ssp_amp_probe(struct platform_device *pdev) 
	struct snd_soc_dai_link *dai_links;

	struct snd_soc_acpi_mach *mach;

	struct sof_card_private *ctx;

	int dmic_be_num, hdmi_num = 0;

	int dmic_be_num = 0, hdmi_num = 0;

	int ret, ssp_codec;



	ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
@@ -383,7 +397,8 @@ static int sof_ssp_amp_probe(struct platform_device *pdev) 


	mach = pdev->dev.platform_data;



	dmic_be_num = mach->mach_params.dmic_num;

	if (dmi_check_system(chromebook_platforms) || mach->mach_params.dmic_num > 0)

		dmic_be_num = 2;



	ssp_codec = sof_ssp_amp_quirk & SOF_AMPLIFIER_SSP_MASK;

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

+7 −0
Original line number Diff line number Diff line
@@ -455,6 +455,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { 
		.quirk_data = &adl_max98360a_amp,

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

	},

	{

		.id = "RTL5682",

		.drv_name = "adl_rt1019_rt5682s",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &adl_rt1019p_amp,

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

	},

	{

		.id = "10508825",

		.drv_name = "sof_nau8825",