diff options
| author | Jens Kuske <jenskuske@gmail.com> | 2016-01-27 14:51:13 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2016-01-27 20:29:20 +0100 |
| commit | febe6569fae4b5e663f0a31d9dbf054d3b588ff5 (patch) | |
| tree | 3f150a24986bb67877d36c6bb5a22b4a1037470d /drivers/soc/sunxi | |
| parent | 2d3e8f70317cc6df93465e51f451d41bad32e010 (diff) | |
| download | linux-stable-febe6569fae4b5e663f0a31d9dbf054d3b588ff5.tar.gz linux-stable-febe6569fae4b5e663f0a31d9dbf054d3b588ff5.tar.bz2 linux-stable-febe6569fae4b5e663f0a31d9dbf054d3b588ff5.zip | |
drivers: soc: sunxi: Fix mask generation for SRAM mapping
GENMASK is inclusive on both ends, therefor one has to be
subtracted from the width.
Also fixes the mask for debug output.
Signed-off-by: Jens Kuske <jenskuske@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'drivers/soc/sunxi')
| -rw-r--r-- | drivers/soc/sunxi/sunxi_sram.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/soc/sunxi/sunxi_sram.c b/drivers/soc/sunxi/sunxi_sram.c index bc52670c8f4b..99e354c8f53f 100644 --- a/drivers/soc/sunxi/sunxi_sram.c +++ b/drivers/soc/sunxi/sunxi_sram.c @@ -117,7 +117,7 @@ static int sunxi_sram_show(struct seq_file *s, void *data) val = readl(base + sram_data->reg); val >>= sram_data->offset; - val &= sram_data->width; + val &= GENMASK(sram_data->width - 1, 0); for (func = sram_data->func; func->func; func++) { seq_printf(s, "\t\t%s%c\n", func->func, @@ -208,7 +208,8 @@ int sunxi_sram_claim(struct device *dev) return -EBUSY; } - mask = GENMASK(sram_data->offset + sram_data->width, sram_data->offset); + mask = GENMASK(sram_data->offset + sram_data->width - 1, + sram_data->offset); val = readl(base + sram_data->reg); val &= ~mask; writel(val | ((device << sram_data->offset) & mask), |