From patchwork Mon Nov 27 20:34:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 841863 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="mns6kYNm"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ylz7B6gbdz9s1h for ; Tue, 28 Nov 2017 07:34:46 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752707AbdK0Uep (ORCPT ); Mon, 27 Nov 2017 15:34:45 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:42484 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752626AbdK0Uep (ORCPT ); Mon, 27 Nov 2017 15:34:45 -0500 Received: by mail-wm0-f67.google.com with SMTP id 124so19945983wmv.1 for ; Mon, 27 Nov 2017 12:34:44 -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=pBW5EAqfdeDLSpzzDRlzf6iHCT9s+reyTxbb13jRYTY=; b=mns6kYNmtoJOOo5EZqGO9cweImITO/ApOs6k44FY8dLRDgAbjAQYcdrfzYGtIn74l9 xHRu7S6Gv1U0IqJbqpqyfKNoPEfWCghCk7n53Y13l7oVTvOafB0aQliQBbgpBlHAGDgB Gn6ySmN1daJLbC3CHa6teiEht3kEKdU1k5GNjXuvICL0qenLKESYUCqfCsLQMH0rxz2O kSNiD2z/D25X/PWJ6/LIAh02mmeDD2ANM5Kz538sp8c5PYV+3wEdok2YnApV7BZrgkKo jhCr0MnTz/FxItLEQkuLaenszSR+IVtXJmqMq3+FmFBHgHCMXz2I6JL0QxIKyKt/1nXM n58g== 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=pBW5EAqfdeDLSpzzDRlzf6iHCT9s+reyTxbb13jRYTY=; b=LFBJt24dYehA9VJ7RBxQaDtD0gjIysyCYWseGzHrq0E/bnJHFeoJju5Wq6WZP5W30o 3mTps2ZiBXykgoyGJIeo8xeQ1S6oqW/aKAGRPQYHid/dAtCWpZgUTlmaQeB11DclMlAr zGafb5A8v1hhJMDkQs6VExb9nzZR3PWccnjNvJBthk9iz4bjZhsZ71qPOjeWI/vSuiy0 y6q7OK80WzC77B6MjS3FT+FEervj5pKRxoMyHwXkWwEKgr5pRbV76XM2VBFWkLkhluNf HPmL0q4no/K5+wktWggXLrgj3UX5wi+2I5p8gmkffxiRAoDpnlC3aFU2iB66X3h1tML5 jglw== X-Gm-Message-State: AJaThX7ol4A42sxWTMMkTZMkYznhkL1pZHt1CKecYNYs0sJ03xWHyCfM dazuXdg2gLlI8od0dJ0t9aDr7A== X-Google-Smtp-Source: AGs4zMafX6hG6ba5fH1hFn7gKN521x+9OM+ciXkwoHn5yE8yyJWkUFuOGKT40GSr0jfN/OmmUHpnWg== X-Received: by 10.28.127.22 with SMTP id a22mr16588223wmd.12.1511814883304; Mon, 27 Nov 2017 12:34:43 -0800 (PST) Received: from ?IPv6:2003:ea:8bc0:e400:cdd0:4154:8262:d8bc? (p200300EA8BC0E400CDD041548262D8BC.dip0.t-ipconnect.de. [2003:ea:8bc0:e400:cdd0:4154:8262:d8bc]) by smtp.googlemail.com with ESMTPSA id d71sm11807031wma.7.2017.11.27.12.34.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Nov 2017 12:34:42 -0800 (PST) From: Heiner Kallweit Subject: [PATCH v5 1/7] eeprom: at24: add basic regmap_i2c support To: Bartosz Golaszewski Cc: "linux-i2c@vger.kernel.org" References: <2c379f45-d5e3-71af-eb20-ca51e09d9257@gmail.com> Message-ID: <3246477f-2e93-9e84-d13c-1e2e63ecfea3@gmail.com> Date: Mon, 27 Nov 2017 21:34:14 +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: <2c379f45-d5e3-71af-eb20-ca51e09d9257@gmail.com> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org This patch adds basic regmap support to be used by subsequent patches of this series. Signed-off-by: Heiner Kallweit --- v2: - rebased v3: - no changes v4: - no changes v5: - no changes --- drivers/misc/eeprom/Kconfig | 1 + drivers/misc/eeprom/at24.c | 53 +++++++++++++++++++++++++++++++++++---------- 2 files changed, 43 insertions(+), 11 deletions(-) diff --git a/drivers/misc/eeprom/Kconfig b/drivers/misc/eeprom/Kconfig index de5876209..68a1ac929 100644 --- a/drivers/misc/eeprom/Kconfig +++ b/drivers/misc/eeprom/Kconfig @@ -4,6 +4,7 @@ config EEPROM_AT24 tristate "I2C EEPROMs / RAMs / ROMs from most vendors" depends on I2C && SYSFS select NVMEM + select REGMAP_I2C help Enable this driver to get read/write support to most I2C EEPROMs and compatible devices like FRAMs, SRAMs, ROMs etc. After you diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index 75537a6fd..3700b0383 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -55,6 +56,11 @@ * which won't work on pure SMBus systems. */ +struct at24_client { + struct i2c_client *client; + struct regmap *regmap; +}; + struct at24_data { struct at24_platform_data chip; int use_smbus; @@ -81,7 +87,7 @@ struct at24_data { * Some chips tie up multiple I2C addresses; dummy devices reserve * them for us, and we'll use them with SMBus calls. */ - struct i2c_client *client[]; + struct at24_client client[]; }; /* @@ -274,7 +280,7 @@ static struct i2c_client *at24_translate_offset(struct at24_data *at24, *offset &= 0xff; } - return at24->client[i]; + return at24->client[i].client; } static ssize_t at24_eeprom_read_smbus(struct at24_data *at24, char *buf, @@ -679,6 +685,16 @@ static void at24_get_pdata(struct device *dev, struct at24_platform_data *chip) } } +static const struct regmap_config regmap_config_8 = { + .reg_bits = 8, + .val_bits = 8, +}; + +static const struct regmap_config regmap_config_16 = { + .reg_bits = 16, + .val_bits = 8, +}; + static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct at24_platform_data chip; @@ -689,6 +705,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) struct at24_data *at24; int err; unsigned i, num_addresses; + const struct regmap_config *config; u8 test_byte; if (client->dev.platform_data) { @@ -770,8 +787,13 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) num_addresses = DIV_ROUND_UP(chip.byte_len, (chip.flags & AT24_FLAG_ADDR16) ? 65536 : 256); + if (chip.flags & AT24_FLAG_ADDR16) + config = ®map_config_16; + else + config = ®map_config_8; + at24 = devm_kzalloc(&client->dev, sizeof(struct at24_data) + - num_addresses * sizeof(struct i2c_client *), GFP_KERNEL); + num_addresses * sizeof(struct at24_client), GFP_KERNEL); if (!at24) return -ENOMEM; @@ -781,6 +803,11 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) at24->chip = chip; at24->num_addresses = num_addresses; + at24->client[0].client = client; + at24->client[0].regmap = devm_regmap_init_i2c(client, config); + if (IS_ERR(at24->client[0].regmap)) + return PTR_ERR(at24->client[0].regmap); + 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."); @@ -828,18 +855,22 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) } } - at24->client[0] = client; - /* use dummy devices for multiple-address chips */ for (i = 1; i < num_addresses; i++) { - at24->client[i] = i2c_new_dummy(client->adapter, - client->addr + i); - if (!at24->client[i]) { + at24->client[i].client = i2c_new_dummy(client->adapter, + client->addr + i); + if (!at24->client[i].client) { dev_err(&client->dev, "address 0x%02x unavailable\n", client->addr + i); err = -EADDRINUSE; goto err_clients; } + at24->client[i].regmap = devm_regmap_init_i2c( + at24->client[i].client, config); + if (IS_ERR(at24->client[i].regmap)) { + err = PTR_ERR(at24->client[i].regmap); + goto err_clients; + } } i2c_set_clientdata(client, at24); @@ -898,8 +929,8 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) err_clients: for (i = 1; i < num_addresses; i++) - if (at24->client[i]) - i2c_unregister_device(at24->client[i]); + if (at24->client[i].client) + i2c_unregister_device(at24->client[i].client); pm_runtime_disable(&client->dev); @@ -916,7 +947,7 @@ static int at24_remove(struct i2c_client *client) nvmem_unregister(at24->nvmem); for (i = 1; i < at24->num_addresses; i++) - i2c_unregister_device(at24->client[i]); + i2c_unregister_device(at24->client[i].client); pm_runtime_disable(&client->dev); pm_runtime_set_suspended(&client->dev);