linux-i2c.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
To: Wolfram Sang <wsa@the-dreams.de>,
	linux-i2c <linux-i2c@vger.kernel.org>,
	LKML <linux-kernel@vger.kernel.org>
Cc: Andrew Lunn <andrew@lunn.ch>,
	Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: [PATCH v2 12/13] eeprom: at24: add support for at24mac series
Date: Thu, 24 Mar 2016 17:19:42 +0100	[thread overview]
Message-ID: <1458836383-6668-13-git-send-email-bgolaszewski@baylibre.com> (raw)
In-Reply-To: <1458836383-6668-1-git-send-email-bgolaszewski@baylibre.com>

Add a new read function to the at24 driver allowing to retrieve the
factory-programmed mac address embedded in chips from the at24mac
family.

These chips can be instantiated similarily to the at24cs family,
except that there's no way of having access to both the serial number
and the mac address at the same time - the user must instantiate
either an at24cs or at24mac device as both special memory areas are
accessible on the same slave address.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
 drivers/misc/eeprom/at24.c | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
index 281dd48..edec236 100644
--- a/drivers/misc/eeprom/at24.c
+++ b/drivers/misc/eeprom/at24.c
@@ -239,6 +239,41 @@ static ssize_t at24cs_serial_read(struct at24_data *at24,
 	return -ETIMEDOUT;
 }
 
+static ssize_t at24mac_mac_read(struct at24_data *at24,
+			       char *buf, loff_t off, size_t count)
+{
+	unsigned long timeout, read_time;
+	struct i2c_client *client;
+	unsigned int offset = off;
+	struct i2c_msg msg[2];
+	u8 addrbuf[2];
+	int status;
+
+	client = at24_translate_offset(at24, &offset);
+
+	memset(msg, 0, sizeof(msg));
+	msg[0].addr = client->addr;
+	msg[0].buf = addrbuf;
+	addrbuf[0] = 0x90 + offset;
+	msg[0].len = 1;
+	msg[1].addr = client->addr;
+	msg[1].flags = I2C_M_RD;
+	msg[1].buf = buf;
+	msg[1].len = count;
+
+	timeout = jiffies + msecs_to_jiffies(write_timeout);
+	do {
+		read_time = jiffies;
+		status = i2c_transfer(client->adapter, msg, 2);
+		if (status == 2)
+			return count;
+
+		usleep_range(1000, 1500);
+	} while (time_before(read_time, timeout));
+
+	return -ETIMEDOUT;
+}
+
 static ssize_t at24_eeprom_read(struct at24_data *at24, char *buf,
 		unsigned offset, size_t count)
 {
@@ -632,8 +667,16 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
 	at24->chip = chip;
 	at24->num_addresses = num_addresses;
 
+	if ((chip.flags & AT24_FLAG_SERIAL) && (chip.flags & AT24_FLAG_MAC)) {
+		dev_err(&client->dev,
+			"invalid device data - cannot have both AT24_FLAG_SERIAL & AT24_FLAG_MAC.");
+		return -EINVAL;
+	}
+
 	if (chip.flags & AT24_FLAG_SERIAL) {
 		at24->read_func = at24cs_serial_read;
+	} else if (chip.flags & AT24_FLAG_MAC) {
+		at24->read_func = at24mac_mac_read;
 	} else {
 		at24->read_func = at24_read;
 		at24->write_func = at24_write;
-- 
2.7.4

  parent reply	other threads:[~2016-03-24 16:19 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-24 16:19 [PATCH v2 00/13] eeprom: support for at24cs and at24mac Bartosz Golaszewski
2016-03-24 16:19 ` [PATCH v2 01/13] eeprom: at24: remove a reduntant if Bartosz Golaszewski
2016-03-24 16:19 ` [PATCH v2 02/13] eeprom: at24: improve the device_id table readability Bartosz Golaszewski
2016-03-24 16:19 ` [PATCH v2 03/13] eeprom: at24: platform_data: use BIT() macro Bartosz Golaszewski
2016-03-24 16:19 ` [PATCH v2 04/13] eeprom: at24: make locking more fine-grained Bartosz Golaszewski
2016-03-24 16:19 ` [PATCH v2 05/13] eeprom: at24: replace msleep() with usleep_range() Bartosz Golaszewski
2016-03-24 16:19 ` [PATCH v2 06/13] eeprom: at24: add serial number flag Bartosz Golaszewski
2016-03-24 16:19 ` [PATCH v2 07/13] eeprom: at24: support reading of the serial number Bartosz Golaszewski
2016-03-24 16:19 ` [PATCH v2 08/13] eeprom: at24: call read and write routines via function pointers Bartosz Golaszewski
2016-03-24 16:19 ` [PATCH v2 09/13] eeprom: at24: use at24cs_serial_read() Bartosz Golaszewski
2016-03-24 16:19 ` [PATCH v2 10/13] eeprom: at24: add the at24cs series to the list of supported devices Bartosz Golaszewski
2016-03-24 16:19 ` [PATCH v2 11/13] eeprom: at24: add at24mac series flag Bartosz Golaszewski
2016-03-24 16:19 ` Bartosz Golaszewski [this message]
2016-03-24 16:19 ` [PATCH v2 13/13] eeprom: at24: add at24mac chips to the list of supported devices Bartosz Golaszewski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1458836383-6668-13-git-send-email-bgolaszewski@baylibre.com \
    --to=bgolaszewski@baylibre.com \
    --cc=andrew@lunn.ch \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=wsa@the-dreams.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).