diff options
| author | Mark Brown <broonie@kernel.org> | 2020-05-12 17:12:47 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-05-12 17:12:47 +0200 |
| commit | 132a0eb0324025bb4691ee590996dbe302159298 (patch) | |
| tree | e70fcc3c1294f36f184f17b46bd82131cf71b686 /sound/soc/intel/common | |
| parent | SoC: rsnd: add interrupt support for SSI BUSIF buffer (diff) | |
| parent | ASoC: mmp-sspa: Drop S20_3LE case (diff) | |
| download | linux-132a0eb0324025bb4691ee590996dbe302159298.tar.xz linux-132a0eb0324025bb4691ee590996dbe302159298.zip | |
Merge branch 'for-5.7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.8
Diffstat (limited to 'sound/soc/intel/common')
| -rw-r--r-- | sound/soc/intel/common/sst-dsp.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/soc/intel/common/sst-dsp.c b/sound/soc/intel/common/sst-dsp.c index ec66be269b69..36c077aa386e 100644 --- a/sound/soc/intel/common/sst-dsp.c +++ b/sound/soc/intel/common/sst-dsp.c @@ -10,7 +10,7 @@ #include <linux/interrupt.h> #include <linux/module.h> #include <linux/platform_device.h> -#include <linux/io.h> +#include <linux/io-64-nonatomic-lo-hi.h> #include <linux/delay.h> #include "sst-dsp.h" @@ -34,16 +34,13 @@ EXPORT_SYMBOL_GPL(sst_shim32_read); void sst_shim32_write64(void __iomem *addr, u32 offset, u64 value) { - memcpy_toio(addr + offset, &value, sizeof(value)); + writeq(value, addr + offset); } EXPORT_SYMBOL_GPL(sst_shim32_write64); u64 sst_shim32_read64(void __iomem *addr, u32 offset) { - u64 val; - - memcpy_fromio(&val, addr + offset, sizeof(val)); - return val; + return readq(addr + offset); } EXPORT_SYMBOL_GPL(sst_shim32_read64); |