aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
authorMark Brown <broonie@kernel.org>2026-05-29 23:14:14 +0100
committerMark Brown <broonie@kernel.org>2026-05-29 23:14:14 +0100
commit4181e2db3108ac504db8732d29e01e3d3a70a3f0 (patch)
tree1ec4a73a9c100539fe52be0e99774b0c46b11aee /drivers
parent2a14b4944ef8d54460ea5a4b91ce7b39bbc36884 (diff)
parentb4c01497688528fc04c717842f8f310569f52629 (diff)
downloadlinux-next-history-4181e2db3108ac504db8732d29e01e3d3a70a3f0.tar.gz
Merge branch 'at24/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
Diffstat (limited to 'drivers')
-rw-r--r--drivers/misc/eeprom/at24.c62
1 files changed, 31 insertions, 31 deletions
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
index 0200288d3a7ab..5d5f357a19961 100644
--- a/drivers/misc/eeprom/at24.c
+++ b/drivers/misc/eeprom/at24.c
@@ -215,37 +215,37 @@ AT24_CHIP_DATA(at24_data_24c2048, 2097152 / 8, AT24_FLAG_ADDR16);
AT24_CHIP_DATA(at24_data_INT3499, 8192 / 8, 0);
static const struct i2c_device_id at24_ids[] = {
- { "24c00", (kernel_ulong_t)&at24_data_24c00 },
- { "24c01", (kernel_ulong_t)&at24_data_24c01 },
- { "24cs01", (kernel_ulong_t)&at24_data_24cs01 },
- { "24c02", (kernel_ulong_t)&at24_data_24c02 },
- { "24cs02", (kernel_ulong_t)&at24_data_24cs02 },
- { "24mac402", (kernel_ulong_t)&at24_data_24mac402 },
- { "24mac602", (kernel_ulong_t)&at24_data_24mac602 },
- { "24aa025e48", (kernel_ulong_t)&at24_data_24aa025e48 },
- { "24aa025e64", (kernel_ulong_t)&at24_data_24aa025e64 },
- { "spd", (kernel_ulong_t)&at24_data_spd },
- { "24c02-vaio", (kernel_ulong_t)&at24_data_24c02_vaio },
- { "24c04", (kernel_ulong_t)&at24_data_24c04 },
- { "24cs04", (kernel_ulong_t)&at24_data_24cs04 },
- { "24c08", (kernel_ulong_t)&at24_data_24c08 },
- { "24cs08", (kernel_ulong_t)&at24_data_24cs08 },
- { "24c16", (kernel_ulong_t)&at24_data_24c16 },
- { "24cs16", (kernel_ulong_t)&at24_data_24cs16 },
- { "24c32", (kernel_ulong_t)&at24_data_24c32 },
- { "24c32d-wl", (kernel_ulong_t)&at24_data_24c32d_wlp },
- { "24cs32", (kernel_ulong_t)&at24_data_24cs32 },
- { "24c64", (kernel_ulong_t)&at24_data_24c64 },
- { "24c64-wl", (kernel_ulong_t)&at24_data_24c64d_wlp },
- { "24cs64", (kernel_ulong_t)&at24_data_24cs64 },
- { "24c128", (kernel_ulong_t)&at24_data_24c128 },
- { "24c256", (kernel_ulong_t)&at24_data_24c256 },
- { "24256e-wl", (kernel_ulong_t)&at24_data_24256e_wlp },
- { "24c512", (kernel_ulong_t)&at24_data_24c512 },
- { "24c1024", (kernel_ulong_t)&at24_data_24c1024 },
- { "24c1025", (kernel_ulong_t)&at24_data_24c1025 },
- { "24c2048", (kernel_ulong_t)&at24_data_24c2048 },
- { "at24", 0 },
+ { .name = "24c00", .driver_data = (kernel_ulong_t)&at24_data_24c00 },
+ { .name = "24c01", .driver_data = (kernel_ulong_t)&at24_data_24c01 },
+ { .name = "24cs01", .driver_data = (kernel_ulong_t)&at24_data_24cs01 },
+ { .name = "24c02", .driver_data = (kernel_ulong_t)&at24_data_24c02 },
+ { .name = "24cs02", .driver_data = (kernel_ulong_t)&at24_data_24cs02 },
+ { .name = "24mac402", .driver_data = (kernel_ulong_t)&at24_data_24mac402 },
+ { .name = "24mac602", .driver_data = (kernel_ulong_t)&at24_data_24mac602 },
+ { .name = "24aa025e48", .driver_data = (kernel_ulong_t)&at24_data_24aa025e48 },
+ { .name = "24aa025e64", .driver_data = (kernel_ulong_t)&at24_data_24aa025e64 },
+ { .name = "spd", .driver_data = (kernel_ulong_t)&at24_data_spd },
+ { .name = "24c02-vaio", .driver_data = (kernel_ulong_t)&at24_data_24c02_vaio },
+ { .name = "24c04", .driver_data = (kernel_ulong_t)&at24_data_24c04 },
+ { .name = "24cs04", .driver_data = (kernel_ulong_t)&at24_data_24cs04 },
+ { .name = "24c08", .driver_data = (kernel_ulong_t)&at24_data_24c08 },
+ { .name = "24cs08", .driver_data = (kernel_ulong_t)&at24_data_24cs08 },
+ { .name = "24c16", .driver_data = (kernel_ulong_t)&at24_data_24c16 },
+ { .name = "24cs16", .driver_data = (kernel_ulong_t)&at24_data_24cs16 },
+ { .name = "24c32", .driver_data = (kernel_ulong_t)&at24_data_24c32 },
+ { .name = "24c32d-wl", .driver_data = (kernel_ulong_t)&at24_data_24c32d_wlp },
+ { .name = "24cs32", .driver_data = (kernel_ulong_t)&at24_data_24cs32 },
+ { .name = "24c64", .driver_data = (kernel_ulong_t)&at24_data_24c64 },
+ { .name = "24c64-wl", .driver_data = (kernel_ulong_t)&at24_data_24c64d_wlp },
+ { .name = "24cs64", .driver_data = (kernel_ulong_t)&at24_data_24cs64 },
+ { .name = "24c128", .driver_data = (kernel_ulong_t)&at24_data_24c128 },
+ { .name = "24c256", .driver_data = (kernel_ulong_t)&at24_data_24c256 },
+ { .name = "24256e-wl", .driver_data = (kernel_ulong_t)&at24_data_24256e_wlp },
+ { .name = "24c512", .driver_data = (kernel_ulong_t)&at24_data_24c512 },
+ { .name = "24c1024", .driver_data = (kernel_ulong_t)&at24_data_24c1024 },
+ { .name = "24c1025", .driver_data = (kernel_ulong_t)&at24_data_24c1025 },
+ { .name = "24c2048", .driver_data = (kernel_ulong_t)&at24_data_24c2048 },
+ { .name = "at24", .driver_data = 0 },
{ /* END OF LIST */ }
};
MODULE_DEVICE_TABLE(i2c, at24_ids);