mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-28 23:24:50 +00:00
Code Issues Releases Wiki Activity

at24: updates for 4.21

Browse source 
Adding a new compatible for 24c2048.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEFp3rbAvDxGAT0sefEacuoBRx13IFAlwRQA4ACgkQEacuoBRx
 13JR8BAAoo10W2lAP4dG2W5/n+q3frMq7o5p2UoBVKaYfPVygkZmtCRsNCBDuANO
 j2VdpSR5EfAJuAiBow0Jn1ey75OwOWdjJ7ljlpNYKrMc+9o9ViQs0pf5Snt2Nwe4
 UmnBmiZygcEd17frahCCTfQxXyvSAnTdAb5VfiblOq+VnefdaJYB2JgCg4zVxmqA
 2CKwzmeyehe5AfFxeZk0ZtqRgiaWdKOH/yDstjw93C9pbysou17ceFWAglOcV0yY
 4zjau9jGfx88mN2Zh2QukmxK4dsx+QkXXyCHdPzXeMiYOZLNDzaP7zCFsd824AWf
 GkoRSYi7mS6eIe8Tf2QKLwxMq+CS7dsZtMloXlpz9hBz8KxpIKpHTi6ERgvc5phW
 DpjlxHqw08GG+CwOhTLgv3hGGPCTV6v9VzDzwIICViVh2d6DmqRBQfR1SIs6tlmA
 30mbI2AU85H9PGJGD8to+ietGWWxjbdVuKf68/nmfCWqvoVi3jEM/iU1pUo91fS1
 8ru+f28MvA/3KpVto2aJiOu4XK0Yyg1jZe5UED010A6oFMqGhpyB5HOgfLaQY1kO
 xdb/Cq295NpbtbkWPDBup/2TGWo0jcdLklZOvK4MTRqhHx+pzfbqkd0wUTebNFXU
 AxXXD4TuuyWakBnvqaRXqyAg0RL5719gREl1GhWgpb+oWAD9uoE=
 =tkO6
 -----END PGP SIGNATURE-----

Merge tag 'at24-4.21-updates-for-wolfram' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-5.0

at24: updates for 4.21

Adding a new compatible for 24c2048.
This commit is contained in:
Wolfram Sang 2018-12-17 23:14:10 +01:00
commit 0cb47164ed
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Documentation/devicetree/bindings/eeprom/at24.txt
View file

@ -27,6 +27,7 @@ Required properties:
"atmel,24c256",
"atmel,24c512",
"atmel,24c1024",
"atmel,24c2048",
If <manufacturer> is not "atmel", then a fallback must be used
with the same <model> and "atmel" as manufacturer.

2
drivers/misc/eeprom/Kconfig
View file

@ -13,7 +13,7 @@ config EEPROM_AT24
ones like at24c64, 24lc02 or fm24c04:
24c00, 24c01, 24c02, spd (readonly 24c02), 24c04, 24c08,
24c16, 24c32, 24c64, 24c128, 24c256, 24c512, 24c1024
24c16, 24c32, 24c64, 24c128, 24c256, 24c512, 24c1024, 24c2048
Unless you like data loss puzzles, always be sure that any chip
you configure as a 24c32 (32 kbit) or larger is NOT really a

3
drivers/misc/eeprom/at24.c
View file

@ -156,6 +156,7 @@ AT24_CHIP_DATA(at24_data_24c128, 131072 / 8, AT24_FLAG_ADDR16);
AT24_CHIP_DATA(at24_data_24c256, 262144 / 8, 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(at24_data_24c2048, 2097152 / 8, AT24_FLAG_ADDR16);
/* identical to 24c08 ? */
AT24_CHIP_DATA(at24_data_INT3499, 8192 / 8, 0);
@ -182,6 +183,7 @@ static const struct i2c_device_id at24_ids[] = {
{ "24c256", (kernel_ulong_t)&at24_data_24c256 },
{ "24c512", (kernel_ulong_t)&at24_data_24c512 },
{ "24c1024", (kernel_ulong_t)&at24_data_24c1024 },
{ "24c2048", (kernel_ulong_t)&at24_data_24c2048 },
{ "at24", 0 },
{ /* END OF LIST */ }
};
@ -210,6 +212,7 @@ static const struct of_device_id at24_of_match[] = {
{ .compatible = "atmel,24c256", .data = &at24_data_24c256 },
{ .compatible = "atmel,24c512", .data = &at24_data_24c512 },
{ .compatible = "atmel,24c1024", .data = &at24_data_24c1024 },
{ .compatible = "atmel,24c2048", .data = &at24_data_24c2048 },
{ /* END OF LIST */ },
};
MODULE_DEVICE_TABLE(of, at24_of_match);