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

This reverts commit b34e0920.

It needs to come back to handle the 5.10.169 merge properly, it will be
reverted again afterward to resolve the abi issues.

Bug: 161946584
Change-Id: I8ff6a57edb206a515edd856341e0a916cc4d9c08
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>