Commit 6c762189 authored by Christophe Kerello's avatar Christophe Kerello Committed by Greg Kroah-Hartman

mtd: core: Fix a conflict between MTD and NVMEM on wp-gpios property

Wp-gpios property can be used on NVMEM nodes and the same property can
be also used on MTD NAND nodes. In case of the wp-gpios property is
defined at NAND level node, the GPIO management is done at NAND driver
level. Write protect is disabled when the driver is probed or resumed
and is enabled when the driver is released or suspended.

When no partitions are defined in the NAND DT node, then the NAND DT node
will be passed to NVMEM framework. If wp-gpios property is defined in
this node, the GPIO resource is taken twice and the NAND controller
driver fails to probe.

A new Boolean flag named ignore_wp has been added in nvmem_config.
In case ignore_wp is set, it means that the GPIO is handled by the
provider. Lets set this flag in MTD layer to avoid the conflict on
wp_gpios property.

Fixes: 2a127da4 ("nvmem: add support for the write-protect pin")
Cc: stable@vger.kernel.org
Acked-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: default avatarChristophe Kerello <christophe.kerello@foss.st.com>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20220220151432.16605-3-srinivas.kandagatla@linaro.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f6c052af
...@@ -546,6 +546,7 @@ static int mtd_nvmem_add(struct mtd_info *mtd) ...@@ -546,6 +546,7 @@ static int mtd_nvmem_add(struct mtd_info *mtd)
config.stride = 1; config.stride = 1;
config.read_only = true; config.read_only = true;
config.root_only = true; config.root_only = true;
config.ignore_wp = true;
config.no_of_node = !of_device_is_compatible(node, "nvmem-cells"); config.no_of_node = !of_device_is_compatible(node, "nvmem-cells");
config.priv = mtd; config.priv = mtd;
...@@ -833,6 +834,7 @@ static struct nvmem_device *mtd_otp_nvmem_register(struct mtd_info *mtd, ...@@ -833,6 +834,7 @@ static struct nvmem_device *mtd_otp_nvmem_register(struct mtd_info *mtd,
config.owner = THIS_MODULE; config.owner = THIS_MODULE;
config.type = NVMEM_TYPE_OTP; config.type = NVMEM_TYPE_OTP;
config.root_only = true; config.root_only = true;
config.ignore_wp = true;
config.reg_read = reg_read; config.reg_read = reg_read;
config.size = size; config.size = size;
config.of_node = np; config.of_node = np;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment