summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-04-28 18:49:06 +0100
committerMark Brown <broonie@kernel.org>2016-04-28 18:49:06 +0100
commit6a5ea5c5d1d35e9b81fca88535cd584d9332961d (patch)
tree2c453e96b56a123af430f78b1b58844846296749 /sound
parentdb71336b9eec22c21cef65c90cea49130c464994 (diff)
parent9fc7c862e78ba8bec142935673227f2463aa05a5 (diff)
downloadtalos-op-linux-6a5ea5c5d1d35e9b81fca88535cd584d9332961d.tar.gz
talos-op-linux-6a5ea5c5d1d35e9b81fca88535cd584d9332961d.zip
Merge branch 'topic/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-hdmi
Diffstat (limited to 'sound')
-rw-r--r--sound/hda/local.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/sound/hda/local.h b/sound/hda/local.h
index d692f417ddc0..0d5bb159d538 100644
--- a/sound/hda/local.h
+++ b/sound/hda/local.h
@@ -16,6 +16,16 @@ static inline int get_wcaps_type(unsigned int wcaps)
return (wcaps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
}
+static inline unsigned int get_wcaps_channels(u32 wcaps)
+{
+ unsigned int chans;
+
+ chans = (wcaps & AC_WCAP_CHAN_CNT_EXT) >> 13;
+ chans = (chans + 1) * 2;
+
+ return chans;
+}
+
extern const struct attribute_group *hdac_dev_attr_groups[];
int hda_widget_sysfs_init(struct hdac_device *codec);
void hda_widget_sysfs_exit(struct hdac_device *codec);
OpenPOWER on IntegriCloud