moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 407543a2ff.

It is no longer needed as we can modify the KABI at this point in time.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I9dc3ecfa72fe2244fbd8fa567a6618aff9536c80
This commit is contained in:
Greg Kroah-Hartman
2022-03-16 15:52:21 +01:00
committed by Todd Kjos
parent a6abedbff6
commit 3f353d6f91
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mtd/mtdcore.c
View File

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