diff options
| author | Mark Brown <broonie@kernel.org> | 2019-08-08 23:10:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-08-08 23:10:35 +0100 |
| commit | e1b141552bdf3250e43bd4c60563142b27ce855f (patch) | |
| tree | 23af0d6916e0f1e9093fd743a5502a47633e460e /sound/soc/intel/skylake/skl.h | |
| parent | 36004c42c761a6d95b867a4fbb9a955034e53351 (diff) | |
| parent | 8c57588313805d4e12a3d470dee3405c2236655f (diff) | |
| download | talos-op-linux-e1b141552bdf3250e43bd4c60563142b27ce855f.tar.gz talos-op-linux-e1b141552bdf3250e43bd4c60563142b27ce855f.zip | |
Merge branch 'topic/hda-dmic' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound into asoc-5.4
Diffstat (limited to 'sound/soc/intel/skylake/skl.h')
| -rw-r--r-- | sound/soc/intel/skylake/skl.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/intel/skylake/skl.h b/sound/soc/intel/skylake/skl.h index 600a61f79b0a..f8c714153610 100644 --- a/sound/soc/intel/skylake/skl.h +++ b/sound/soc/intel/skylake/skl.h @@ -16,7 +16,6 @@ #include <sound/hdaudio_ext.h> #include <sound/hda_codec.h> #include <sound/soc.h> -#include "skl-nhlt.h" #include "skl-ssp-clk.h" #include "skl-sst-ipc.h" @@ -167,13 +166,10 @@ struct skl_dsp_ops { int skl_platform_unregister(struct device *dev); int skl_platform_register(struct device *dev); -struct nhlt_acpi_table *skl_nhlt_init(struct device *dev); -void skl_nhlt_free(struct nhlt_acpi_table *addr); struct nhlt_specific_cfg *skl_get_ep_blob(struct skl_dev *skl, u32 instance, u8 link_type, u8 s_fmt, u8 no_ch, u32 s_rate, u8 dirn, u8 dev_type); -int skl_get_dmic_geo(struct skl_dev *skl); int skl_nhlt_update_topology_bin(struct skl_dev *skl); int skl_init_dsp(struct skl_dev *skl); int skl_free_dsp(struct skl_dev *skl); |
