Browse Source

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>
Jens Kuske 9 years ago
parent
commit
febe6569fa
1 changed files with 3 additions and 2 deletions
  1. 3 2
      drivers/soc/sunxi/sunxi_sram.c

+ 3 - 2
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 = readl(base + sram_data->reg);
 			val >>= sram_data->offset;
 			val >>= sram_data->offset;
-			val &= sram_data->width;
+			val &= GENMASK(sram_data->width - 1, 0);
 
 
 			for (func = sram_data->func; func->func; func++) {
 			for (func = sram_data->func; func->func; func++) {
 				seq_printf(s, "\t\t%s%c\n", 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;
 		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 = readl(base + sram_data->reg);
 	val &= ~mask;
 	val &= ~mask;
 	writel(val | ((device << sram_data->offset) & mask),
 	writel(val | ((device << sram_data->offset) & mask),