Commit ba63f993 authored by Wolfram Sang's avatar Wolfram Sang
Browse files

Merge tag 'at24-updates-for-v6.7' of... 

Merge tag 'at24-updates-for-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-mergewindow

at24 updates for v6.7

- support the write-lockable pages on two more models
- drop at24_get_chip_data()
- use the new __counted_by() attribute in struct at24_data
parents 3e383dce 3774740f

Documentation/devicetree/bindings/eeprom/at24.yaml

+4 −0
Original line number Diff line number Diff line
@@ -67,10 +67,14 @@ properties: 
                  pattern: cs16$

              - items:

                  pattern: c32$

              - items:

                  pattern: c32d-wl$

              - items:

                  pattern: cs32$

              - items:

                  pattern: c64$

              - items:

                  pattern: c64d-wl$

              - items:

                  pattern: cs64$

              - items:

drivers/misc/eeprom/at24.c

+12 −30
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ struct at24_data { 
	 * them for us.

	 */

	u8 bank_addr_shift;

	struct regmap *client_regmaps[];

	struct regmap *client_regmaps[] __counted_by(num_addresses);

};



/*
@@ -191,9 +191,13 @@ AT24_CHIP_DATA(at24_data_24c16, 16384 / 8, 0); 
AT24_CHIP_DATA(at24_data_24cs16, 16,

	AT24_FLAG_SERIAL | AT24_FLAG_READONLY);

AT24_CHIP_DATA(at24_data_24c32, 32768 / 8, AT24_FLAG_ADDR16);

/* M24C32-D Additional Write lockable page (M24C32-D order codes) */

AT24_CHIP_DATA(at24_data_24c32d_wlp, 32, AT24_FLAG_ADDR16);

AT24_CHIP_DATA(at24_data_24cs32, 16,

	AT24_FLAG_ADDR16 | AT24_FLAG_SERIAL | AT24_FLAG_READONLY);

AT24_CHIP_DATA(at24_data_24c64, 65536 / 8, AT24_FLAG_ADDR16);

/* M24C64-D Additional Write lockable page (M24C64-D order codes) */

AT24_CHIP_DATA(at24_data_24c64d_wlp, 32, AT24_FLAG_ADDR16);

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);
@@ -222,8 +226,10 @@ static const struct i2c_device_id at24_ids[] = { 
	{ "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 },
@@ -252,8 +258,10 @@ static const struct of_device_id at24_of_match[] = { 
	{ .compatible = "atmel,24c16",		.data = &at24_data_24c16 },

	{ .compatible = "atmel,24cs16",		.data = &at24_data_24cs16 },

	{ .compatible = "atmel,24c32",		.data = &at24_data_24c32 },

	{ .compatible = "atmel,24c32d-wl",	.data = &at24_data_24c32d_wlp },

	{ .compatible = "atmel,24cs32",		.data = &at24_data_24cs32 },

	{ .compatible = "atmel,24c64",		.data = &at24_data_24c64 },

	{ .compatible = "atmel,24c64d-wl",	.data = &at24_data_24c64d_wlp },

	{ .compatible = "atmel,24cs64",		.data = &at24_data_24cs64 },

	{ .compatible = "atmel,24c128",		.data = &at24_data_24c128 },

	{ .compatible = "atmel,24c256",		.data = &at24_data_24c256 },
@@ -509,32 +517,6 @@ static int at24_write(void *priv, unsigned int off, void *val, size_t count) 
	return 0;

}



static const struct at24_chip_data *at24_get_chip_data(struct device *dev)

{

	struct device_node *of_node = dev->of_node;

	const struct at24_chip_data *cdata;

	const struct i2c_device_id *id;



	id = i2c_match_id(at24_ids, to_i2c_client(dev));



	/*

	 * The I2C core allows OF nodes compatibles to match against the

	 * I2C device ID table as a fallback, so check not only if an OF

	 * node is present but also if it matches an OF device ID entry.

	 */

	if (of_node && of_match_device(at24_of_match, dev))

		cdata = of_device_get_match_data(dev);

	else if (id)

		cdata = (void *)id->driver_data;

	else

		cdata = acpi_device_get_match_data(dev);



	if (!cdata)

		return ERR_PTR(-ENODEV);



	return cdata;

}



static int at24_make_dummy_client(struct at24_data *at24, unsigned int index,

				  struct i2c_client *base_client,

				  struct regmap_config *regmap_config)
@@ -601,9 +583,9 @@ static int at24_probe(struct i2c_client *client) 
	i2c_fn_block = i2c_check_functionality(client->adapter,

					       I2C_FUNC_SMBUS_WRITE_I2C_BLOCK);



	cdata = at24_get_chip_data(dev);

	if (IS_ERR(cdata))

		return PTR_ERR(cdata);

	cdata = i2c_get_match_data(client);

	if (!cdata)

		return -ENODEV;



	err = device_property_read_u32(dev, "pagesize", &page_size);

	if (err)