diff options
author | Mark Brown <broonie@kernel.org> | 2016-05-25 19:18:00 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-05-25 19:18:00 +0100 |
commit | c64f976208f7f6d16ae0b980f8af42fb18759ace (patch) | |
tree | 0439de1b6a0226e7356673720e59bee4d5bef673 /sound/hda/local.h | |
parent | Linux 4.6 (diff) | |
parent | Merge remote-tracking branch 'asoc/topic/hdmi' into asoc-next (diff) | |
download | linux-dev-c64f976208f7f6d16ae0b980f8af42fb18759ace.tar.xz linux-dev-c64f976208f7f6d16ae0b980f8af42fb18759ace.zip |
Merge tag 'asoc-v4.7' into asoc-linus
ASoC: Updates for v4.7
The updates this time around are almost all driver code:
- Further slow progress on the topology code.
- Substantial updates and improvements for the da7219, es8328, fsl-ssi
Intel and rcar drivers.
# gpg: Signature made Mon 16 May 2016 12:08:43 BST using RSA key ID 5D5487D0
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
# gpg: aka "Mark Brown <broonie@debian.org>"
# gpg: aka "Mark Brown <broonie@kernel.org>"
# gpg: aka "Mark Brown <broonie@tardis.ed.ac.uk>"
# gpg: aka "Mark Brown <broonie@linaro.org>"
# gpg: aka "Mark Brown <Mark.Brown@linaro.org>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 3F25 68AA C269 98F9 E813 A1C5 C3F4 36CA 30F5 D8EB
# Subkey fingerprint: ADE6 68AA 6757 18B5 9FE2 9FEA 24D6 8B72 5D54 87D0
Diffstat (limited to 'sound/hda/local.h')
-rw-r--r-- | sound/hda/local.h | 10 |
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); |