summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-02-19 16:35:45 +0000
committerMark Brown <broonie@kernel.org>2017-02-19 16:35:45 +0000
commit16b5711485b0eba250451b3a85ab869939f20c7d (patch)
tree16856f74dc4e978af2c018125b7a47e443621476 /include/sound
parentc7bb6d8060eec4f3806b88796fbf46db1e73d900 (diff)
parent7ba8ba3f4f9604ce776475e3b501e41c762af797 (diff)
downloadblackbird-op-linux-16b5711485b0eba250451b3a85ab869939f20c7d.tar.gz
blackbird-op-linux-16b5711485b0eba250451b3a85ab869939f20c7d.zip
Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 5ab2e7e090c8..c6cabf3daebe 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -497,6 +497,8 @@ void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd, int stream);
int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,
unsigned int dai_fmt);
+int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour);
+
/* Utility functions to get clock rates from various things */
int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots);
int snd_soc_params_to_frame_size(struct snd_pcm_hw_params *params);
@@ -1093,6 +1095,8 @@ struct snd_soc_card {
const char *name;
const char *long_name;
const char *driver_name;
+ char dmi_longname[80];
+
struct device *dev;
struct snd_card *snd_card;
struct module *owner;
OpenPOWER on IntegriCloud