From 770ddfba0956334d868db762868e132f0fc032b4 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Feb 21 2016 15:12:48 +0000
Subject: Minor aarch64/ARMv7 config cleanup, enable nvmem drivers


---

diff --git a/config-arm-generic b/config-arm-generic
index 399bfaf..0831ea3 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -122,6 +122,7 @@ CONFIG_SND_SOC_ROCKCHIP_RT5645=m
 CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
 CONFIG_REGULATOR_ACT8865=m
 CONFIG_ROCKCHIP_PM_DOMAINS=y
+CONFIG_ROCKCHIP_EFUSE=m
 
 # Tegra
 # CONFIG_TEGRA_AHB is not set
@@ -167,6 +168,9 @@ CONFIG_ARM_MHU=m
 # CONFIG_PL320_MBOX is not set
 CONFIG_ARM_SCPI_PROTOCOL=m
 
+# NVMem
+CONFIG_NVMEM=m
+
 # USB
 CONFIG_USB_OHCI_HCD_PLATFORM=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
@@ -249,7 +253,7 @@ CONFIG_PINMUX=y
 CONFIG_PINCONF=y
 CONFIG_PINCTRL=y
 CONFIG_GENERIC_PINCONF=y
-CONFIG_PINCTRL_SINGLE=m
+CONFIG_PINCTRL_SINGLE=y
 
 #i2c
 CONFIG_I2C_ARB_GPIO_CHALLENGE=m
diff --git a/config-armv7 b/config-armv7
index eaa6d4e..7517978 100644
--- a/config-armv7
+++ b/config-armv7
@@ -348,7 +348,8 @@ CONFIG_QCOM_SMD=m
 CONFIG_QCOM_SMD_RPM=m
 CONFIG_QCOM_SMEM=m
 CONFIG_REGULATOR_QCOM_SMD_RPM=m
-# CONFIG_QCOM_SMEM is not set
+CONFIG_QCOM_SMEM=m
+CONFIG_QCOM_QFPROM=m
 
 # i.MX
 # CONFIG_MXC_DEBUG_BOARD is not set
@@ -419,6 +420,7 @@ CONFIG_FB_MXS=m
 # CONFIG_FB_MX3 is not set
 # CONFIG_FB_IMX is not set
 CONFIG_TOUCHSCREEN_IMX6UL_TSC=m
+CONFIG_NVMEM_IMX_OCOTP=m
 
 CONFIG_SND_IMX_SOC=m
 CONFIG_SND_SOC_FSL_ASOC_CARD=m
diff --git a/config-armv7-generic b/config-armv7-generic
index 285b4dc..23068c5 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -222,6 +222,7 @@ CONFIG_USB_MUSB_SUNXI=m
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
 CONFIG_SND_SUN4I_CODEC=m
 CONFIG_SUNXI_RSB=m
+CONFIG_NVMEM_SUNXI_SID=m
 
 # Exynos
 CONFIG_ARCH_EXYNOS3=y
diff --git a/kernel.spec b/kernel.spec
index 5a55f02..02c63fa 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2072,7 +2072,8 @@ fi
 %changelog
 * Sat Feb 20 2016 Peter Robinson <pbrobinson@fedoraproject.org>
 - Drop AMD xgbe-a0 driver (fix aarch64 FTBFS)
-- Minor aarch64 config cleanup
+- Minor aarch64/ARMv7 config cleanup
+- ARM: enable nvmem drivers
 
 * Thu Feb 18 2016 Laura Abbott <labbott@fedoraproject.org> - 4.4.2-300
 - Linux v4.4.2