Skip to content

Commit 6c76218

Browse files
Christophe Kerellogregkh
authored andcommitted
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: 2a127da ("nvmem: add support for the write-protect pin") Cc: stable@vger.kernel.org Acked-by: Miquel Raynal <miquel.raynal@bootlin.com> Signed-off-by: Christophe Kerello <christophe.kerello@foss.st.com> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Link: https://lore.kernel.org/r/20220220151432.16605-3-srinivas.kandagatla@linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent f6c052a commit 6c76218

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

drivers/mtd/mtdcore.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,7 @@ static int mtd_nvmem_add(struct mtd_info *mtd)
546546
config.stride = 1;
547547
config.read_only = true;
548548
config.root_only = true;
549+
config.ignore_wp = true;
549550
config.no_of_node = !of_device_is_compatible(node, "nvmem-cells");
550551
config.priv = mtd;
551552

@@ -833,6 +834,7 @@ static struct nvmem_device *mtd_otp_nvmem_register(struct mtd_info *mtd,
833834
config.owner = THIS_MODULE;
834835
config.type = NVMEM_TYPE_OTP;
835836
config.root_only = true;
837+
config.ignore_wp = true;
836838
config.reg_read = reg_read;
837839
config.size = size;
838840
config.of_node = np;

0 commit comments

Comments
 (0)