diff options
author | Mark Brown <broonie@kernel.org> | 2017-02-19 16:35:45 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-02-19 16:35:45 +0000 |
commit | 16b5711485b0eba250451b3a85ab869939f20c7d (patch) | |
tree | 16856f74dc4e978af2c018125b7a47e443621476 /sound/soc/intel/skylake/skl.h | |
parent | c7bb6d8060eec4f3806b88796fbf46db1e73d900 (diff) | |
parent | 7ba8ba3f4f9604ce776475e3b501e41c762af797 (diff) | |
download | blackbird-op-linux-16b5711485b0eba250451b3a85ab869939f20c7d.tar.gz blackbird-op-linux-16b5711485b0eba250451b3a85ab869939f20c7d.zip |
Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
Diffstat (limited to 'sound/soc/intel/skylake/skl.h')
-rw-r--r-- | sound/soc/intel/skylake/skl.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/intel/skylake/skl.h b/sound/soc/intel/skylake/skl.h index 4986e3929dd3..bbef77d2b917 100644 --- a/sound/soc/intel/skylake/skl.h +++ b/sound/soc/intel/skylake/skl.h @@ -118,7 +118,8 @@ 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, - u8 link_type, u8 s_fmt, u8 no_ch, u32 s_rate, u8 dirn); + u8 link_type, u8 s_fmt, u8 no_ch, + u32 s_rate, u8 dirn, u8 dev_type); int skl_get_dmic_geo(struct skl *skl); int skl_nhlt_update_topology_bin(struct skl *skl); @@ -130,5 +131,7 @@ int skl_resume_dsp(struct skl *skl); void skl_cleanup_resources(struct skl *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); #endif /* __SOUND_SOC_SKL_H */ |