Merge tag 'at24-4.21-updates-for-wolfram' of... (0cb47164) · Commits · 戴 / test

Documentation/devicetree/bindings/eeprom/at24.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -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.

+1 −1

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

Original line number	Diff line number	Diff line
		@@ -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);