From a71eb20cf4d6b5d09f18139194a7484e5546285c Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sun, 22 Apr 2018 22:54:53 +0100
Subject: [PATCH] Enable on ARMv7 for i.MX

---
 configs/fedora/generic/arm/CONFIG_NVMEM_SNVS_LPGPR             | 1 -
 configs/fedora/generic/arm/armv7/armv7/CONFIG_NVMEM_SNVS_LPGPR | 1 +
 kernel-aarch64-debug.config                                    | 1 -
 kernel-aarch64.config                                          | 1 -
 kernel-armv7hl-debug.config                                    | 2 +-
 kernel-armv7hl-lpae-debug.config                               | 1 -
 kernel-armv7hl-lpae.config                                     | 1 -
 kernel-armv7hl.config                                          | 2 +-
 8 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 configs/fedora/generic/arm/CONFIG_NVMEM_SNVS_LPGPR
 create mode 100644 configs/fedora/generic/arm/armv7/armv7/CONFIG_NVMEM_SNVS_LPGPR

diff --git a/configs/fedora/generic/arm/CONFIG_NVMEM_SNVS_LPGPR b/configs/fedora/generic/arm/CONFIG_NVMEM_SNVS_LPGPR
deleted file mode 100644
index be81f38c4..000000000
--- a/configs/fedora/generic/arm/CONFIG_NVMEM_SNVS_LPGPR
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NVMEM_SNVS_LPGPR is not set
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_NVMEM_SNVS_LPGPR b/configs/fedora/generic/arm/armv7/armv7/CONFIG_NVMEM_SNVS_LPGPR
new file mode 100644
index 000000000..21803b106
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_NVMEM_SNVS_LPGPR
@@ -0,0 +1 @@
+CONFIG_NVMEM_SNVS_LPGPR=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index e2c93a1ac..4871044c2 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -3987,7 +3987,6 @@ CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA=y
 CONFIG_NVME_FC=m
-# CONFIG_NVMEM_SNVS_LPGPR is not set
 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 26405e625..cb85a35e0 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -3965,7 +3965,6 @@ CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA=y
 CONFIG_NVME_FC=m
-# CONFIG_NVMEM_SNVS_LPGPR is not set
 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 6eed781fd..6eeeb1e45 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -4201,7 +4201,7 @@ CONFIG_NVEC_POWER=y
 CONFIG_NVME_FC=m
 CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
-# CONFIG_NVMEM_SNVS_LPGPR is not set
+CONFIG_NVMEM_SNVS_LPGPR=m
 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index f123578c5..022fbf9cd 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -4019,7 +4019,6 @@ CONFIG_NTB_SWITCHTEC=m
 CONFIG_NTP_PPS=y
 CONFIG_NVME_FC=m
 CONFIG_NVMEM_IMX_IIM=m
-# CONFIG_NVMEM_SNVS_LPGPR is not set
 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index f551319c9..0a4361b57 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -3997,7 +3997,6 @@ CONFIG_NTB_SWITCHTEC=m
 CONFIG_NTP_PPS=y
 CONFIG_NVME_FC=m
 CONFIG_NVMEM_IMX_IIM=m
-# CONFIG_NVMEM_SNVS_LPGPR is not set
 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index ca58afccf..ff7f413ba 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -4179,7 +4179,7 @@ CONFIG_NVEC_POWER=y
 CONFIG_NVME_FC=m
 CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
-# CONFIG_NVMEM_SNVS_LPGPR is not set
+CONFIG_NVMEM_SNVS_LPGPR=m
 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y