Skip to content

Commit 054b747

Browse files
committed
Merge tag 'regmap-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
Pull regmap updates from Mark Brown: "Only a couple of small patches this release, one refactoring struct regmap to pack it more efficiently and another which makes our way of setting all bits consistent in the regmap-irq code" * tag 'regmap-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: regmap: irq: Use one way of setting all bits in the register regmap: Reorder 'struct regmap'
2 parents 883ab4e + 153dbf4 commit 054b747

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

drivers/base/regmap/internal.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ struct regmap {
7373
void *bus_context;
7474
const char *name;
7575

76-
bool async;
7776
spinlock_t async_lock;
7877
wait_queue_head_t async_waitq;
7978
struct list_head async_list;
8079
struct list_head async_free;
8180
int async_ret;
81+
bool async;
8282

8383
#ifdef CONFIG_DEBUG_FS
8484
bool debugfs_disable;
@@ -117,8 +117,6 @@ struct regmap {
117117
void *val_buf, size_t val_size);
118118
int (*write)(void *context, const void *data, size_t count);
119119

120-
bool defer_caching;
121-
122120
unsigned long read_flag_mask;
123121
unsigned long write_flag_mask;
124122

@@ -127,6 +125,8 @@ struct regmap {
127125
int reg_stride;
128126
int reg_stride_order;
129127

128+
bool defer_caching;
129+
130130
/* If set, will always write field to HW. */
131131
bool force_write_field;
132132

@@ -161,6 +161,9 @@ struct regmap {
161161
struct reg_sequence *patch;
162162
int patch_regs;
163163

164+
/* if set, the regmap core can sleep */
165+
bool can_sleep;
166+
164167
/* if set, converts bulk read to single read */
165168
bool use_single_read;
166169
/* if set, converts bulk write to single write */
@@ -176,9 +179,6 @@ struct regmap {
176179
void *selector_work_buf; /* Scratch buffer used for selector */
177180

178181
struct hwspinlock *hwlock;
179-
180-
/* if set, the regmap core can sleep */
181-
bool can_sleep;
182182
};
183183

184184
struct regcache_ops {

drivers/base/regmap/regmap-irq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,
823823
/* Ack masked but set interrupts */
824824
if (d->chip->no_status) {
825825
/* no status register so default to all active */
826-
d->status_buf[i] = GENMASK(31, 0);
826+
d->status_buf[i] = UINT_MAX;
827827
} else {
828828
reg = d->get_irq_reg(d, d->chip->status_base, i);
829829
ret = regmap_read(map, reg, &d->status_buf[i]);

0 commit comments

Comments
 (0)