mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-09-21 12:11:49 +08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
This commit is contained in:
commit
01fce1a2c7
@ -54,7 +54,7 @@ enum sof_comp_type {
|
||||
struct sof_ipc_comp {
|
||||
struct sof_ipc_cmd_hdr hdr;
|
||||
uint32_t id;
|
||||
enum sof_comp_type type;
|
||||
uint32_t type;
|
||||
uint32_t pipeline_id;
|
||||
uint32_t core;
|
||||
|
||||
|
@ -29,7 +29,7 @@
|
||||
/* SOF ABI version major, minor and patch numbers */
|
||||
#define SOF_ABI_MAJOR 3
|
||||
#define SOF_ABI_MINOR 23
|
||||
#define SOF_ABI_PATCH 0
|
||||
#define SOF_ABI_PATCH 1
|
||||
|
||||
/* SOF ABI version number. Format within 32bit word is MMmmmppp */
|
||||
#define SOF_ABI_MAJOR_SHIFT 24
|
||||
|
@ -26,6 +26,7 @@ static const struct of_device_id chv3_codec_of_match[] = {
|
||||
{ .compatible = "google,chv3-codec", },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, chv3_codec_of_match);
|
||||
|
||||
static struct platform_driver chv3_codec_platform_driver = {
|
||||
.driver = {
|
||||
|
@ -623,6 +623,7 @@ static const struct of_device_id tda7419_of_match[] = {
|
||||
{ .compatible = "st,tda7419" },
|
||||
{ },
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, tda7419_of_match);
|
||||
|
||||
static struct i2c_driver tda7419_driver = {
|
||||
.driver = {
|
||||
|
@ -322,6 +322,7 @@ static const struct of_device_id chv3_i2s_of_match[] = {
|
||||
{ .compatible = "google,chv3-i2s" },
|
||||
{},
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, chv3_i2s_of_match);
|
||||
|
||||
static struct platform_driver chv3_i2s_driver = {
|
||||
.probe = chv3_i2s_probe,
|
||||
|
@ -605,7 +605,7 @@ static int broxton_audio_probe(struct platform_device *pdev)
|
||||
int i;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(broxton_rt298_dais); i++) {
|
||||
if (card->dai_link[i].codecs->name &&
|
||||
if (card->dai_link[i].num_codecs &&
|
||||
!strncmp(card->dai_link[i].codecs->name, "i2c-INT343A:00",
|
||||
I2C_NAME_SIZE)) {
|
||||
if (!strncmp(card->name, "broxton-rt298",
|
||||
|
@ -241,7 +241,7 @@ static int snd_byt_cht_cx2072x_probe(struct platform_device *pdev)
|
||||
|
||||
/* fix index of codec dai */
|
||||
for (i = 0; i < ARRAY_SIZE(byt_cht_cx2072x_dais); i++) {
|
||||
if (byt_cht_cx2072x_dais[i].codecs->name &&
|
||||
if (byt_cht_cx2072x_dais[i].num_codecs &&
|
||||
!strcmp(byt_cht_cx2072x_dais[i].codecs->name,
|
||||
"i2c-14F10720:00")) {
|
||||
dai_index = i;
|
||||
|
@ -245,7 +245,7 @@ static int bytcht_da7213_probe(struct platform_device *pdev)
|
||||
|
||||
/* fix index of codec dai */
|
||||
for (i = 0; i < ARRAY_SIZE(dailink); i++) {
|
||||
if (dailink[i].codecs->name &&
|
||||
if (dailink[i].num_codecs &&
|
||||
!strcmp(dailink[i].codecs->name, "i2c-DLGS7213:00")) {
|
||||
dai_index = i;
|
||||
break;
|
||||
|
@ -546,7 +546,7 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)
|
||||
|
||||
/* fix index of codec dai */
|
||||
for (i = 0; i < ARRAY_SIZE(byt_cht_es8316_dais); i++) {
|
||||
if (byt_cht_es8316_dais[i].codecs->name &&
|
||||
if (byt_cht_es8316_dais[i].num_codecs &&
|
||||
!strcmp(byt_cht_es8316_dais[i].codecs->name,
|
||||
"i2c-ESSX8316:00")) {
|
||||
dai_index = i;
|
||||
|
@ -1677,7 +1677,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
|
||||
|
||||
/* fix index of codec dai */
|
||||
for (i = 0; i < ARRAY_SIZE(byt_rt5640_dais); i++) {
|
||||
if (byt_rt5640_dais[i].codecs->name &&
|
||||
if (byt_rt5640_dais[i].num_codecs &&
|
||||
!strcmp(byt_rt5640_dais[i].codecs->name,
|
||||
"i2c-10EC5640:00")) {
|
||||
dai_index = i;
|
||||
|
@ -910,7 +910,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
|
||||
|
||||
/* fix index of codec dai */
|
||||
for (i = 0; i < ARRAY_SIZE(byt_rt5651_dais); i++) {
|
||||
if (byt_rt5651_dais[i].codecs->name &&
|
||||
if (byt_rt5651_dais[i].num_codecs &&
|
||||
!strcmp(byt_rt5651_dais[i].codecs->name,
|
||||
"i2c-10EC5651:00")) {
|
||||
dai_index = i;
|
||||
|
@ -605,7 +605,7 @@ static int snd_byt_wm5102_mc_probe(struct platform_device *pdev)
|
||||
|
||||
/* find index of codec dai */
|
||||
for (i = 0; i < ARRAY_SIZE(byt_wm5102_dais); i++) {
|
||||
if (byt_wm5102_dais[i].codecs->name &&
|
||||
if (byt_wm5102_dais[i].num_codecs &&
|
||||
!strcmp(byt_wm5102_dais[i].codecs->name,
|
||||
"wm5102-codec")) {
|
||||
dai_index = i;
|
||||
|
@ -569,7 +569,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
|
||||
|
||||
/* set correct codec name */
|
||||
for (i = 0; i < ARRAY_SIZE(cht_dailink); i++)
|
||||
if (cht_dailink[i].codecs->name &&
|
||||
if (cht_dailink[i].num_codecs &&
|
||||
!strcmp(cht_dailink[i].codecs->name,
|
||||
"i2c-10EC5645:00")) {
|
||||
dai_index = i;
|
||||
|
@ -466,7 +466,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
|
||||
|
||||
/* find index of codec dai */
|
||||
for (i = 0; i < ARRAY_SIZE(cht_dailink); i++) {
|
||||
if (cht_dailink[i].codecs->name &&
|
||||
if (cht_dailink[i].num_codecs &&
|
||||
!strcmp(cht_dailink[i].codecs->name, RT5672_I2C_DEFAULT)) {
|
||||
dai_index = i;
|
||||
break;
|
||||
|
@ -84,7 +84,6 @@ static const struct dmi_system_id lenovo_yoga_tab3_x90[] = {
|
||||
/* Lenovo Yoga Tab 3 Pro YT3-X90, codec missing from DSDT */
|
||||
.matches = {
|
||||
DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"),
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "CHERRYVIEW D1 PLATFORM"),
|
||||
DMI_MATCH(DMI_PRODUCT_VERSION, "Blade3-10A-001"),
|
||||
},
|
||||
},
|
||||
|
@ -814,6 +814,7 @@ static const struct of_device_id kmb_plat_of_match[] = {
|
||||
{ .compatible = "intel,keembay-tdm", .data = &intel_kmb_tdm_dai},
|
||||
{}
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, kmb_plat_of_match);
|
||||
|
||||
static int kmb_plat_dai_probe(struct platform_device *pdev)
|
||||
{
|
||||
|
@ -4057,6 +4057,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
|
||||
|
||||
case SND_SOC_DAPM_POST_PMD:
|
||||
kfree(substream->runtime);
|
||||
substream->runtime = NULL;
|
||||
break;
|
||||
|
||||
default:
|
||||
|
@ -2050,6 +2050,8 @@ static int sof_link_unload(struct snd_soc_component *scomp, struct snd_soc_dobj
|
||||
if (!slink)
|
||||
return 0;
|
||||
|
||||
slink->link->platforms->name = NULL;
|
||||
|
||||
kfree(slink->tuples);
|
||||
list_del(&slink->list);
|
||||
kfree(slink->hw_configs);
|
||||
|
@ -2,7 +2,7 @@
|
||||
//
|
||||
// tegra210_ahub.c - Tegra210 AHUB driver
|
||||
//
|
||||
// Copyright (c) 2020-2022, NVIDIA CORPORATION. All rights reserved.
|
||||
// Copyright (c) 2020-2024, NVIDIA CORPORATION. All rights reserved.
|
||||
|
||||
#include <linux/clk.h>
|
||||
#include <linux/device.h>
|
||||
@ -1391,12 +1391,14 @@ static int tegra_ahub_probe(struct platform_device *pdev)
|
||||
return err;
|
||||
}
|
||||
|
||||
err = of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
pm_runtime_enable(&pdev->dev);
|
||||
|
||||
err = of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev);
|
||||
if (err) {
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
return err;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user