From patchwork Thu Nov 16 20:26:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 838786 X-Patchwork-Delegate: bartekgola@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rm+MwP5P"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ydCTp3K4bz9rxm for ; Fri, 17 Nov 2017 07:27:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759052AbdKPU1Z (ORCPT ); Thu, 16 Nov 2017 15:27:25 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:43523 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759041AbdKPU1X (ORCPT ); Thu, 16 Nov 2017 15:27:23 -0500 Received: by mail-wm0-f66.google.com with SMTP id x63so2620132wmf.2 for ; Thu, 16 Nov 2017 12:27:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=uVF/159J/rYezfhZokuTyeLNYYHLVGvTNAzComI3Bpk=; b=rm+MwP5PjUchNRowYV6yn48CdSNJIzcSeWH19FghnLWtNMXYz/l/UWDQQcU1aN7L/T gIdtT1WWzEXes7wTuhj9GNMDfr61hHQ6y9a4/O4FyLJpRgsVXFeF1zCDQ83MajGHCMGU L5MhXpOISfW8On1wbJwsHjccfv1s8PcPpRGnCk0FA6ki3ryp9KoWj6A6MP7MFmQOfxZ3 uwOgOccFCI07V3RqGjz+tC5v6tFQWcOMlFCoXHyWJbRZK69TCX74YsHyts0pIhdTh6k0 qSkbe74l+2rEcG0gp9srzMA5Vg2IMTVswLGavj8+0tkdFw3uupYhXwbnbytoUO2lDTWr 3r6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=uVF/159J/rYezfhZokuTyeLNYYHLVGvTNAzComI3Bpk=; b=qugl1yOzCeGJSYIsY/i5npASeTSGIa7VhVUEKFQofhiDhwPuX7O5NiOHgZzcEXv4mY BvhFX2XKKR9mtcGvzJg5eaQnX+nN1P0slESSsyZayfSJ11sGWzGiHERYDkfh1JbNTX8m VjZTeDIaFE+vc6wNaNkRwFOgAPt5J6M30tlOp7EAFJkFNvpV/K2EkybIM1w6h4e1CbXo Q5U3ontpTIVf6i0QkETEhCFQzdbDJPDK9YgJqD+m7hWbkToZWGrrGK9wYW6gJmU4ME9u dUXozW71wLtDRgeggRulAPr+JI/YGhKjBcSRlFpqi+rCec3si9nm0lXP+hlhLrfZoOLN 76GA== X-Gm-Message-State: AJaThX7RjWJ/Jcaw6Aogfcj76BYm0yLW6J5+xk7G93xsWgX9nMxTxcXC I59SA75rb8FJXOO8vLqZBoZVbQ== X-Google-Smtp-Source: AGs4zMZzvxt3iAnQ4/R3hsp6TsnpGTBolma+KABU552YV22saZ+Dd0vvcInlr/5zcoiAWwVAI6AlDA== X-Received: by 10.28.230.140 with SMTP id e12mr2282884wmi.118.1510864042502; Thu, 16 Nov 2017 12:27:22 -0800 (PST) Received: from ?IPv6:2003:ea:8bc0:e400:5d3b:3d3e:54b7:39d0? (p200300EA8BC0E4005D3B3D3E54B739D0.dip0.t-ipconnect.de. [2003:ea:8bc0:e400:5d3b:3d3e:54b7:39d0]) by smtp.googlemail.com with ESMTPSA id z192sm1284074wmc.32.2017.11.16.12.27.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Nov 2017 12:27:22 -0800 (PST) From: Heiner Kallweit Subject: [PATCH v2 5/7] eeprom: at24: add regmap-based read functions To: Bartosz Golaszewski Cc: "linux-i2c@vger.kernel.org" References: Message-ID: <055dce44-43fb-c90f-6e94-ca8035b16832@gmail.com> Date: Thu, 16 Nov 2017 21:26:44 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Add regmap-based read functions. Signed-off-by: Heiner Kallweit --- v2: - rebased --- drivers/misc/eeprom/at24.c | 58 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-) diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index 28ea1a950..391e0d998 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -310,6 +310,59 @@ static ssize_t at24_eeprom_read_smbus(struct at24_data *at24, char *buf, return -ETIMEDOUT; } +static ssize_t at24_regmap_read(struct at24_data *at24, char *buf, + unsigned int offset, size_t count) +{ + unsigned long timeout, read_time; + struct regmap *regmap; + + regmap = at24_translate_offset(at24, &offset)->regmap; + + if (count > io_limit) + count = io_limit; + + if (at24->chip.flags & AT24_FLAG_MAC) + offset += 0x90; + + loop_until_timeout(timeout, read_time) + if (!regmap_bulk_read(regmap, offset, buf, count)) + return count; + + return -ETIMEDOUT; +} + +static ssize_t at24_regmap_read_serial(struct at24_data *at24, char *buf, + unsigned int offset, size_t count) +{ + unsigned long timeout, read_time; + struct regmap *regmap; + + regmap = at24_translate_offset(at24, &offset)->regmap; + + if (count > io_limit) + count = io_limit; + + if (at24->chip.flags & AT24_FLAG_ADDR16) + /* + * For 16 bit address pointers, the word address must contain + * a '10' sequence in bits 11 and 10 regardless of the + * intended position of the address pointer. + */ + offset |= BIT(11); + else + /* + * Otherwise the word address must begin with a '10' sequence, + * regardless of the intended address. + */ + offset |= BIT(7); + + loop_until_timeout(timeout, read_time) + if (!regmap_bulk_read(regmap, offset, buf, count)) + return count; + + return -ETIMEDOUT; +} + static ssize_t at24_eeprom_read_i2c(struct at24_data *at24, char *buf, unsigned int offset, size_t count) { @@ -512,7 +565,10 @@ static int at24_read(void *priv, unsigned int off, void *val, size_t count) while (count) { int status; - status = at24->read_func(at24, buf, off, count); + if (at24->chip.flags & AT24_FLAG_SERIAL) + status = at24_regmap_read_serial(at24, buf, off, count); + else + status = at24_regmap_read(at24, buf, off, count); if (status < 0) { mutex_unlock(&at24->lock); pm_runtime_put(&client->dev);