Skip to content

Commit

Permalink
nvmem: add new config option
Browse files Browse the repository at this point in the history
We want to add nvmem support for MTD. TI DaVinci is the first platform
that will be using it, but only in non-DT mode. In order not to
introduce any new interface to supporting of which we would have to
commit - add a new config option that tells nvmem not to use the DT
node of the parent device.

This way we won't be creating nvmem devices corresponding with MTD
partitions defined in device tree. By default MTD will set this new
field to true.

Once a set of bindings for MTD nvmem cells is agreed upon, we'll be
able to remove this option.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Bartosz Golaszewski authored and Greg Kroah-Hartman committed Dec 6, 2018
1 parent a8b44d5 commit 517f14d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/nvmem/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,8 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
nvmem->type = config->type;
nvmem->reg_read = config->reg_read;
nvmem->reg_write = config->reg_write;
nvmem->dev.of_node = config->dev->of_node;
if (!config->no_of_node)
nvmem->dev.of_node = config->dev->of_node;

if (config->id == -1 && config->name) {
dev_set_name(&nvmem->dev, "%s", config->name);
Expand Down
2 changes: 2 additions & 0 deletions include/linux/nvmem-provider.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ enum nvmem_type {
* @type: Type of the nvmem storage
* @read_only: Device is read-only.
* @root_only: Device is accessibly to root only.
* @no_of_node: Device should not use the parent's of_node even if it's !NULL.
* @reg_read: Callback to read data.
* @reg_write: Callback to write data.
* @size: Device size.
Expand All @@ -62,6 +63,7 @@ struct nvmem_config {
enum nvmem_type type;
bool read_only;
bool root_only;
bool no_of_node;
nvmem_reg_read_t reg_read;
nvmem_reg_write_t reg_write;
int size;
Expand Down

0 comments on commit 517f14d

Please sign in to comment.