From 3f353d6f91ab22e428ed0f4421b7e40de00d2743 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 16 Mar 2022 15:52:21 +0100 Subject: [PATCH] Revert "Revert "mtd: core: Fix a conflict between MTD and NVMEM on wp-gpios property"" This reverts commit 407543a2ff43b6e6265ee52c82ed78a8d7fd2ae8. It is no longer needed as we can modify the KABI at this point in time. Signed-off-by: Greg Kroah-Hartman Change-Id: I9dc3ecfa72fe2244fbd8fa567a6618aff9536c80 --- drivers/mtd/mtdcore.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 54df9cfd588e..61f236e0378a 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -546,6 +546,7 @@ static int mtd_nvmem_add(struct mtd_info *mtd) config.stride = 1; config.read_only = true; config.root_only = true; + config.ignore_wp = true; config.no_of_node = !of_device_is_compatible(node, "nvmem-cells"); config.priv = mtd; @@ -830,6 +831,7 @@ static struct nvmem_device *mtd_otp_nvmem_register(struct mtd_info *mtd, config.owner = THIS_MODULE; config.type = NVMEM_TYPE_OTP; config.root_only = true; + config.ignore_wp = true; config.reg_read = reg_read; config.size = size; config.of_node = np;