Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
leds: lp8860: Use a single regmap table
Instead of a regmap table each for the normal registers and the EEPROM
registers, make one table and use an access table to prevent read/write
to/from the registers between the two ranges. Slightly simplifies the
code.
Signed-off-by: Andrew Davis <afd@ti.com>
Link: https://patch.msgid.link/20260305203706.841384-1-afd@ti.com
Signed-off-by: Lee Jones <lee@kernel.org>
authored by
Andrew Davis
and committed by
Lee Jones
4df6b6b3
7186d033
+13
-19
+13
-19
drivers/leds/leds-lp8860.c
+13
-19
drivers/leds/leds-lp8860.c
···
89
89
* @client: Pointer to the I2C client
90
90
* @led_dev: led class device pointer
91
91
* @regmap: Devices register map
92
-
* @eeprom_regmap: EEPROM register map
93
92
*/
94
93
struct lp8860_led {
95
94
struct mutex lock;
96
95
struct i2c_client *client;
97
96
struct led_classdev led_dev;
98
97
struct regmap *regmap;
99
-
struct regmap *eeprom_regmap;
100
98
};
101
99
102
100
static const struct reg_sequence lp8860_eeprom_disp_regs[] = {
···
229
231
}
230
232
231
233
reg_count = ARRAY_SIZE(lp8860_eeprom_disp_regs);
232
-
ret = regmap_multi_reg_write(led->eeprom_regmap, lp8860_eeprom_disp_regs, reg_count);
234
+
ret = regmap_multi_reg_write(led->regmap, lp8860_eeprom_disp_regs, reg_count);
233
235
if (ret) {
234
236
dev_err(&led->client->dev, "Failed writing EEPROM\n");
235
237
goto out;
···
253
255
return ret;
254
256
}
255
257
258
+
static const struct regmap_range lp8860_reg_ranges[] = {
259
+
regmap_reg_range(LP8860_DISP_CL1_BRT_MSB, LP8860_EEPROM_UNLOCK),
260
+
regmap_reg_range(LP8860_EEPROM_REG_0, LP8860_EEPROM_REG_24),
261
+
};
262
+
263
+
static const struct regmap_access_table lp8860_reg_table = {
264
+
.yes_ranges = lp8860_reg_ranges,
265
+
.n_yes_ranges = ARRAY_SIZE(lp8860_reg_ranges),
266
+
};
267
+
256
268
static const struct regmap_config lp8860_regmap_config = {
257
269
.reg_bits = 8,
258
270
.val_bits = 8,
259
-
260
-
.max_register = LP8860_EEPROM_UNLOCK,
261
-
};
262
-
263
-
static const struct regmap_config lp8860_eeprom_regmap_config = {
264
-
.reg_bits = 8,
265
-
.val_bits = 8,
266
-
271
+
.rd_table = &lp8860_reg_table,
272
+
.wr_table = &lp8860_reg_table,
267
273
.max_register = LP8860_EEPROM_REG_24,
268
274
};
269
275
···
316
314
led->regmap = devm_regmap_init_i2c(client, &lp8860_regmap_config);
317
315
if (IS_ERR(led->regmap)) {
318
316
ret = PTR_ERR(led->regmap);
319
-
dev_err(&client->dev, "Failed to allocate register map: %d\n",
320
-
ret);
321
-
return ret;
322
-
}
323
-
324
-
led->eeprom_regmap = devm_regmap_init_i2c(client, &lp8860_eeprom_regmap_config);
325
-
if (IS_ERR(led->eeprom_regmap)) {
326
-
ret = PTR_ERR(led->eeprom_regmap);
327
317
dev_err(&client->dev, "Failed to allocate register map: %d\n",
328
318
ret);
329
319
return ret;