Unverified Commit 46f2dd5c authored by Mark Brown's avatar Mark Brown
Browse files

Merge existing fixes from asoc/for-6.12 into new branch

parents 9852d85e e249786b

sound/soc/amd/acp/acp-sdw-sof-mach.c

+0 −5
Original line number Diff line number Diff line
@@ -400,9 +400,6 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) 
	return ret;

}



/* SoC card */

static const char sdw_card_long_name[] = "AMD Soundwire SOF";



static int mc_probe(struct platform_device *pdev)

{

	struct snd_soc_acpi_mach *mach = dev_get_platdata(&pdev->dev);
@@ -463,8 +460,6 @@ static int mc_probe(struct platform_device *pdev) 
	if (!card->components)

		return -ENOMEM;



	card->long_name = sdw_card_long_name;



	/* Register the card */

	ret = devm_snd_soc_register_card(card->dev, card);

	if (ret) {

sound/soc/amd/yc/acp6x-mach.c

+7 −0
Original line number Diff line number Diff line
@@ -444,6 +444,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_BOARD_NAME, "8A3E"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "HP"),

			DMI_MATCH(DMI_BOARD_NAME, "8A7F"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

sound/soc/atmel/mchp-pdmc.c

+3 −0
Original line number Diff line number Diff line
@@ -302,6 +302,9 @@ static int mchp_pdmc_chmap_ctl_put(struct snd_kcontrol *kcontrol, 
	if (!substream)

		return -ENODEV;



	if (!substream->runtime)

		return 0; /* just for avoiding error from alsactl restore */



	map = mchp_pdmc_chmap_get(substream, info);

	if (!map)

		return -EINVAL;

sound/soc/codecs/cs35l45-tables.c

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ static const struct { 
	{ 0x3B, 24576000 },

};



unsigned int cs35l45_get_clk_freq_id(unsigned int freq)

int cs35l45_get_clk_freq_id(unsigned int freq)

{

	int i;

sound/soc/codecs/cs35l45.h

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ extern const struct dev_pm_ops cs35l45_pm_ops; 
extern const struct regmap_config cs35l45_i2c_regmap;

extern const struct regmap_config cs35l45_spi_regmap;

int cs35l45_apply_patch(struct cs35l45_private *cs35l45);

unsigned int cs35l45_get_clk_freq_id(unsigned int freq);

int cs35l45_get_clk_freq_id(unsigned int freq);

int cs35l45_probe(struct cs35l45_private *cs35l45);

void cs35l45_remove(struct cs35l45_private *cs35l45);