github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 20:46:48 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

at24 updates for v6.13-rc1

Browse Source 
- add support for the lockable page on ST M24256E
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEFp3rbAvDxGAT0sefEacuoBRx13IFAmcrMMcACgkQEacuoBRx
 13IogQ/8DkYLd7mYxuPmzSW3+7Y+OoDCYAlRtlO0HCaeOjhVw5DrsF7mVgPfyv0L
 2JE4VpLLrSW6LfUpNpaj+GgfnU3CNZNXDtw9hDu6dTsopxVzXeA+rtnRsTuldLID
 /U4KYVUZVJRFBmbmKLleWqlDHahBSmN1wdUqcBqQC6lvA6/7CQp2b5tiGv35n4fl
 bMo4i9o/mBTCbuAdcSOW1GOQEE2UubRlrf7Tlp4Kl7wgrdQucd+XVHhKCy3m+MQs
 KYxZmnkx6sIWobSWlUdsBJ63gUbpuWs3HThk5hT6YV1rzP31Bb0vIPK4rHIjUL/G
 pr4hRHOtcldKJp9H0x7AiDIfPWVvPMNVmX3b89M9tUN0mJDBYtd07ATRfuvkuONt
 SyNLfcDaAF+LQ6MVNFAJz36rVJ6TK+1mt7b/486Fq9Zaebx1C2kBsbltiLwLtINh
 0fzd96c/fnyC/7GUxuWis845TQ9b4D8h/BNQkT88Cbn4NiHyi1blyZVfvEUOs4qx
 pxPnxypA4k/+4JBDhtPczu6t3Of8px91TtO8qLOCZB4fMiXxfS8vEqw+MseDjeYI
 ZF++1jYAAXYSvwBGaSCJvhPeA0E1xy8ueXLEPXgPV+M4xEbtJK9kdmlrKqtPCk9E
 KrereMGkCA/0IxWooQoeNtZoz/DaL2qVol/pFMs+lhBfyXvoetU=
 =+6hV
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Wolfram Sang 2024-11-14 10:37:04 +01:00
commit 433c691662
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/devicetree/bindings/eeprom/at24.yaml
View File

@ -141,6 +141,8 @@ properties:
- const: microchip,24aa025e48
- items:
- const: microchip,24aa025e64
- items:
- const: st,24256e-wl
- pattern: '^atmel,24c(32|64)d-wl$' # Actual vendor is st
label:

4
drivers/misc/eeprom/at24.c
View File

@ -207,6 +207,8 @@ AT24_CHIP_DATA(at24_data_24cs64, 16,
AT24_FLAG_ADDR16 | AT24_FLAG_SERIAL | AT24_FLAG_READONLY);
AT24_CHIP_DATA(at24_data_24c128, 131072 / 8, AT24_FLAG_ADDR16);
AT24_CHIP_DATA(at24_data_24c256, 262144 / 8, AT24_FLAG_ADDR16);
/* M24256E Additional Write lockable page (M24256E-F order codes) */
AT24_CHIP_DATA(at24_data_24256e_wlp, 64, AT24_FLAG_ADDR16);
AT24_CHIP_DATA(at24_data_24c512, 524288 / 8, AT24_FLAG_ADDR16);
AT24_CHIP_DATA(at24_data_24c1024, 1048576 / 8, AT24_FLAG_ADDR16);
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[] = {
{ "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 },
@ -278,6 +281,7 @@ static const struct of_device_id __maybe_unused at24_of_match[] = {
{ .compatible = "atmel,24c2048", .data = &at24_data_24c2048 },
{ .compatible = "microchip,24aa025e48", .data = &at24_data_24aa025e48 },
{ .compatible = "microchip,24aa025e64", .data = &at24_data_24aa025e64 },
{ .compatible = "st,24256e-wl", .data = &at24_data_24256e_wlp },
{ /* END OF LIST */ },
};
MODULE_DEVICE_TABLE(of, at24_of_match);