linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCHv3] i2c: slave-eeprom: Make it possible to pre-load eeprom data
@ 2020-04-24 11:30 Björn Ardö
  2020-04-24 15:36 ` Patrick Williams
  2020-04-26  7:41 ` Wolfram Sang
  0 siblings, 2 replies; 3+ messages in thread
From: Björn Ardö @ 2020-04-24 11:30 UTC (permalink / raw)
  To: wsa; +Cc: linux-i2c, linux-kernel, patrick, kernel, Björn Ardö

If the slave eeprom has a "firmware-name" in devicetree, then
pre-load the data in the eeprom with this file. Otherwise we
init the eeprom with 0xFF.

Signed-off-by: Björn Ardö <bjorn.ardo@axis.com>
---
 drivers/i2c/i2c-slave-eeprom.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/drivers/i2c/i2c-slave-eeprom.c b/drivers/i2c/i2c-slave-eeprom.c
index cb415b10642f..b425cefea92c 100644
--- a/drivers/i2c/i2c-slave-eeprom.c
+++ b/drivers/i2c/i2c-slave-eeprom.c
@@ -18,6 +18,7 @@
  */
 
 #include <linux/bitfield.h>
+#include <linux/firmware.h>
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/module.h>
@@ -120,6 +121,26 @@ static ssize_t i2c_slave_eeprom_bin_write(struct file *filp, struct kobject *kob
 	return count;
 }
 
+static int i2c_slave_init_eeprom_data(struct eeprom_data *eeprom, struct i2c_client *client,
+					 unsigned int size)
+{
+	const struct firmware *fw;
+	const char *eeprom_data;
+	int error = device_property_read_string(&client->dev, "firmware-name", &eeprom_data);
+
+	if (!error) {
+		error = request_firmware_into_buf(&fw, eeprom_data, &client->dev,
+						  eeprom->buffer, size);
+		if (error)
+			return error;
+		release_firmware(fw);
+	} else {
+		/* An empty eeprom typically has all bits set to 1 */
+		memset(eeprom->buffer, 0xFF, size);
+	}
+	return 0;
+}
+
 static int i2c_slave_eeprom_probe(struct i2c_client *client, const struct i2c_device_id *id)
 {
 	struct eeprom_data *eeprom;
@@ -138,6 +159,10 @@ static int i2c_slave_eeprom_probe(struct i2c_client *client, const struct i2c_de
 	spin_lock_init(&eeprom->buffer_lock);
 	i2c_set_clientdata(client, eeprom);
 
+	ret = i2c_slave_init_eeprom_data(eeprom, client, size);
+	if (ret)
+		return ret;
+
 	sysfs_bin_attr_init(&eeprom->bin);
 	eeprom->bin.attr.name = "slave-eeprom";
 	eeprom->bin.attr.mode = S_IRUSR | S_IWUSR;
-- 
2.11.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCHv3] i2c: slave-eeprom: Make it possible to pre-load eeprom data
  2020-04-24 11:30 [PATCHv3] i2c: slave-eeprom: Make it possible to pre-load eeprom data Björn Ardö
@ 2020-04-24 15:36 ` Patrick Williams
  2020-04-26  7:41 ` Wolfram Sang
  1 sibling, 0 replies; 3+ messages in thread
From: Patrick Williams @ 2020-04-24 15:36 UTC (permalink / raw)
  To: Björn Ardö; +Cc: wsa, linux-i2c, linux-kernel, kernel

[-- Attachment #1: Type: text/plain, Size: 516 bytes --]

On Fri, Apr 24, 2020 at 01:30:36PM +0200, Björn Ardö wrote:
> If the slave eeprom has a "firmware-name" in devicetree, then
> pre-load the data in the eeprom with this file. Otherwise we
> init the eeprom with 0xFF.
> 
> Signed-off-by: Björn Ardö <bjorn.ardo@axis.com>
> ---
>  drivers/i2c/i2c-slave-eeprom.c | 25 +++++++++++++++++++++++++
>  1 file changed, 25 insertions(+)

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Reviewed-by: Patrick Williams <patrick@stwcx.xyz>

-- 
Patrick Williams

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCHv3] i2c: slave-eeprom: Make it possible to pre-load eeprom data
  2020-04-24 11:30 [PATCHv3] i2c: slave-eeprom: Make it possible to pre-load eeprom data Björn Ardö
  2020-04-24 15:36 ` Patrick Williams
@ 2020-04-26  7:41 ` Wolfram Sang
  1 sibling, 0 replies; 3+ messages in thread
From: Wolfram Sang @ 2020-04-26  7:41 UTC (permalink / raw)
  To: Björn Ardö; +Cc: linux-i2c, linux-kernel, patrick, kernel

[-- Attachment #1: Type: text/plain, Size: 346 bytes --]

On Fri, Apr 24, 2020 at 01:30:36PM +0200, Björn Ardö wrote:
> If the slave eeprom has a "firmware-name" in devicetree, then
> pre-load the data in the eeprom with this file. Otherwise we
> init the eeprom with 0xFF.
> 
> Signed-off-by: Björn Ardö <bjorn.ardo@axis.com>

Minor cosmetic changes added and applied to for-next, thanks!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-04-26  7:42 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-24 11:30 [PATCHv3] i2c: slave-eeprom: Make it possible to pre-load eeprom data Björn Ardö
2020-04-24 15:36 ` Patrick Williams
2020-04-26  7:41 ` Wolfram Sang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).