From patchwork Thu Mar 24 16:19:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 64402 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp756711lbc; Thu, 24 Mar 2016 09:20:50 -0700 (PDT) X-Received: by 10.66.248.168 with SMTP id yn8mr14089186pac.24.1458836448720; Thu, 24 Mar 2016 09:20:48 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c90si13091107pfd.233.2016.03.24.09.20.48; Thu, 24 Mar 2016 09:20:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-i2c-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of linux-i2c-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-i2c-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757510AbcCXQUr (ORCPT + 1 other); Thu, 24 Mar 2016 12:20:47 -0400 Received: from mail-wm0-f47.google.com ([74.125.82.47]:37125 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756933AbcCXQT7 (ORCPT ); Thu, 24 Mar 2016 12:19:59 -0400 Received: by mail-wm0-f47.google.com with SMTP id p65so73386451wmp.0 for ; Thu, 24 Mar 2016 09:19:58 -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=bMcz93za1DShpOWRdD2hA3IrO+j2MG1u1Zx+8s460P5fY5gH9s/rw36vk794wlITZO 7acl90pKrvl+snD1h1azhH1VRQCd2UKXZdMXjCJ6q+rUQjyl0LCHYaaAVtNc8DljvSoG CVlPIef2J1FNY0n0TPBaIm7Y8Jah2qcaIFFVSd54BJHHcP5ufiGHT2Svg2nfdU+xR/Bp CUqP6jf0N5oG0rMmH7K3b/0+11DuzOHlHsbgCJ+LA7WR7y2TvYMgzKSvvqIxHiqbEPyQ 9IeuM7ZLQy9ySCBLKJFBPCdNqppBlH7+9wNrY9KCrrxgeOyri814DV8nEQ9kgzrwPxZY M0sw== 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=hq1SujAlV3wSC4WX/KxMZADxrHWyQaORRe6kThMnUBemZRVV6l22ZenquK18jUePns 5wpKxFJ9pguLzfZMnIzVtHM7TzPUmXZzzbngV4dTS+6bkWuEmEcI9OtmG8m0nHDsG0Dx JSl5apbXramvsjMALlxou3Bb0HRPsV2aQnz2KklLze4iAoPWwGJVLhsi56gA9mwCBML3 v4KPThL5ZJFn03GHcbIMGSAqOs9WFcwGxkgzIN8r5Nqe3r8+s21xdfASruMpr5JrpIV3 iVcl65x1SCevbtFuwWj3uf7nB3dUn0m4nN+QPEcmvBphVCwFjCMKRKNxRJvjGYVXKIHc pFcg== X-Gm-Message-State: AD7BkJKN0tlrsW+LWQJzibsQQ+zCfgjpLk5K1X7OE0+Yi0OVxbPLv7c8J/GPZbTeP6K7ObeS X-Received: by 10.194.189.231 with SMTP id gl7mr10791280wjc.162.1458836398101; Thu, 24 Mar 2016 09:19:58 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id k124sm8370718wmb.11.2016.03.24.09.19.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Mar 2016 09:19:57 -0700 (PDT) From: Bartosz Golaszewski To: Wolfram Sang , linux-i2c , LKML Cc: Andrew Lunn , Bartosz Golaszewski Subject: [PATCH v2 12/13] eeprom: at24: add support for at24mac series Date: Thu, 24 Mar 2016 17:19:42 +0100 Message-Id: <1458836383-6668-13-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1458836383-6668-1-git-send-email-bgolaszewski@baylibre.com> References: <1458836383-6668-1-git-send-email-bgolaszewski@baylibre.com> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@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 -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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;