From: Khouloud Touil <ktouil@baylibre.com>
To: bgolaszewski@baylibre.com, robh+dt@kernel.org,
mark.rutland@arm.com, srinivas.kandagatla@linaro.org,
baylibre-upstreaming@groups.io
Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
linux-i2c@vger.kernel.org, linus.walleij@linaro.org,
Khouloud Touil <ktouil@baylibre.com>
Subject: [PATCH 4/4] eeprom: at24: remove the write-protect pin support
Date: Wed, 20 Nov 2019 15:20:38 +0100 [thread overview]
Message-ID: <20191120142038.30746-5-ktouil@baylibre.com> (raw)
In-Reply-To: <20191120142038.30746-1-ktouil@baylibre.com>
NVMEM framework is an interface for the at24 EEPROMs as well as for
other drivers, instead of passing the wp-gpios over the different
drivers each time, it would be better to pass it over the NVMEM
subsystem once and for all.
Removing the support for the write-protect pin after adding it to the
NVMEM subsystem.
Signed-off-by: Khouloud Touil <ktouil@baylibre.com>
---
drivers/misc/eeprom/at24.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
index 2cccd82a3106..eec2a34b7051 100644
--- a/drivers/misc/eeprom/at24.c
+++ b/drivers/misc/eeprom/at24.c
@@ -22,7 +22,6 @@
#include <linux/nvmem-provider.h>
#include <linux/regmap.h>
#include <linux/pm_runtime.h>
-#include <linux/gpio/consumer.h>
/* Address pointer is 16 bit. */
#define AT24_FLAG_ADDR16 BIT(7)
@@ -89,8 +88,6 @@ struct at24_data {
struct nvmem_device *nvmem;
- struct gpio_desc *wp_gpio;
-
/*
* Some chips tie up multiple I2C addresses; dummy devices reserve
* them for us, and we'll use them with SMBus calls.
@@ -457,12 +454,10 @@ static int at24_write(void *priv, unsigned int off, void *val, size_t count)
* from this host, but not from other I2C masters.
*/
mutex_lock(&at24->lock);
- gpiod_set_value_cansleep(at24->wp_gpio, 0);
while (count) {
ret = at24_regmap_write(at24, buf, off, count);
if (ret < 0) {
- gpiod_set_value_cansleep(at24->wp_gpio, 1);
mutex_unlock(&at24->lock);
pm_runtime_put(dev);
return ret;
@@ -472,7 +467,6 @@ static int at24_write(void *priv, unsigned int off, void *val, size_t count)
count -= ret;
}
- gpiod_set_value_cansleep(at24->wp_gpio, 1);
mutex_unlock(&at24->lock);
pm_runtime_put(dev);
@@ -662,9 +656,6 @@ static int at24_probe(struct i2c_client *client)
at24->client[0].client = client;
at24->client[0].regmap = regmap;
- at24->wp_gpio = devm_gpiod_get_optional(dev, "wp", GPIOD_OUT_HIGH);
- if (IS_ERR(at24->wp_gpio))
- return PTR_ERR(at24->wp_gpio);
writable = !(flags & AT24_FLAG_READONLY);
if (writable) {
--
2.17.1
prev parent reply other threads:[~2019-11-20 14:21 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-20 14:20 [PATCH 0/4] at24: move write-protect pin handling to nvmem core Khouloud Touil
2019-11-20 14:20 ` [PATCH 1/4] dt-bindings: nvmem: new optional property write-protect-gpios Khouloud Touil
2019-11-22 12:41 ` Linus Walleij
2019-11-22 12:47 ` Bartosz Golaszewski
2019-11-22 12:53 ` Linus Walleij
2019-11-22 13:04 ` Bartosz Golaszewski
2019-11-22 13:46 ` Linus Walleij
[not found] ` <CALL1Z1xpcGyh_f3ooRT+gGApoAnS7YBMd2hUKqnt+pTcAFoeAg@mail.gmail.com>
2019-11-28 13:44 ` Linus Walleij
2019-11-29 8:47 ` Bartosz Golaszewski
2019-12-04 15:14 ` Rob Herring
2019-11-22 13:10 ` Peter Rosin
2019-11-20 14:20 ` [PATCH 2/4] nvmem: add support for the write-protect pin Khouloud Touil
2019-11-22 12:47 ` Linus Walleij
2019-11-20 14:20 ` [PATCH 3/4] dt-bindings: at24: remove the optional property write-protect-gpios Khouloud Touil
2019-12-04 15:22 ` Rob Herring
2019-11-20 14:20 ` Khouloud Touil [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191120142038.30746-5-ktouil@baylibre.com \
--to=ktouil@baylibre.com \
--cc=baylibre-upstreaming@groups.io \
--cc=bgolaszewski@baylibre.com \
--cc=devicetree@vger.kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=srinivas.kandagatla@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).