From: Mark Brown <broonie@kernel.org>
Date: Thu, 8 Aug 2019 22:10:35 +0000 (+0100)
Subject: Merge branch 'topic/hda-dmic' of https://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: for-linus-2019-09-27~12^2~1^2~201
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e1b141552bdf3250e43bd4c60563142b27ce855f;p=linux-block.git

Merge branch 'topic/hda-dmic' of https://git./linux/kernel/git/tiwai/sound into asoc-5.4
---

e1b141552bdf3250e43bd4c60563142b27ce855f
diff --cc sound/soc/intel/skylake/skl.h
index 600a61f79b0a,f4dd6c767993..f8c714153610
--- a/sound/soc/intel/skylake/skl.h
+++ b/sound/soc/intel/skylake/skl.h
@@@ -16,9 -16,7 +16,8 @@@
  #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"
  
  #define SKL_SUSPEND_DELAY 2000
  
@@@ -167,27 -128,24 +166,24 @@@ 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 *skl, u32 instance,
 +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 *skl);
 -int skl_init_dsp(struct skl *skl);
 -int skl_free_dsp(struct skl *skl);
 -int skl_suspend_late_dsp(struct skl *skl);
 -int skl_suspend_dsp(struct skl *skl);
 -int skl_resume_dsp(struct skl *skl);
 -void skl_cleanup_resources(struct skl *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);
 +int skl_suspend_late_dsp(struct skl_dev *skl);
 +int skl_suspend_dsp(struct skl_dev *skl);
 +int skl_resume_dsp(struct skl_dev *skl);
 +void skl_cleanup_resources(struct skl_dev *skl);
  const struct skl_dsp_ops *skl_get_dsp_ops(int pci_id);
  void skl_update_d0i3c(struct device *dev, bool enable);
 -int skl_nhlt_create_sysfs(struct skl *skl);
 -void skl_nhlt_remove_sysfs(struct skl *skl);
 -void skl_get_clks(struct skl *skl, struct skl_ssp_clk *ssp_clks);
 +int skl_nhlt_create_sysfs(struct skl_dev *skl);
 +void skl_nhlt_remove_sysfs(struct skl_dev *skl);
 +void skl_get_clks(struct skl_dev *skl, struct skl_ssp_clk *ssp_clks);
  struct skl_clk_parent_src *skl_get_parent_clk(u8 clk_id);
 -int skl_dsp_set_dma_control(struct skl_sst *ctx, u32 *caps,
 +int skl_dsp_set_dma_control(struct skl_dev *skl, u32 *caps,
  				u32 caps_size, u32 node_id);
  
  struct skl_module_cfg;