@@ -31,6 +31,9 @@ static struct regmap *regmap_alloc(int count)
if (!map)
return NULL;
map->range_count = count;
+ map->bus_context = NULL;
+ map->reg_read = NULL;
+ map->reg_write = NULL;
return map;
}
@@ -241,6 +244,9 @@ struct regmap *devm_regmap_init(struct udevice *dev,
rc = regmap_init_mem(dev_ofnode(dev), mapp);
if (rc)
return ERR_PTR(rc);
+ (*mapp)->reg_read = config->reg_read;
+ (*mapp)->reg_write = config->reg_write;
+ (*mapp)->bus_context = bus_context;
devres_add(dev, mapp);
return *mapp;
@@ -320,6 +326,9 @@ int regmap_raw_read_range(struct regmap *map, uint range_num, uint offset,
struct regmap_range *range;
void *ptr;
+ if (map->reg_read)
+ return map->reg_read(map->bus_context, offset, valp);
+
if (range_num >= map->range_count) {
debug("%s: range index %d larger than range count\n",
__func__, range_num);
@@ -429,6 +438,9 @@ int regmap_raw_write_range(struct regmap *map, uint range_num, uint offset,
struct regmap_range *range;
void *ptr;
+ if (map->reg_write)
+ return map->reg_write(map->bus_context, offset,
+ *(unsigned int *)val);
if (range_num >= map->range_count) {
debug("%s: range index %d larger than range count\n",
__func__, range_num);
@@ -74,16 +74,36 @@ struct regmap_range {
};
struct regmap_bus;
-struct regmap_config;
+/**
+ * struct regmap_config - a way of accessing hardware/bus registers
+ *
+ * @reg_read: Optional callback that if filled will be used to perform
+ * all the reads from the registers. Should only be provided for
+ * devices whose read operation cannot be represented as a simple
+ * read operation on a bus such as SPI, I2C, etc. Most of the
+ * devices do not need this.
+ * @reg_write: Same as above for writing.
+ */
+struct regmap_config {
+ int (*reg_read)(void *context, unsigned int reg, unsigned int *val);
+ int (*reg_write)(void *context, unsigned int reg, unsigned int val);
+};
/**
* struct regmap - a way of accessing hardware/bus registers
*
* @range_count: Number of ranges available within the map
* @ranges: Array of ranges
+ * @bus_context: Data passed to bus-specific callbacks
+ * @reg_read: Optional callback that if filled will be used to perform
+ * all the reads from the registers.
+ * @reg_write: Same as above for writing.
*/
struct regmap {
enum regmap_endianness_t endianness;
+ void *bus_context;
+ int (*reg_read)(void *context, unsigned int reg, unsigned int *val);
+ int (*reg_write)(void *context, unsigned int reg, unsigned int val);
int range_count;
struct regmap_range ranges[0];
};
@@ -340,8 +360,8 @@ int regmap_init_mem_index(ofnode node, struct regmap **mapp, int index);
*
* @dev: Device that will be interacted with
* @bus: Bus-specific callbacks to use with device (IGNORED)
- * @bus_context: Data passed to bus-specific callbacks (IGNORED)
- * @config: Configuration for register map (IGNORED)
+ * @bus_context: Data passed to bus-specific callbacks
+ * @config: Configuration for register map
*
* The return value will be an ERR_PTR() on error or a valid pointer to
* a struct regmap.
Some linux drivers provide their own read/write functions to access data from/of the regmap. Adding support for it. Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com> --- drivers/core/regmap.c | 12 ++++++++++++ include/regmap.h | 26 +++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 3 deletions(-)