diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-13 21:23:56 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-13 21:23:56 +0400 |
| commit | 8bee1fd482622718fcc1a537db1d7ca48d7f52f8 (patch) | |
| tree | 8b40cf912a942771b0b22f2aa0ac20d5af256010 /sound/soc/intel/sst-dsp-priv.h | |
| parent | dfe1951b0c1c6a80b8ad8702eb93f8a4dffa31f1 (diff) | |
| parent | cffd6665f57ed18f4be9185c4330c8c98c22e201 (diff) | |
| download | linux-8bee1fd482622718fcc1a537db1d7ca48d7f52f8.tar.xz | |
Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
Conflicts:
sound/soc/intel/sst-baytrail-dsp.c
Diffstat (limited to 'sound/soc/intel/sst-dsp-priv.h')
| -rw-r--r-- | sound/soc/intel/sst-dsp-priv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/intel/sst-dsp-priv.h b/sound/soc/intel/sst-dsp-priv.h index cd4a3ca25ce4..ffb308bd81ce 100644 --- a/sound/soc/intel/sst-dsp-priv.h +++ b/sound/soc/intel/sst-dsp-priv.h @@ -136,7 +136,7 @@ struct sst_module_data { enum sst_data_type data_type; /* type of module data */ u32 size; /* size in bytes */ - u32 offset; /* offset in FW file */ + int32_t offset; /* offset in FW file */ u32 data_offset; /* offset in ADSP memory space */ void *data; /* module data */ }; @@ -228,6 +228,7 @@ struct sst_dsp { spinlock_t spinlock; /* IPC locking */ struct mutex mutex; /* DSP FW lock */ struct device *dev; + struct device *dma_dev; void *thread_context; int irq; u32 id; |