regmap: Add raw read/write functions

The regmap functions currently assume that all register map accesses
have a data width of 32 bits, but there are maps that have different
widths.

To rectify this, implement the regmap_raw_read and regmap_raw_write
functions from the Linux kernel API that specify the width of a desired
read or write operation on a regmap.

Implement the regmap_read and regmap_write functions using these raw
functions in a backwards-compatible manner.

Reviewed-by: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Mario Six <mario.six@gdsys.cc>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Mario Six
2018-10-15 09:24:10 +02:00
committed by Simon Glass
parent 4d9ada54a2
commit 84ff8f622d
2 changed files with 115 additions and 7 deletions

View File

@@ -188,22 +188,72 @@ int regmap_uninit(struct regmap *map)
return 0;
}
int regmap_raw_read(struct regmap *map, uint offset, void *valp, size_t val_len)
{
void *ptr;
ptr = map_physmem(map->ranges[0].start + offset, val_len, MAP_NOCACHE);
switch (val_len) {
case REGMAP_SIZE_8:
*((u8 *)valp) = readb((u8 *)ptr);
break;
case REGMAP_SIZE_16:
*((u16 *)valp) = readw((u16 *)ptr);
break;
case REGMAP_SIZE_32:
*((u32 *)valp) = readl((u32 *)ptr);
break;
#if defined(readq)
case REGMAP_SIZE_64:
*((u64 *)valp) = readq((u64 *)ptr);
break;
#endif
default:
debug("%s: regmap size %zu unknown\n", __func__, val_len);
return -EINVAL;
}
return 0;
}
int regmap_read(struct regmap *map, uint offset, uint *valp)
{
u32 *ptr = map_physmem(map->ranges[0].start + offset, 4, MAP_NOCACHE);
return regmap_raw_read(map, offset, valp, REGMAP_SIZE_32);
}
*valp = le32_to_cpu(readl(ptr));
int regmap_raw_write(struct regmap *map, uint offset, const void *val,
size_t val_len)
{
void *ptr;
ptr = map_physmem(map->ranges[0].start + offset, val_len, MAP_NOCACHE);
switch (val_len) {
case REGMAP_SIZE_8:
writeb(*((u8 *)val), (u8 *)ptr);
break;
case REGMAP_SIZE_16:
writew(*((u16 *)val), (u16 *)ptr);
break;
case REGMAP_SIZE_32:
writel(*((u32 *)val), (u32 *)ptr);
break;
#if defined(writeq)
case REGMAP_SIZE_64:
writeq(*((u64 *)val), (u64 *)ptr);
break;
#endif
default:
debug("%s: regmap size %zu unknown\n", __func__, val_len);
return -EINVAL;
}
return 0;
}
int regmap_write(struct regmap *map, uint offset, uint val)
{
u32 *ptr = map_physmem(map->ranges[0].start + offset, 4, MAP_NOCACHE);
writel(cpu_to_le32(val), ptr);
return 0;
return regmap_raw_write(map, offset, &val, REGMAP_SIZE_32);
}
int regmap_update_bits(struct regmap *map, uint offset, uint mask, uint val)