mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 04:18:39 +08:00
sound fixes for 6.11
A few last-minute ASoC fixes and MAINTAINERS update. All look small, obvious and nice-to-have fixes for 6.11-final. -----BEGIN PGP SIGNATURE----- iQJCBAABCAAsFiEEIXTw5fNLNI7mMiVaLtJE4w1nLE8FAmblRZoOHHRpd2FpQHN1 c2UuZGUACgkQLtJE4w1nLE96zQ/+J77zhEva91kC80LasGa2GlggPIac4hRwBktp Xchn4TzeJ5ij/o2IHJnV0GnsUttac2n5INq/eYEbqZpvm0mDESLm3+5qsPOdGYeO bQcouXl9+Ju+9y7HymN0lnMSc7UX/NP7Yjjtx97io56Il+Obj2sYjgOhXeDHqq5J iZtZl21c0OTD4NPJ1atjtztm3fpgpCv3qP3H5R/+KU4VE3JyXjL9fB7SWfqfamwS /L9wERhyaOSi3Tut0olQblQcgIwpLdnf9bvK31uLrwzxMtxw92sOfBuOhoCUXb+2 rk2l93eW/hLeFbSTLgU+jePN8/YphnFKAr7qysL3SwEw/H6h1al8Rl74h9AFuNxW zRjmGaCOQwSLp2UHf2Qwo5F1yynApOhAKYHm0djUKjZfUTswPAGqRYcQaW2tL4DR 71LjWvwnLGi1uupG+bNWP5L1p0YGQE4rk/QNbv/gYLXPwBI3bMheQjrNhv0Pqk/r 3FflZTJcjt1KJ3yNw9CkGAhGRnA7YIoZ9DcuGaqi63wl04K2fDH6NWLZ6CbGqlyO yBs8eJK4ehZJDm9Knn3zFC9CEM9z6VA0i5aIo13v7G3I1yISxhdAp8NOCqJkl+yQ utCsfCyvK0tvVy0u0zOE3w6JZ5Z2u7Q6TGe/LkTKjsF6Na21hueU6wLlUhCtFhu2 y9jFImk= =GUM8 -----END PGP SIGNATURE----- Merge tag 'sound-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound Pull sound fixes from Takashi Iwai: "A few last-minute ASoC fixes and MAINTAINERS update. All look small, obvious and nice-to-have fixes for 6.11-final" * tag 'sound-6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ASoC: meson: axg-card: fix 'use-after-free' ASoC: codecs: avoid possible garbage value in peb2466_reg_read() MAINTAINERS: update Pierre Bossart's email and role ASoC: tas2781: fix to save the dsp bin file name into the correct array in case name_prefix is not NULL ASoC: Intel: soc-acpi-intel-mtl-match: add missing empty item ASoC: Intel: soc-acpi-intel-lnl-match: add missing empty item
This commit is contained in:
commit
57719771a2
1
.mailmap
1
.mailmap
@ -529,6 +529,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>
|
||||||
|
@ -11156,12 +11156,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/
|
||||||
@ -21391,13 +21391,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/
|
||||||
@ -21406,7 +21406,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
|
||||||
|
@ -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");
|
||||||
|
@ -502,7 +502,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",
|
||||||
|
@ -208,6 +208,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_rvp[] = {
|
static const struct snd_soc_acpi_link_adr lnl_rvp[] = {
|
||||||
|
@ -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[] = {
|
||||||
|
@ -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);
|
||||||
|
Loading…
Reference in New Issue
Block a user