From dba6fdeb99132b812a2bef6438ea0d7b2f06dd25 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Thu, 14 Nov 2013 16:17:02 +0000
Subject: [PATCH] More minor ARM config updates, ensure big.LITTLE remains
 disabled, enable AES BS ARM optimised driver

---
 config-armv7         | 5 +++--
 config-armv7-generic | 4 ++++
 kernel.spec          | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/config-armv7 b/config-armv7
index 4352c8b4f..7d4269793 100644
--- a/config-armv7
+++ b/config-armv7
@@ -131,7 +131,7 @@ CONFIG_BACKLIGHT_PANDORA=m
 CONFIG_OMAP_OCP2SCP=m
 CONFIG_USB_EHCI_HCD_OMAP=m
 CONFIG_USB_OHCI_HCD_PLATFORM=m
-CONFIG_USB_OHCI_HCD_OMAP3=y
+CONFIG_USB_OHCI_HCD_OMAP3=m
 CONFIG_USB_MUSB_AM35X=m
 CONFIG_USB_MUSB_OMAP2PLUS=m
 CONFIG_OMAP_CONTROL_USB=m
@@ -327,7 +327,7 @@ CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_SUN4I_EMAC=m
 CONFIG_EEPROM_SUNXI_SID=m
 
-# imx 
+# i.MX
 CONFIG_MXC_IRQ_PRIOR=y
 # CONFIG_MXC_DEBUG_BOARD is not set
 CONFIG_SOC_IMX53=y
@@ -339,6 +339,7 @@ CONFIG_MACH_IMX51_DT=y
 CONFIG_ARM_IMX6Q_CPUFREQ=m
 CONFIG_IMX_THERMAL=m
 CONFIG_PATA_IMX=m
+CONFIG_PCI_IMX6=y
 CONFIG_USB_CHIPIDEA=m
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
diff --git a/config-armv7-generic b/config-armv7-generic
index f32e2f7f4..2b0fa2a0c 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -51,6 +51,7 @@ CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y
 CONFIG_ARCH_HIGHBANK=y
 CONFIG_ARCH_VEXPRESS_CA9X4=y
 CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
+# CONFIG_ARCH_VEXPRESS_SPC is not set
 # CONFIG_ARCH_BCM is not set
 # CONFIG_PLAT_SPEAR is not set
 # CONFIG_ARCH_STI is not set
@@ -267,6 +268,7 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # HW crypto and rng
 CONFIG_CRYPTO_SHA1_ARM=m
 CONFIG_CRYPTO_AES_ARM=m
+CONFIG_CRYPTO_AES_ARM_BS=m
 
 # DMA
 CONFIG_TI_PRIV_EDMA=y
@@ -318,6 +320,8 @@ CONFIG_USB_DWC3_EXYNOS=m
 CONFIG_USB_DWC3_PCI=m
 # CONFIG_USB_DWC3_DEBUG is not set
 CONFIG_DW_WATCHDOG=m
+CONFIG_PCIE_DW=y
+CONFIG_PCI_EXYNOS=y
 
 # Sound
 CONFIG_SND_ARM=y
diff --git a/kernel.spec b/kernel.spec
index efe23391b..10b4e3603 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2238,8 +2238,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
-* Wed Nov 13 2013 Peter Robinson <pbrobinson@fedoraproject.org>
+* Thu Nov 14 2013 Peter Robinson <pbrobinson@fedoraproject.org>
 - Update ARM configs
+- Enable ARM NEON optimised AES
 
 * Wed Nov 13 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc0.git3.2
 - Enable USER_NS for root-only processes (rhbz 917708)