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

This reverts commit 34ec4c78 which is
commit f6c052af upstream.

It breaks the Android kernel api, and isn't even really needed in the
5.10.y kernel tree yet, as there are no users of the new field.  So
revert it for now.  If it is needed, it can be brought back in an
abi-safe way in the future.

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