GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-23 23:03:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

eeprom: at24: remove the write-protect pin support

Browse source 
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>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
This commit is contained in:
Khouloud Touil 2020-01-09 10:51:13 +01:00 • committed by Bartosz Golaszewski
parent 6c57a664c4
commit 1c89074bf8
1 changed files with 0 additions and 9 deletions

9
drivers/misc/eeprom/at24.c
View file

@ -9,7 +9,6 @@
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/gpio/consumer.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
@ -89,8 +88,6 @@ struct at24_data {
struct nvmem_device *nvmem; struct nvmem_device *nvmem;
struct gpio_desc *wp_gpio;
/* /*
* Some chips tie up multiple I2C addresses; dummy devices reserve * Some chips tie up multiple I2C addresses; dummy devices reserve
* them for us, and we'll use them with SMBus calls. * 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. * from this host, but not from other I2C masters.
*/ */
mutex_lock(&at24->lock); mutex_lock(&at24->lock);
gpiod_set_value_cansleep(at24->wp_gpio, 0);
while (count) { while (count) {
ret = at24_regmap_write(at24, buf, off, count); ret = at24_regmap_write(at24, buf, off, count);
if (ret < 0) { if (ret < 0) {
gpiod_set_value_cansleep(at24->wp_gpio, 1);
mutex_unlock(&at24->lock); mutex_unlock(&at24->lock);
pm_runtime_put(dev); pm_runtime_put(dev);
return ret; return ret;
@ -472,7 +467,6 @@ static int at24_write(void *priv, unsigned int off, void *val, size_t count)
count -= ret; count -= ret;
} }
gpiod_set_value_cansleep(at24->wp_gpio, 1);
mutex_unlock(&at24->lock); mutex_unlock(&at24->lock);
pm_runtime_put(dev); pm_runtime_put(dev);
@ -662,9 +656,6 @@ static int at24_probe(struct i2c_client *client)
at24->client[0].client = client; at24->client[0].client = client;
at24->client[0].regmap = regmap; 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); writable = !(flags & AT24_FLAG_READONLY);
if (writable) { if (writable) {