Unverified Commit 28223889 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Intel: soc-acpi and machine driver updates 

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

Small updates to add initial tables for MeteorLake, SoundWire machine
driver support for tests without HDMI and RT1019 for consistency on
Chromebooks.
parents a8b1b9ce 8208dd75

include/sound/soc-acpi-intel-match.h

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[]; 
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_ehl_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[];



extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_sdw_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cfl_sdw_machines[];
@@ -37,6 +38,7 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_sdw_machines[]; 
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_icl_sdw_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_sdw_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[];



/*

 * generic table used for HDA codec-based platforms, possibly with

sound/soc/codecs/mt6358.c

+1 −0
Original line number Diff line number Diff line
@@ -2479,6 +2479,7 @@ static int mt6358_platform_driver_probe(struct platform_device *pdev) 


static const struct of_device_id mt6358_of_match[] = {

	{.compatible = "mediatek,mt6358-sound",},

	{.compatible = "mediatek,mt6366-sound",},

	{}

};

MODULE_DEVICE_TABLE(of, mt6358_of_match);

sound/soc/intel/boards/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -660,7 +660,6 @@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH 
	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES || COMPILE_TEST

	depends on SOUNDWIRE

	depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC

	select SND_SOC_MAX98373_I2C

	select SND_SOC_MAX98373_SDW

	select SND_SOC_RT700_SDW

sound/soc/intel/boards/sof_realtek_common.c

+12 −12
Original line number Diff line number Diff line
@@ -463,26 +463,26 @@ 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[] = {

static const struct snd_soc_dapm_route rt1019p_dapm_routes[] = {

	/* speaker */

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

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

};



static struct snd_soc_dai_link_component rt1019_components[] = {

static struct snd_soc_dai_link_component rt1019p_components[] = {

	{

		.name = RT1019_DEV0_NAME,

		.dai_name = RT1019_CODEC_DAI,

		.name = RT1019P_DEV0_NAME,

		.dai_name = RT1019P_CODEC_DAI,

	},

};



static int rt1019_init(struct snd_soc_pcm_runtime *rtd)

static int rt1019p_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));

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

				      ARRAY_SIZE(rt1019p_dapm_routes));

	if (ret) {

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

		return ret;
@@ -490,13 +490,13 @@ static int rt1019_init(struct snd_soc_pcm_runtime *rtd) 
	return ret;

}



void sof_rt1019_dai_link(struct snd_soc_dai_link *link)

void sof_rt1019p_dai_link(struct snd_soc_dai_link *link)

{

	link->codecs = rt1019_components;

	link->num_codecs = ARRAY_SIZE(rt1019_components);

	link->init = rt1019_init;

	link->codecs = rt1019p_components;

	link->num_codecs = ARRAY_SIZE(rt1019p_components);

	link->init = rt1019p_init;

}

EXPORT_SYMBOL_NS(sof_rt1019_dai_link, SND_SOC_INTEL_SOF_REALTEK_COMMON);

EXPORT_SYMBOL_NS(sof_rt1019p_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

+3 −3
Original line number Diff line number Diff line
@@ -39,9 +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"

#define RT1019P_CODEC_DAI	"HiFi"

#define RT1019P_DEV0_NAME	"RTL1019:00"



void sof_rt1019_dai_link(struct snd_soc_dai_link *link);

void sof_rt1019p_dai_link(struct snd_soc_dai_link *link);



#endif /* __SOF_REALTEK_COMMON_H */