Skip to content

Commit 0074f3f

Browse files
colin-foster-in-advantagebroonie
authored andcommitted
regmap: allow a defined reg_base to be added to every address
There's an inconsistency that arises when a register set can be accessed internally via MMIO, or externally via SPI. The VSC7514 chip allows both modes of operation. When internally accessed, the system utilizes __iomem, devm_ioremap_resource, and devm_regmap_init_mmio. For SPI it isn't possible to utilize memory-mapped IO. To properly operate, the resource base must be added to the register before every operation. Signed-off-by: Colin Foster <colin.foster@in-advantage.com> Link: https://lore.kernel.org/r/20220313224524.399947-3-colin.foster@in-advantage.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 86fc59e commit 0074f3f

3 files changed

Lines changed: 10 additions & 0 deletions

File tree

drivers/base/regmap/internal.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ struct regmap {
6363
regmap_unlock unlock;
6464
void *lock_arg; /* This is passed to lock/unlock functions */
6565
gfp_t alloc_flags;
66+
unsigned int reg_base;
6667

6768
struct device *dev; /* Device we do I/O on */
6869
void *work_buf; /* Scratch buffer used to format I/O */

drivers/base/regmap/regmap.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -821,6 +821,8 @@ struct regmap *__regmap_init(struct device *dev,
821821
else
822822
map->alloc_flags = GFP_KERNEL;
823823

824+
map->reg_base = config->reg_base;
825+
824826
map->format.reg_bytes = DIV_ROUND_UP(config->reg_bits, 8);
825827
map->format.pad_bytes = config->pad_bits / 8;
826828
map->format.reg_downshift = config->reg_downshift;
@@ -1736,6 +1738,7 @@ static int _regmap_raw_write_impl(struct regmap *map, unsigned int reg,
17361738
return ret;
17371739
}
17381740

1741+
reg += map->reg_base;
17391742
reg >>= map->format.reg_downshift;
17401743
map->format.format_reg(map->work_buf, reg, map->reg_shift);
17411744
regmap_set_work_buf_flag_mask(map, map->format.reg_bytes,
@@ -1907,6 +1910,7 @@ static int _regmap_bus_formatted_write(void *context, unsigned int reg,
19071910
return ret;
19081911
}
19091912

1913+
reg += map->reg_base;
19101914
reg >>= map->format.reg_downshift;
19111915
map->format.format_write(map, reg, val);
19121916

@@ -2349,6 +2353,7 @@ static int _regmap_raw_multi_reg_write(struct regmap *map,
23492353
unsigned int reg = regs[i].reg;
23502354
unsigned int val = regs[i].def;
23512355
trace_regmap_hw_write_start(map, reg, 1);
2356+
reg += map->reg_base;
23522357
reg >>= map->format.reg_downshift;
23532358
map->format.format_reg(u8, reg, map->reg_shift);
23542359
u8 += reg_bytes + pad_bytes;
@@ -2677,6 +2682,7 @@ static int _regmap_raw_read(struct regmap *map, unsigned int reg, void *val,
26772682
return ret;
26782683
}
26792684

2685+
reg += map->reg_base;
26802686
reg >>= map->format.reg_downshift;
26812687
map->format.format_reg(map->work_buf, reg, map->reg_shift);
26822688
regmap_set_work_buf_flag_mask(map, map->format.reg_bytes,

include/linux/regmap.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,8 @@ typedef void (*regmap_unlock)(void *);
239239
* used.
240240
* @reg_downshift: The number of bits to downshift the register before
241241
* performing any operations.
242+
* @reg_base: Value to be added to every register address before performing any
243+
* operation.
242244
* @pad_bits: Number of bits of padding between register and value.
243245
* @val_bits: Number of bits in a register value, mandatory.
244246
*
@@ -363,6 +365,7 @@ struct regmap_config {
363365
int reg_bits;
364366
int reg_stride;
365367
int reg_downshift;
368+
unsigned int reg_base;
366369
int pad_bits;
367370
int val_bits;
368371

0 commit comments

Comments
 (0)