summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2024-07-15 16:31:00 +0200
committerTakashi Iwai <tiwai@suse.de>2024-07-15 16:31:00 +0200
commit97b10a77b150df664bb521ae217dd6bceb40d5d3 (patch)
tree9f14e5d6e0a9e048cfef95f41678569dd994aba6 /sound/pci
parentALSA: usb: Use BIT() for bit values (diff)
parentFix the unbalanced pm_runtime_enable in wcd937x-sdw (diff)
downloadlinux-97b10a77b150df664bb521ae217dd6bceb40d5d3.tar.xz
linux-97b10a77b150df664bb521ae217dd6bceb40d5d3.zip
Merge tag 'asoc-v6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for for v6.11 There are a lot of changes in here, though the big bulk of things is cleanups and simplifications of various kinds which are internally rather than externally visible. A good chunk of those are DT schema conversions, but there's also a lot of changes in the code. Highlights: - Syncing of features between simple-audio-card and the two audio-graph cards so there is no reason to stick with an older driver. - Support for specifying the order of operations for components within cards to allow quirking for unusual systems. - New support for Asahi Kasei AK4619, Cirrus Logic CS530x, Everest Semiconductors ES8311, NXP i.MX95 and LPC32xx, Qualcomm LPASS v2.5 and WCD937x, Realtek RT1318 and RT1320 and Texas Instruments PCM5242.
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/tas2781_hda_i2c.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c
index 879d4b48e6c7..49bd7097d892 100644
--- a/sound/pci/hda/tas2781_hda_i2c.c
+++ b/sound/pci/hda/tas2781_hda_i2c.c
@@ -830,7 +830,7 @@ static int tas2781_hda_i2c_probe(struct i2c_client *clt)
pm_runtime_set_active(tas_hda->dev);
pm_runtime_enable(tas_hda->dev);
- tas2781_reset(tas_hda->priv);
+ tasdevice_reset(tas_hda->priv);
ret = component_add(tas_hda->dev, &tas2781_hda_comp_ops);
if (ret) {
@@ -925,7 +925,7 @@ static int tas2781_system_resume(struct device *dev)
tas_hda->priv->tasdevice[i].cur_prog = -1;
tas_hda->priv->tasdevice[i].cur_conf = -1;
}
- tas2781_reset(tas_hda->priv);
+ tasdevice_reset(tas_hda->priv);
tasdevice_prmg_load(tas_hda->priv, tas_hda->priv->cur_prog);
/* If calibrated data occurs error, dsp will still work with default