summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2024-04-05 09:48:12 +0300
committerTakashi Iwai <tiwai@suse.de>2024-04-05 09:48:12 +0300
commit100c85421b52e41269ada88f7d71a6b8a06c7a11 (patch)
tree1e291a2d1b8e68720a15dfd48964357502d03fc9 /include/sound
parentc4e51e424e2c772ce1836912a8b0b87cd61bc9d5 (diff)
parent90f8917e7a15f6dd508779048bdf00ce119b6ca0 (diff)
downloadlinux-100c85421b52e41269ada88f7d71a6b8a06c7a11.tar.xz
Merge tag 'asoc-fix-v6.9-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.9 A relatively large set of fixes here, the biggest piece of it is a series correcting some problems with the delay reporting for Intel SOF cards but there's a bunch of other things. Everything here is driver specific except for a fix in the core for an issue with sign extension handling volume controls.
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/hdaudio_ext.h3
-rw-r--r--include/sound/hdmi-codec.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/include/sound/hdaudio_ext.h b/include/sound/hdaudio_ext.h
index a8bebac1e4b2..957295364a5e 100644
--- a/include/sound/hdaudio_ext.h
+++ b/include/sound/hdaudio_ext.h
@@ -56,6 +56,9 @@ struct hdac_ext_stream {
u32 pphcldpl;
u32 pphcldpu;
+ u32 pplcllpl;
+ u32 pplcllpu;
+
bool decoupled:1;
bool link_locked:1;
bool link_prepared;
diff --git a/include/sound/hdmi-codec.h b/include/sound/hdmi-codec.h
index 9b162ac1e08e..5e1a9eafd10f 100644
--- a/include/sound/hdmi-codec.h
+++ b/include/sound/hdmi-codec.h
@@ -12,7 +12,6 @@
#include <linux/of_graph.h>
#include <linux/hdmi.h>
-#include <drm/drm_edid.h>
#include <sound/asoundef.h>
#include <sound/soc.h>
#include <uapi/sound/asound.h>