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

This reverts commit 453a82127f as it
breaks the KABI.  It will be reverted the next KABI gate in a week.

Fixes: 8993e6067f ("Linux 5.15.26")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I77fe1425a713d080dcdec1cea148c25c3783b982
This commit is contained in:
Greg Kroah-Hartman
2022-03-16 12:40:14 +01:00
parent fc94364a70
commit 407543a2ff

View File

@@ -546,7 +546,6 @@ 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;
@@ -831,7 +830,6 @@ 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;