Merge remote-tracking branches 'regmap/fix/irq', 'regmap/fix/rbtree' and 'regmap/fix/sync' into regmap-linus
This commit is contained in:
Коммит
7d720ee525
|
@ -307,7 +307,7 @@ static int regcache_rbtree_insert_to_block(struct regmap *map,
|
|||
if (pos == 0) {
|
||||
memmove(blk + offset * map->cache_word_size,
|
||||
blk, rbnode->blklen * map->cache_word_size);
|
||||
bitmap_shift_right(present, present, offset, blklen);
|
||||
bitmap_shift_left(present, present, offset, blklen);
|
||||
}
|
||||
|
||||
/* update the rbnode block, its size and the base register */
|
||||
|
|
|
@ -608,7 +608,8 @@ static int regcache_sync_block_single(struct regmap *map, void *block,
|
|||
for (i = start; i < end; i++) {
|
||||
regtmp = block_base + (i * map->reg_stride);
|
||||
|
||||
if (!regcache_reg_present(cache_present, i))
|
||||
if (!regcache_reg_present(cache_present, i) ||
|
||||
!regmap_writeable(map, regtmp))
|
||||
continue;
|
||||
|
||||
val = regcache_get_val(map, block, i);
|
||||
|
@ -677,7 +678,8 @@ static int regcache_sync_block_raw(struct regmap *map, void *block,
|
|||
for (i = start; i < end; i++) {
|
||||
regtmp = block_base + (i * map->reg_stride);
|
||||
|
||||
if (!regcache_reg_present(cache_present, i)) {
|
||||
if (!regcache_reg_present(cache_present, i) ||
|
||||
!regmap_writeable(map, regtmp)) {
|
||||
ret = regcache_sync_block_raw_flush(map, &data,
|
||||
base, regtmp);
|
||||
if (ret != 0)
|
||||
|
|
|
@ -499,7 +499,8 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
|
|||
goto err_alloc;
|
||||
}
|
||||
|
||||
ret = request_threaded_irq(irq, NULL, regmap_irq_thread, irq_flags,
|
||||
ret = request_threaded_irq(irq, NULL, regmap_irq_thread,
|
||||
irq_flags | IRQF_ONESHOT,
|
||||
chip->name, d);
|
||||
if (ret != 0) {
|
||||
dev_err(map->dev, "Failed to request IRQ %d for %s: %d\n",
|
||||
|
|
Загрузка…
Ссылка в новой задаче