Merge remote-tracking branch 'regmap/topic/flat' into regmap-next
This commit is contained in:
commit
7798b582d3
|
@ -1,5 +1,5 @@
|
|||
obj-$(CONFIG_REGMAP) += regmap.o regcache.o
|
||||
obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o
|
||||
obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o regcache-flat.o
|
||||
obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o
|
||||
obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
|
||||
obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o
|
||||
|
|
|
@ -196,5 +196,6 @@ void regmap_async_complete_cb(struct regmap_async *async, int ret);
|
|||
|
||||
extern struct regcache_ops regcache_rbtree_ops;
|
||||
extern struct regcache_ops regcache_lzo_ops;
|
||||
extern struct regcache_ops regcache_flat_ops;
|
||||
|
||||
#endif
|
||||
|
|
72
drivers/base/regmap/regcache-flat.c
Normal file
72
drivers/base/regmap/regcache-flat.c
Normal file
|
@ -0,0 +1,72 @@
|
|||
/*
|
||||
* Register cache access API - flat caching support
|
||||
*
|
||||
* Copyright 2012 Wolfson Microelectronics plc
|
||||
*
|
||||
* Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
#include <linux/slab.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/seq_file.h>
|
||||
|
||||
#include "internal.h"
|
||||
|
||||
static int regcache_flat_init(struct regmap *map)
|
||||
{
|
||||
int i;
|
||||
unsigned int *cache;
|
||||
|
||||
map->cache = kzalloc(sizeof(unsigned int) * (map->max_register + 1),
|
||||
GFP_KERNEL);
|
||||
if (!map->cache)
|
||||
return -ENOMEM;
|
||||
|
||||
cache = map->cache;
|
||||
|
||||
for (i = 0; i < map->num_reg_defaults; i++)
|
||||
cache[map->reg_defaults[i].reg] = map->reg_defaults[i].def;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int regcache_flat_exit(struct regmap *map)
|
||||
{
|
||||
kfree(map->cache);
|
||||
map->cache = NULL;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int regcache_flat_read(struct regmap *map,
|
||||
unsigned int reg, unsigned int *value)
|
||||
{
|
||||
unsigned int *cache = map->cache;
|
||||
|
||||
*value = cache[reg];
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int regcache_flat_write(struct regmap *map, unsigned int reg,
|
||||
unsigned int value)
|
||||
{
|
||||
unsigned int *cache = map->cache;
|
||||
|
||||
cache[reg] = value;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct regcache_ops regcache_flat_ops = {
|
||||
.type = REGCACHE_FLAT,
|
||||
.name = "flat",
|
||||
.init = regcache_flat_init,
|
||||
.exit = regcache_flat_exit,
|
||||
.read = regcache_flat_read,
|
||||
.write = regcache_flat_write,
|
||||
};
|
|
@ -22,6 +22,7 @@
|
|||
static const struct regcache_ops *cache_types[] = {
|
||||
®cache_rbtree_ops,
|
||||
®cache_lzo_ops,
|
||||
®cache_flat_ops,
|
||||
};
|
||||
|
||||
static int regcache_hw_init(struct regmap *map)
|
||||
|
|
|
@ -28,7 +28,8 @@ struct regmap_range_cfg;
|
|||
enum regcache_type {
|
||||
REGCACHE_NONE,
|
||||
REGCACHE_RBTREE,
|
||||
REGCACHE_COMPRESSED
|
||||
REGCACHE_COMPRESSED,
|
||||
REGCACHE_FLAT,
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue