Skip to content

Commit 4df6b6b

Browse files
glneolag-linaro
authored andcommitted
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>
1 parent 7186d03 commit 4df6b6b

1 file changed

Lines changed: 11 additions & 17 deletions

File tree

drivers/leds/leds-lp8860.c

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,12 @@
8989
* @client: Pointer to the I2C client
9090
* @led_dev: led class device pointer
9191
* @regmap: Devices register map
92-
* @eeprom_regmap: EEPROM register map
9392
*/
9493
struct lp8860_led {
9594
struct mutex lock;
9695
struct i2c_client *client;
9796
struct led_classdev led_dev;
9897
struct regmap *regmap;
99-
struct regmap *eeprom_regmap;
10098
};
10199

102100
static const struct reg_sequence lp8860_eeprom_disp_regs[] = {
@@ -231,7 +229,7 @@ static int lp8860_init(struct lp8860_led *led)
231229
}
232230

233231
reg_count = ARRAY_SIZE(lp8860_eeprom_disp_regs);
234-
ret = regmap_multi_reg_write(led->eeprom_regmap, lp8860_eeprom_disp_regs, reg_count);
232+
ret = regmap_multi_reg_write(led->regmap, lp8860_eeprom_disp_regs, reg_count);
235233
if (ret) {
236234
dev_err(&led->client->dev, "Failed writing EEPROM\n");
237235
goto out;
@@ -255,17 +253,21 @@ static int lp8860_init(struct lp8860_led *led)
255253
return ret;
256254
}
257255

258-
static const struct regmap_config lp8860_regmap_config = {
259-
.reg_bits = 8,
260-
.val_bits = 8,
256+
static const struct regmap_range lp8860_reg_ranges[] = {
257+
regmap_reg_range(LP8860_DISP_CL1_BRT_MSB, LP8860_EEPROM_UNLOCK),
258+
regmap_reg_range(LP8860_EEPROM_REG_0, LP8860_EEPROM_REG_24),
259+
};
261260

262-
.max_register = LP8860_EEPROM_UNLOCK,
261+
static const struct regmap_access_table lp8860_reg_table = {
262+
.yes_ranges = lp8860_reg_ranges,
263+
.n_yes_ranges = ARRAY_SIZE(lp8860_reg_ranges),
263264
};
264265

265-
static const struct regmap_config lp8860_eeprom_regmap_config = {
266+
static const struct regmap_config lp8860_regmap_config = {
266267
.reg_bits = 8,
267268
.val_bits = 8,
268-
269+
.rd_table = &lp8860_reg_table,
270+
.wr_table = &lp8860_reg_table,
269271
.max_register = LP8860_EEPROM_REG_24,
270272
};
271273

@@ -319,14 +321,6 @@ static int lp8860_probe(struct i2c_client *client)
319321
return ret;
320322
}
321323

322-
led->eeprom_regmap = devm_regmap_init_i2c(client, &lp8860_eeprom_regmap_config);
323-
if (IS_ERR(led->eeprom_regmap)) {
324-
ret = PTR_ERR(led->eeprom_regmap);
325-
dev_err(&client->dev, "Failed to allocate register map: %d\n",
326-
ret);
327-
return ret;
328-
}
329-
330324
ret = lp8860_init(led);
331325
if (ret)
332326
return ret;

0 commit comments

Comments
 (0)