From patchwork Thu Mar 24 14:46:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 64392 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp700121lbc; Thu, 24 Mar 2016 07:52:53 -0700 (PDT) X-Received: by 10.98.93.12 with SMTP id r12mr13526997pfb.64.1458831173007; Thu, 24 Mar 2016 07:52:53 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p19si12654377pfi.248.2016.03.24.07.52.52; Thu, 24 Mar 2016 07:52:52 -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 S1757849AbcCXOwc (ORCPT + 29 others); Thu, 24 Mar 2016 10:52:32 -0400 Received: from mail-wm0-f43.google.com ([74.125.82.43]:33073 "EHLO mail-wm0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752570AbcCXOqY (ORCPT ); Thu, 24 Mar 2016 10:46:24 -0400 Received: by mail-wm0-f43.google.com with SMTP id l68so278050147wml.0 for ; Thu, 24 Mar 2016 07:46:24 -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=5F54gwRUGZXHn0hfchDmX30Zfsh1AynugyRcWahNRqE=; b=2QoaRI/p6+FJhHCnTLtD3s0Dax6PciMNAWjb+ipH7s5Lk8usSJh/CopDJv1PgxqGV5 llHzIinBSL8qVRScb9gZ4p6NKZdo5puMP85fLLws1ZjOAamlayr7e3C7lverDL8DPMuI uI52As90jpzBTQPFCG6PdYtAZWW7vSS/mllL5gjpPdCWZ2qeKs28vz4r+eir+pMW2UrQ r5gQDp9U85M7dAgKC8RJbKRzFbpRKcpc7wkOrLX80yYsgS56+SE5b3IRWU93MJ6e24bn QF9khROhSbQ8iwLgudGU7H5Srm6PtKfY6KYHrcXwcrW7Kj0kZZFCk1UILAT2SeeloPdd qmHQ== 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=5F54gwRUGZXHn0hfchDmX30Zfsh1AynugyRcWahNRqE=; b=LVnkybeLa8O5xYcaACCPgXogXlukQX8Ew/K5fF9iamirNK+sb/0nuLTjDXE+L/muuG UxSy3rlizc7IHqjG1VDaOCK1tmj8beGFu0lJxLQv2aY6zEaYfpCy+LJzQeUN8A73YT0k y4IJA7dqfvtHZuUGjYCP/i6uzEhcPt/RslxG/PIwEWV9unjsE3pvrvklueRV1s0Ljo+W 8LKhIqtANjpJ95o0X4uuaYJNnXbzn5Nv9c4Lf3WW8t3yiQ7bvpM5HEkbNBDAWEnwmHKw svMoD3ph/oVSozAnbbcZbl6/PiR79cFj7Z1+QThEctmAeTcu+HdzFD5owAqVotS75HK+ OmJQ== X-Gm-Message-State: AD7BkJIzVO9A1YlX84SRedmuk3yLmqVIBWwJyyhHqIG4OoCy7GxBRDETg52uVwvSRe7znqNu X-Received: by 10.28.225.198 with SMTP id y189mr35575894wmg.94.1458830782566; Thu, 24 Mar 2016 07:46:22 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id k125sm27255752wmb.14.2016.03.24.07.46.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Mar 2016 07:46:21 -0700 (PDT) From: Bartosz Golaszewski To: Wolfram Sang , linux-i2c , LKML Cc: Andrew Lunn , Bartosz Golaszewski Subject: [PATCH 12/13] eeprom: at24: add support for at24mac series Date: Thu, 24 Mar 2016 15:46:06 +0100 Message-Id: <1458830767-23816-13-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1458830767-23816-1-git-send-email-bgolaszewski@baylibre.com> References: <1458830767-23816-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 a95a301..26c28c2 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -238,6 +238,41 @@ static int at24cs_serial_read(struct at24_data *at24, return -ETIMEDOUT; } +static int 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) { @@ -631,8 +666,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;