General minor ARM cleanups

3 files changed, 18 insertions, 14 deletions

diff --git a/config-armv7 b/config-armv7
index 4dc63eca3..2ceb44122 100644
--- a/config-armv7
+++ b/config-armv7
@@ -10,7 +10,7 @@ CONFIG_ARCH_OMAP3=y
 CONFIG_ARCH_OMAP4=y
 CONFIG_ARCH_PICOXCELL=y
 CONFIG_ARCH_ROCKCHIP=y
-CONFIG_ARCH_SOCFPGA=y
+# CONFIG_ARCH_SOCFPGA is not set
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_U8500=y
 # CONFIG_ARCH_VIRT is not set
@@ -20,6 +20,7 @@ CONFIG_ARCH_ZYNQ=y
 # CONFIG_ARM_LPAE is not set
 # CONFIG_XEN is not set
 # CONFIG_ARM_VIRT_EXT is not set
+# CONFIG_VIRTUALIZATION is not set
 
 # mvebu
 CONFIG_MACH_ARMADA_370_XP=y
@@ -196,8 +197,8 @@ CONFIG_OMAP5_THERMAL=y
 CONFIG_POWER_AVS=y
 CONFIG_POWER_AVS_OMAP=y
 CONFIG_POWER_AVS_OMAP_CLASS3=y
-
-CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
+# CPUFREQ_CPU0 is used for scaling on DT OMAP
+# CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set
 
 CONFIG_PWM_TIECAP=m
 CONFIG_PWM_TIEHRPWM=m
@@ -219,7 +220,7 @@ CONFIG_OMAP2_VRFB=y
 # CONFIG_FB_DA8XX is not set
 
 CONFIG_OMAP2_DSS=m
-CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y
+# CONFIG_OMAP2_DSS_DEBUG_SUPPORT is not set
 # CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS is not set
 CONFIG_OMAP2_DSS_DPI=y
 CONFIG_OMAP2_DSS_RFBI=y
@@ -322,7 +323,7 @@ CONFIG_TI_DAVINCI_MDIO=m
 CONFIG_TI_CPSW=m
 CONFIG_TI_CPSW_PHY_SEL=y
 CONFIG_TI_CPTS=y
-# Needed for BBone White
+# Builtin needed for BBone White
 CONFIG_REGULATOR_TPS65217=y
 CONFIG_TI_EMIF=m
 CONFIG_DRM_TILCDC=m
@@ -347,6 +348,7 @@ CONFIG_SOC_IMX50=y
 CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
+# CONFIG_SOC_VF610 is not set
 CONFIG_MACH_IMX51_DT=y
 # CONFIG_MACH_MX51_BABBAGE is not set
 # CONFIG_MACH_EUKREA_CPUIMX51SD is not set
@@ -354,7 +356,7 @@ CONFIG_ARM_IMX6Q_CPUFREQ=m
 CONFIG_IMX_THERMAL=m
 CONFIG_PATA_IMX=m
 CONFIG_PCI_IMX6=y
-# CONFIG_USB_EHCI_MXC is not set
+CONFIG_USB_EHCI_MXC=m
 CONFIG_USB_CHIPIDEA=m
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
@@ -400,7 +402,6 @@ CONFIG_SND_SOC_EUKREA_TLV320=m
 
 CONFIG_USB_IMX21_HCD=m
 CONFIG_USB_MXS_PHY=m
-CONFIG_MMC_DW_SOCFPGA=m
 CONFIG_MMC_SDHCI_ESDHC_IMX=m
 CONFIG_MMC_MXC=m
 CONFIG_SPI_MXS=m
@@ -597,7 +598,7 @@ CONFIG_GPIO_PCA953X=m
 CONFIG_SERIO_OLPC_APSP=m
 
 # Zynq-7xxx
-# likely needs usb/mmc still
+# likely needs usb still
 CONFIG_SERIAL_UARTLITE=y
 CONFIG_SERIAL_UARTLITE_CONSOLE=y
 CONFIG_SERIAL_XILINX_PS_UART=y
@@ -614,6 +615,9 @@ CONFIG_MMC_SDHCI_OF_ARASAN=m
 CONFIG_I2C_CADENCE=m
 CONFIG_XILINX_WATCHDOG=m
 CONFIG_XILINX_XADC=m
+CONFIG_SND_SOC_ADI=m
+CONFIG_SND_SOC_ADI_AXI_I2S=m
+CONFIG_SND_SOC_ADI_AXI_SPDIF=m
 
 # Multi function devices
 CONFIG_MFD_88PM800=m
@@ -672,12 +676,9 @@ CONFIG_REGULATOR_MAX8973=m
 # CONFIG_TOUCHSCREEN_EGALAX is not set
 # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
 
-# CONFIG_VIRTUALIZATION is not set
 # CONFIG_POWER_RESET_QNAP is not set
 # CONFIG_OMAP2_DSS_DEBUG is not set
 # CONFIG_CRYPTO_DEV_UX500_DEBUG is not set
 # CONFIG_AB8500_DEBUG is not set
 
-# CONFIG_SOC_VF610 is not set
 # CONFIG_MMC_TMIO is not set
-# CONFIG_SND_SOC_ADI is not set
diff --git a/config-armv7-generic b/config-armv7-generic
index b84d327e6..4e6fca7b3 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -418,6 +418,9 @@ CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_JACK=y
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_SOC_ALL_CODECS=m
+CONFIG_SND_SOC_CACHE_LZO=y
+CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_ADAU1701 is not set
 # CONFIG_SND_SOC_AK4104 is not set
 # CONFIG_SND_SOC_AK4554 is not set
@@ -454,9 +457,6 @@ CONFIG_SND_SOC_ALL_CODECS=m
 # CONFIG_SND_SOC_WM8903 is not set
 # CONFIG_SND_SOC_WM8962 is not set
 # CONFIG_SND_SOC_TPA6130A2 is not set
-CONFIG_SND_SOC_CACHE_LZO=y
-CONFIG_SND_SOC_DMIC=m
-CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_ATMEL_SOC is not set
 
 # Displays
diff --git a/kernel.spec b/kernel.spec
index 573452ce6..55ba31123 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2219,6 +2219,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Sun May  4 2014 Peter Robinson <pbrobinson@fedoraproject.org>
+- General minor ARM cleanups
+
 * Sun May 04 2014 Josh Boyer <jwboyer@fedoraproject.org>
 - Fix k-m-e requires on k-m-uname-r provides
 - ONE MORE TIME WITH FEELING