Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-13 23:51:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Brown 2024-09-29 23:34:33 +01:00
commit 46f2dd5ce5
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
7 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/soc/amd/acp/acp-sdw-sof-mach.c
View File

@ -400,9 +400,6 @@ err_dai:
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) {

7
sound/soc/amd/yc/acp6x-mach.c
View File

@ -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 = {

3
sound/soc/atmel/mchp-pdmc.c
View File

@ -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;

2
sound/soc/codecs/cs35l45-tables.c
View File

@ -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;

2
sound/soc/codecs/cs35l45.h
View File

@ -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);

2
sound/soc/codecs/lpass-rx-macro.c
View File

@ -958,7 +958,7 @@ static const struct reg_default rx_defaults[] = {
{ CDC_RX_BCL_VBAT_PK_EST2, 0x01 },
{ CDC_RX_BCL_VBAT_PK_EST3, 0x40 },
{ CDC_RX_BCL_VBAT_RF_PROC1, 0x2A },
{ CDC_RX_BCL_VBAT_RF_PROC1, 0x00 },
{ CDC_RX_BCL_VBAT_RF_PROC2, 0x00 },
{ CDC_RX_BCL_VBAT_TAC1, 0x00 },
{ CDC_RX_BCL_VBAT_TAC2, 0x18 },
{ CDC_RX_BCL_VBAT_TAC3, 0x18 },

4
sound/soc/soc-topology.c
View File

@ -889,7 +889,7 @@ static int soc_tplg_dbytes_create(struct soc_tplg *tplg, size_t size)
return ret;
/* register dynamic object */
sbe = (struct soc_bytes_ext *)&kc.private_value;
sbe = (struct soc_bytes_ext *)kc.private_value;
INIT_LIST_HEAD(&sbe->dobj.list);
sbe->dobj.type = SND_SOC_DOBJ_BYTES;
@ -923,7 +923,7 @@ static int soc_tplg_dmixer_create(struct soc_tplg *tplg, size_t size)
return ret;
/* register dynamic object */
sm = (struct soc_mixer_control *)&kc.private_value;
sm = (struct soc_mixer_control *)kc.private_value;
INIT_LIST_HEAD(&sm->dobj.list);
sm->dobj.type = SND_SOC_DOBJ_MIXER;