Skip to content

Commit 433c691

Browse files
author
Wolfram Sang
committed
Merge tag 'at24-updates-for-v6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-mergewindow
at24 updates for v6.13-rc1 - add support for the lockable page on ST M24256E
2 parents 397295d + 339cb28 commit 433c691

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

Documentation/devicetree/bindings/eeprom/at24.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ properties:
141141
- const: microchip,24aa025e48
142142
- items:
143143
- const: microchip,24aa025e64
144+
- items:
145+
- const: st,24256e-wl
144146
- pattern: '^atmel,24c(32|64)d-wl$' # Actual vendor is st
145147

146148
label:

drivers/misc/eeprom/at24.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,8 @@ AT24_CHIP_DATA(at24_data_24cs64, 16,
207207
AT24_FLAG_ADDR16 | AT24_FLAG_SERIAL | AT24_FLAG_READONLY);
208208
AT24_CHIP_DATA(at24_data_24c128, 131072 / 8, AT24_FLAG_ADDR16);
209209
AT24_CHIP_DATA(at24_data_24c256, 262144 / 8, AT24_FLAG_ADDR16);
210+
/* M24256E Additional Write lockable page (M24256E-F order codes) */
211+
AT24_CHIP_DATA(at24_data_24256e_wlp, 64, AT24_FLAG_ADDR16);
210212
AT24_CHIP_DATA(at24_data_24c512, 524288 / 8, AT24_FLAG_ADDR16);
211213
AT24_CHIP_DATA(at24_data_24c1024, 1048576 / 8, AT24_FLAG_ADDR16);
212214
AT24_CHIP_DATA_BS(at24_data_24c1025, 1048576 / 8, AT24_FLAG_ADDR16, 2);
@@ -240,6 +242,7 @@ static const struct i2c_device_id at24_ids[] = {
240242
{ "24cs64", (kernel_ulong_t)&at24_data_24cs64 },
241243
{ "24c128", (kernel_ulong_t)&at24_data_24c128 },
242244
{ "24c256", (kernel_ulong_t)&at24_data_24c256 },
245+
{ "24256e-wl", (kernel_ulong_t)&at24_data_24256e_wlp },
243246
{ "24c512", (kernel_ulong_t)&at24_data_24c512 },
244247
{ "24c1024", (kernel_ulong_t)&at24_data_24c1024 },
245248
{ "24c1025", (kernel_ulong_t)&at24_data_24c1025 },
@@ -278,6 +281,7 @@ static const struct of_device_id __maybe_unused at24_of_match[] = {
278281
{ .compatible = "atmel,24c2048", .data = &at24_data_24c2048 },
279282
{ .compatible = "microchip,24aa025e48", .data = &at24_data_24aa025e48 },
280283
{ .compatible = "microchip,24aa025e64", .data = &at24_data_24aa025e64 },
284+
{ .compatible = "st,24256e-wl", .data = &at24_data_24256e_wlp },
281285
{ /* END OF LIST */ },
282286
};
283287
MODULE_DEVICE_TABLE(of, at24_of_match);

0 commit comments

Comments
 (0)