From patchwork Thu Aug 17 05:59:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 802343 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="XI9JMREz"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xXwXX5mJfz9t3D for ; Thu, 17 Aug 2017 15:59:40 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750957AbdHQF7j (ORCPT ); Thu, 17 Aug 2017 01:59:39 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:35758 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750800AbdHQF7i (ORCPT ); Thu, 17 Aug 2017 01:59:38 -0400 Received: by mail-wr0-f193.google.com with SMTP id p8so442547wrf.2 for ; Wed, 16 Aug 2017 22:59:38 -0700 (PDT) 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=U4hk9AsD5D8m5p6a9fmLLM5TMHsC8bZekOHN7jOK5Ms=; b=XI9JMREzqdXQeMlTvu1DEwguAG3LIxKVyzNtEl/9zCULCQ89PZGym0mgn3H2BQWGqO 8+fXxNsarjnN5fbLIfM8jYR6yge8JPhXhzcAChpJCZd9pW/Pk8RGsZDBSKmOhF0P9Aim 0zALyPf4fS0+FdrQPGmyzl/if5caHRqpOf5Uu036+QAQnhJOnXsZ8gcb0yyY+kkZcGW8 rkCD1KX5w7pICqIBdkuLVYcevAwiD/vKXWh9amCQpwIw68tkE1lIBCN2u/kqelq5CFNR ngsCk6QEQbTdU/mSEsVFt3DMhmy3nGe3chsh38NSIYndUblkbzpxKlsj86/aoazb5935 yq1g== 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=U4hk9AsD5D8m5p6a9fmLLM5TMHsC8bZekOHN7jOK5Ms=; b=NxPlFo5fP12dxzyNH6e2so6maXCqTp78ldaXDcI/TZfwYaEhnvYKNI9v4NI3wL7MTU wrfHIUayQWd+ihQ7t8XoFhYwZ353CXmvMMvIOleaOrMLe1ydwkcdgO07Qs+uGiKgDwRr C7slW8jCTMAKOLv7Gv2t1QadSKC54Iv2M3FldEFbRGQcvIGIMtBERuoZN47huP3198uJ Ei01hJBhe/JgE64muY3KcnWXGX1MGq+7luZuVwFuvzTivyHpHiEikDjTDbHOgU1m26Ri z/+sBg9j6ZrM9+SVzY8Gcv7yxBJxjgqBHIT4pSq/aDq5Kj4j55kGkbjl2KPhyIxfw2/S d6nQ== X-Gm-Message-State: AHYfb5i1ApbGfZo/EpQiCWiX3iDjZVYY0dUt3TTVoHQT38p++c8bctav 4188okwM06R/jzQN X-Received: by 10.223.133.140 with SMTP id 12mr2730028wrt.102.1502949577258; Wed, 16 Aug 2017 22:59:37 -0700 (PDT) Received: from ?IPv6:2003:ea:8bc7:5e00:b1d4:11c8:15b6:16bf? (p200300EA8BC75E00B1D411C815B616BF.dip0.t-ipconnect.de. [2003:ea:8bc7:5e00:b1d4:11c8:15b6:16bf]) by smtp.googlemail.com with ESMTPSA id g133sm4371600wmd.48.2017.08.16.22.59.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Aug 2017 22:59:36 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH RFC 1/7] eeprom: at24: add basic regmap_i2c support To: Wolfram Sang Cc: "linux-i2c@vger.kernel.org" References: <2e264f77-2316-b6b6-e66c-b162f77d81de@gmail.com> Message-ID: <8cd107ab-81d7-e151-3648-7acd1b8b2af0@gmail.com> Date: Thu, 17 Aug 2017 07:59:01 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <2e264f77-2316-b6b6-e66c-b162f77d81de@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 --- 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 de587620..68a1ac92 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 764ff5df..e615bafa 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -23,6 +23,7 @@ #include #include #include +#include #include /* @@ -53,6 +54,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; @@ -79,7 +85,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[]; }; /* @@ -214,7 +220,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, @@ -583,6 +589,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; @@ -593,6 +609,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) { @@ -665,8 +682,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; @@ -676,6 +698,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."); @@ -723,18 +750,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); @@ -788,8 +819,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); return err; } @@ -804,7 +835,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); return 0; }