From patchwork Mon Apr 11 18:57:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 65560 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1518867qge; Mon, 11 Apr 2016 11:58:32 -0700 (PDT) X-Received: by 10.98.42.4 with SMTP id q4mr34477493pfq.23.1460401111922; Mon, 11 Apr 2016 11:58:31 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ku9si5087292pab.99.2016.04.11.11.58.31; Mon, 11 Apr 2016 11:58:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932120AbcDKS6J (ORCPT + 29 others); Mon, 11 Apr 2016 14:58:09 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:36444 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755322AbcDKS6D (ORCPT ); Mon, 11 Apr 2016 14:58:03 -0400 Received: by mail-pa0-f54.google.com with SMTP id bx7so110365204pad.3 for ; Mon, 11 Apr 2016 11:58:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hSFuK3GVUL8XRjR5lF9FrPd9FNduaqhUZytrQfy07vw=; b=BAl4dJI8xQorSXbzjZU2uLcsWqthqhBcXqOa+4ir+J1l0REEEMlNRxElr9mvkmcDC4 hxqyGQdvGEHvDXvNxRQ2PPeTkypVUabZcesv+5IT4JoZzLJ2oCR3MgomEKERkbXzJmd7 d8kdJPqBIHJ5LFYb+wHQ3ins693IHCWtyyNeB1C79gVL+1TneYY+FoxWRSb0fbt6f61V mBjOmPpCt7PPSDBbwgYtLlo6jvsqgDPJd0LoPvh1UQp+s3sw2rSVuyZ5jyU6r4E9BvhQ wwPY469e8O86mJKMhnjX0BywrwcWIa7YxzWijV1xGbH/OBH45WDR7ILzYBrWfSnKoUfJ kfCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hSFuK3GVUL8XRjR5lF9FrPd9FNduaqhUZytrQfy07vw=; b=hKDMKPJbmjETmxbBxuGbsB8ParTpewyG4XRdMQTTeqaLjD76gVO+XWyTIrgJ7cyUEq yDB35sO7jBbOGnZ5c+6mgsYREOTjGvAMdzq5Urv0j5Q+VJB4ZwcVoBP2MBrxaDr2kk4F 00IpghuefO7NcB7InpZ6DoDHVXr9b45RAwdO2aP8rjEpjvXb1xJp/2Jz6BQJCfD2pYg3 H6XKDScjMKBACkq/gvo4huhnIJaPdmATiqJN+Wp0m8WvxHrq2SDz2ZQQ9/4JUYaIQtZt hby9Q1dBzQPALLuYQU95+s0IZ/GmSydazxfhnf8OzVx+KjDmJOaF74KzNeW/cWTjCDML bqOA== X-Gm-Message-State: AD7BkJJm5aQMdQHRKtwo2OUbiI8JCip4gZbcPaTt/xZ3qJy2b0EPyEIRJSo/GNpNNFhkRcnR X-Received: by 10.66.66.10 with SMTP id b10mr35110857pat.12.1460401083122; Mon, 11 Apr 2016 11:58:03 -0700 (PDT) Received: from localhost.localdomain (cpe-172-248-200-249.socal.res.rr.com. [172.248.200.249]) by smtp.gmail.com with ESMTPSA id ke7sm22322404pad.44.2016.04.11.11.58.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Apr 2016 11:58:02 -0700 (PDT) From: Bartosz Golaszewski To: Wolfram Sang , linux-i2c , LKML , srinivas.kandagatla@linaro.org, maxime.ripard@free-electrons.com Cc: Andrew Lunn , Bartosz Golaszewski Subject: [RESEND PATCH v2 12/13] eeprom: at24: add support for at24mac series Date: Mon, 11 Apr 2016 11:57:28 -0700 Message-Id: <1460401049-25459-13-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1460401049-25459-1-git-send-email-bgolaszewski@baylibre.com> References: <1460401049-25459-1-git-send-email-bgolaszewski@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/misc/eeprom/at24.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) -- 2.7.4 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;