diff options
author | 2020-01-29 21:56:36 +0100 | |
---|---|---|
committer | 2020-01-29 21:56:36 +0100 | |
commit | 6810df46c41879eba8437ab020c7abf5d1db827e (patch) | |
tree | a9af691033e81bd6396a63b29a323296df69c2bf /include | |
parent | i2c: xiic: fix indentation issue (diff) | |
parent | misc: eeprom: at24: support pm_runtime control (diff) | |
download | linux-dev-6810df46c41879eba8437ab020c7abf5d1db827e.tar.xz linux-dev-6810df46c41879eba8437ab020c7abf5d1db827e.zip |
Merge tag 'at24-updates-for-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-5.6
at24 updates for linux v5.6
- minor maintenance: update the license tag, sort headers
- move support for the write-protect pin into nvmem core
- add a reference to the new wp-gpios property in nvmem to at25 bindings
- add support for regulator and pm_runtime control
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/nvmem-provider.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/nvmem-provider.h b/include/linux/nvmem-provider.h index fe051323be0a..6d6f8e5d24c9 100644 --- a/include/linux/nvmem-provider.h +++ b/include/linux/nvmem-provider.h @@ -11,6 +11,7 @@ #include <linux/err.h> #include <linux/errno.h> +#include <linux/gpio/consumer.h> struct nvmem_device; struct nvmem_cell_info; @@ -45,6 +46,7 @@ enum nvmem_type { * @word_size: Minimum read/write access granularity. * @stride: Minimum read/write access stride. * @priv: User context passed to read/write callbacks. + * @wp-gpio: Write protect pin * * Note: A default "nvmem<id>" name will be assigned to the device if * no name is specified in its configuration. In such case "<id>" is @@ -58,6 +60,7 @@ struct nvmem_config { const char *name; int id; struct module *owner; + struct gpio_desc *wp_gpio; const struct nvmem_cell_info *cells; int ncells; enum nvmem_type type; |