summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2016-01-17 07:24:19 +0000
committerPeter Robinson <pbrobinson@gmail.com>2016-01-17 07:24:19 +0000
commitb07458db329dd1757dec813843568c5bf70abde3 (patch)
treede22c71d5926033dff78efd918d66801c0f0a2cc
parentb47c48fa74e3769a4a2288df23e3d233d6a93f4f (diff)
downloadkernel-b07458db329dd1757dec813843568c5bf70abde3.tar.gz
kernel-b07458db329dd1757dec813843568c5bf70abde3.tar.xz
kernel-b07458db329dd1757dec813843568c5bf70abde3.zip
ARM: enable nvmem drivers
-rw-r--r--config-arm-generic4
-rw-r--r--config-armv74
-rw-r--r--config-armv7-generic1
-rw-r--r--kernel.spec1
4 files changed, 9 insertions, 1 deletions
diff --git a/config-arm-generic b/config-arm-generic
index bbd20dd77..7442ecf09 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -124,6 +124,7 @@ CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
CONFIG_REGULATOR_ACT8865=m
CONFIG_ROCKCHIP_PM_DOMAINS=y
CONFIG_CRYPTO_DEV_ROCKCHIP=m
+CONFIG_ROCKCHIP_EFUSE=m
# Tegra
# CONFIG_TEGRA_AHB is not set
@@ -179,6 +180,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
diff --git a/config-armv7 b/config-armv7
index f6caf9c91..00a13ebc3 100644
--- a/config-armv7
+++ b/config-armv7
@@ -347,7 +347,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
@@ -418,6 +419,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 1b7807153..25005c169 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -223,6 +223,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 d8eaa4456..7d2bf711b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2045,6 +2045,7 @@ fi
%changelog
* Sun Jan 17 2016 Peter Robinson <pbrobinson@fedoraproject.org>
- Minor updates to aarch64/ARMv7/PowerPC
+- ARM: enable nvmem drivers
* Fri Jan 15 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.5.0-0.rc0.git4.1
- Linux v4.4-5966-g7d1fc01