Commit 433c6916 authored by Wolfram Sang's avatar Wolfram Sang
Browse files

Merge tag 'at24-updates-for-v6.13-rc1' of... 

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
parents 397295d1 339cb28b

Documentation/devicetree/bindings/eeprom/at24.yaml

+2 −0
Original line number Diff line number Diff line
@@ -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:

drivers/misc/eeprom/at24.c

+4 −0
Original line number Diff line number Diff line
@@ -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);