diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-01-11 19:49:27 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-01-11 19:49:27 +0100 |
commit | 6cf4569ce3561dec560147e6051959d6896b23d1 (patch) | |
tree | 2b3dca47673824975c35a708a6d9d24ff46a2771 /drivers/nvmem/qfprom.c | |
parent | 2e40795c3bf344cfb5220d94566205796e3ef19a (diff) | |
parent | 42e0ebdef53d91891939a475c6ef23970829ff99 (diff) |
Merge tag 'asoc-fix-v4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linussound-4.10-rc4
ASoC: Fixes for v4.10
As well as the usual smattering of driver specific fixes collected since
the merge window this has one particularly important fix to the core for
handling of aux_devs which was broken during the merge window by some of
the componentization refactoring.
Diffstat (limited to 'drivers/nvmem/qfprom.c')
-rw-r--r-- | drivers/nvmem/qfprom.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/nvmem/qfprom.c b/drivers/nvmem/qfprom.c index b5305f08b184..2bdb6c389328 100644 --- a/drivers/nvmem/qfprom.c +++ b/drivers/nvmem/qfprom.c @@ -21,11 +21,11 @@ static int qfprom_reg_read(void *context, unsigned int reg, void *_val, size_t bytes) { void __iomem *base = context; - u32 *val = _val; - int i = 0, words = bytes / 4; + u8 *val = _val; + int i = 0, words = bytes; while (words--) - *val++ = readl(base + reg + (i++ * 4)); + *val++ = readb(base + reg + i++); return 0; } @@ -34,11 +34,11 @@ static int qfprom_reg_write(void *context, unsigned int reg, void *_val, size_t bytes) { void __iomem *base = context; - u32 *val = _val; - int i = 0, words = bytes / 4; + u8 *val = _val; + int i = 0, words = bytes; while (words--) - writel(*val++, base + reg + (i++ * 4)); + writeb(*val++, base + reg + i++); return 0; } @@ -53,7 +53,7 @@ static int qfprom_remove(struct platform_device *pdev) static struct nvmem_config econfig = { .name = "qfprom", .owner = THIS_MODULE, - .stride = 4, + .stride = 1, .word_size = 1, .reg_read = qfprom_reg_read, .reg_write = qfprom_reg_write, |