korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 04:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-linus' into for-next

Browse Source 
Pull 6.11 fixes to 6.12-devel branch

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2024-09-14 10:16:12 +02:00
commit 64c0ce555a
7 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.mailmap
View File

@ -525,6 +525,7 @@ Pavankumar Kondeti <quic_pkondeti@quicinc.com> <pkondeti@codeaurora.org>
Peter A Jonsson <pj@ludd.ltu.se> Peter A Jonsson <pj@ludd.ltu.se>
Peter Oruba <peter.oruba@amd.com> Peter Oruba <peter.oruba@amd.com>
Peter Oruba <peter@oruba.de> Peter Oruba <peter@oruba.de>
Pierre-Louis Bossart <pierre-louis.bossart@linux.dev> <pierre-louis.bossart@linux.intel.com>
Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com> Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
Praveen BP <praveenbp@ti.com> Praveen BP <praveenbp@ti.com>
Pradeep Kumar Chitrapu <quic_pradeepc@quicinc.com> <pradeepc@codeaurora.org> Pradeep Kumar Chitrapu <quic_pradeepc@quicinc.com> <pradeepc@codeaurora.org>

6
MAINTAINERS
View File

@ -11141,12 +11141,12 @@ F: drivers/gpio/gpio-i8255.h
INTEL ASoC DRIVERS INTEL ASoC DRIVERS
M: Cezary Rojewski <cezary.rojewski@intel.com> M: Cezary Rojewski <cezary.rojewski@intel.com>
M: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
M: Liam Girdwood <liam.r.girdwood@linux.intel.com> M: Liam Girdwood <liam.r.girdwood@linux.intel.com>
M: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> M: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
M: Bard Liao <yung-chuan.liao@linux.intel.com> M: Bard Liao <yung-chuan.liao@linux.intel.com>
M: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> M: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
M: Kai Vehmanen <kai.vehmanen@linux.intel.com> M: Kai Vehmanen <kai.vehmanen@linux.intel.com>
R: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>
L: alsa-devel@alsa-project.org (moderated for non-subscribers) L: alsa-devel@alsa-project.org (moderated for non-subscribers)
S: Supported S: Supported
F: sound/soc/intel/ F: sound/soc/intel/
@ -21350,13 +21350,13 @@ S: Maintained
F: tools/sound/dapm-graph F: tools/sound/dapm-graph
SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS
M: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
M: Liam Girdwood <lgirdwood@gmail.com> M: Liam Girdwood <lgirdwood@gmail.com>
M: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> M: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
M: Bard Liao <yung-chuan.liao@linux.intel.com> M: Bard Liao <yung-chuan.liao@linux.intel.com>
M: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> M: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
M: Daniel Baluta <daniel.baluta@nxp.com> M: Daniel Baluta <daniel.baluta@nxp.com>
R: Kai Vehmanen <kai.vehmanen@linux.intel.com> R: Kai Vehmanen <kai.vehmanen@linux.intel.com>
R: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>
L: sound-open-firmware@alsa-project.org (moderated for non-subscribers) L: sound-open-firmware@alsa-project.org (moderated for non-subscribers)
S: Supported S: Supported
W: https://github.com/thesofproject/linux/ W: https://github.com/thesofproject/linux/
@ -21365,7 +21365,7 @@ F: sound/soc/sof/
SOUNDWIRE SUBSYSTEM SOUNDWIRE SUBSYSTEM
M: Vinod Koul <vkoul@kernel.org> M: Vinod Koul <vkoul@kernel.org>
M: Bard Liao <yung-chuan.liao@linux.intel.com> M: Bard Liao <yung-chuan.liao@linux.intel.com>
R: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> R: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>
R: Sanyog Kale <sanyog.r.kale@intel.com> R: Sanyog Kale <sanyog.r.kale@intel.com>
L: alsa-devel@alsa-project.org (moderated for non-subscribers) L: alsa-devel@alsa-project.org (moderated for non-subscribers)
S: Supported S: Supported

3
sound/soc/codecs/peb2466.c
View File

@ -229,7 +229,8 @@ static int peb2466_reg_read(void *context, unsigned int reg, unsigned int *val)
case PEB2466_CMD_XOP: case PEB2466_CMD_XOP:
case PEB2466_CMD_SOP: case PEB2466_CMD_SOP:
ret = peb2466_read_byte(peb2466, reg, &tmp); ret = peb2466_read_byte(peb2466, reg, &tmp);
*val = tmp; if (!ret)
*val = tmp;
break; break;
default: default:
dev_err(&peb2466->spi->dev, "Not a XOP or SOP command\n"); dev_err(&peb2466->spi->dev, "Not a XOP or SOP command\n");

2
sound/soc/codecs/tas2781-i2c.c
View File

@ -1370,7 +1370,7 @@ static void tasdevice_fw_ready(const struct firmware *fmw,
*/ */
tas_priv->fw_state = TASDEVICE_RCA_FW_OK; tas_priv->fw_state = TASDEVICE_RCA_FW_OK;
if (tas_priv->name_prefix) if (tas_priv->name_prefix)
scnprintf(tas_priv->rca_binaryname, 64, "%s-%s_coef.bin", scnprintf(tas_priv->coef_binaryname, 64, "%s-%s_coef.bin",
tas_priv->name_prefix, tas_priv->dev_name); tas_priv->name_prefix, tas_priv->dev_name);
else else
scnprintf(tas_priv->coef_binaryname, 64, "%s_coef.bin", scnprintf(tas_priv->coef_binaryname, 64, "%s_coef.bin",

1
sound/soc/intel/common/soc-acpi-intel-lnl-match.c
View File

@ -267,6 +267,7 @@ static const struct snd_soc_acpi_link_adr lnl_cs42l43_l0[] = {
.num_adr = ARRAY_SIZE(cs42l43_0_adr), .num_adr = ARRAY_SIZE(cs42l43_0_adr),
.adr_d = cs42l43_0_adr, .adr_d = cs42l43_0_adr,
}, },
{}
}; };
static const struct snd_soc_acpi_link_adr lnl_cs42l43_l0_cs35l56_l3[] = { static const struct snd_soc_acpi_link_adr lnl_cs42l43_l0_cs35l56_l3[] = {

1
sound/soc/intel/common/soc-acpi-intel-mtl-match.c
View File

@ -674,6 +674,7 @@ static const struct snd_soc_acpi_link_adr mtl_cs42l43_l0[] = {
.num_adr = ARRAY_SIZE(cs42l43_0_adr), .num_adr = ARRAY_SIZE(cs42l43_0_adr),
.adr_d = cs42l43_0_adr, .adr_d = cs42l43_0_adr,
}, },
{}
}; };
static const struct snd_soc_acpi_link_adr mtl_cs42l43_cs35l56[] = { static const struct snd_soc_acpi_link_adr mtl_cs42l43_cs35l56[] = {

3
sound/soc/meson/axg-card.c
View File

@ -104,7 +104,7 @@ static int axg_card_add_tdm_loopback(struct snd_soc_card *card,
int *index) int *index)
{ {
struct meson_card *priv = snd_soc_card_get_drvdata(card); struct meson_card *priv = snd_soc_card_get_drvdata(card);
struct snd_soc_dai_link *pad = &card->dai_link[*index]; struct snd_soc_dai_link *pad;
struct snd_soc_dai_link *lb; struct snd_soc_dai_link *lb;
struct snd_soc_dai_link_component *dlc; struct snd_soc_dai_link_component *dlc;
int ret; int ret;
@ -114,6 +114,7 @@ static int axg_card_add_tdm_loopback(struct snd_soc_card *card,
if (ret) if (ret)
return ret; return ret;
pad = &card->dai_link[*index];
lb = &card->dai_link[*index + 1]; lb = &card->dai_link[*index + 1];
lb->name = devm_kasprintf(card->dev, GFP_KERNEL, "%s-lb", pad->name); lb->name = devm_kasprintf(card->dev, GFP_KERNEL, "%s-lb", pad->name);