diff --git a/config-armv7 b/config-armv7
index b1ee5d149..f4ea33955 100644
--- a/config-armv7
+++ b/config-armv7
@@ -75,8 +75,6 @@ CONFIG_SOC_OMAP5=y
 # CONFIG_SOC_OMAP2430 is not set
 CONFIG_SOC_OMAP3430=y
 CONFIG_SOC_TI81XX=y
-CONFIG_SOC_AM33XX=y
-CONFIG_SOC_AM43XX=y
 CONFIG_MACH_OMAP_GENERIC=y
 CONFIG_MACH_OMAP3_BEAGLE=y
 CONFIG_MACH_DEVKIT8000=y
@@ -84,9 +82,8 @@ CONFIG_MACH_OMAP_LDP=y
 CONFIG_MACH_OMAP3530_LV_SOM=y
 CONFIG_MACH_OMAP3_TORPEDO=y
 CONFIG_MACH_OVERO=y
-CONFIG_MACH_OMAP3EVM=y
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_MACH_OMAP3517EVM=y
+# CONFIG_MACH_OMAP3EVM is not set
+# CONFIG_MACH_OMAP3517EVM is not set
 CONFIG_MACH_CRANEBOARD=y
 CONFIG_MACH_OMAP3_PANDORA=y
 CONFIG_MACH_TOUCHBOOK=y
@@ -101,10 +98,8 @@ CONFIG_MACH_CM_T3517=y
 CONFIG_MACH_IGEP0030=y
 CONFIG_MACH_SBC3530=y
 CONFIG_MACH_OMAP_3630SDP=y
-CONFIG_MACH_TI8168EVM=y
-CONFIG_MACH_TI8148EVM=y
-CONFIG_MACH_OMAP_4430SDP=y
-CONFIG_MACH_OMAP4_PANDA=y
+# CONFIG_MACH_TI8168EVM is not set
+# CONFIG_MACH_TI8148EVM is not set
 
 CONFIG_SOC_HAS_REALTIME_COUNTER=y
 CONFIG_OMAP_RESET_CLOCKS=y
@@ -121,7 +116,6 @@ CONFIG_OMAP_MBOX_KFIFO_SIZE=256
 CONFIG_OMAP_DM_TIMER=y
 CONFIG_OMAP_PM_NOOP=y
 CONFIG_DMA_OMAP=y
-CONFIG_TI_CPPI41=m
 CONFIG_OMAP_IOMMU=y
 CONFIG_OMAP_IOVMM=m
 CONFIG_HWSPINLOCK_OMAP=m
@@ -130,22 +124,6 @@ CONFIG_OMAP3_EMU=y
 CONFIG_OMAP_WATCHDOG=m
 CONFIG_TWL4030_WATCHDOG=m
 
-CONFIG_TI_ST=m
-# needs CONFIG_TI_PRIV_EDMA but nothing selects it
-# CONFIG_TI_EDMA is not set
-CONFIG_TI_SOC_THERMAL=m
-CONFIG_TI_DAC7512=m
-CONFIG_TI_DAVINCI_EMAC=m
-CONFIG_TI_DAVINCI_MDIO=m
-CONFIG_TI_DAVINCI_CPDMA=m
-CONFIG_TI_CPSW=m
-CONFIG_TI_CPTS=y
-CONFIG_TI_EMIF=m
-CONFIG_MFD_TPS65217=m
-CONFIG_REGULATOR_TI_ABB=y
-CONFIG_REGULATOR_TPS65217=m
-CONFIG_BACKLIGHT_TPS65217=m
-
 CONFIG_SERIAL_OMAP=y
 CONFIG_SERIAL_OMAP_CONSOLE=y
 
@@ -158,6 +136,8 @@ CONFIG_TWL4030_CORE=y
 CONFIG_TWL4030_MADC=m
 CONFIG_TWL4030_POWER=y
 CONFIG_TWL4030_WATCHDOG=m
+CONFIG_OMAP_USB2=m
+CONFIG_OMAP_USB3=m
 CONFIG_TWL4030_USB=m
 CONFIG_TWL6030_USB=m
 CONFIG_TWL6030_PWM=m
@@ -165,7 +145,6 @@ CONFIG_TWL6040_CORE=y
 CONFIG_CLK_TWL6040=m
 CONFIG_OMAP_INTERCONNECT=m
 # CONFIG_MFD_TPS80031 is not set
-CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_MFD_OMAP_USB_HOST=y
 CONFIG_MTD_ONENAND_OMAP2=m
 CONFIG_HDQ_MASTER_OMAP=m
@@ -202,7 +181,6 @@ CONFIG_MFD_WL1273_CORE=m
 CONFIG_NFC_WILINK=m
 
 CONFIG_MTD_NAND_OMAP2=m
-CONFIG_SPI_DAVINCI=m
 CONFIG_SPI_OMAP24XX=m
 CONFIG_MFD_TI_SSP=m
 CONFIG_SPI_TI_SSP=m
@@ -236,7 +214,6 @@ CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 CONFIG_CRYPTO_DEV_OMAP_AES=m
 CONFIG_HW_RANDOM_OMAP=m
 
-CONFIG_DRM_TILCDC=m
 CONFIG_DRM_OMAP=m
 CONFIG_DRM_OMAP_NUM_CRTCS=2
 CONFIG_OMAP2_VRFB=y
@@ -259,17 +236,6 @@ CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
 CONFIG_OMAP2_DSS_SLEEP_BEFORE_RESET=y
 CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
 
-CONFIG_PANEL_GENERIC_DPI=m
-CONFIG_PANEL_TFP410=m
-CONFIG_PANEL_SHARP_LS037V7DW01=m
-CONFIG_PANEL_PICODLP=m
-CONFIG_PANEL_TAAL=m
-CONFIG_PANEL_NEC_NL8048HL11_01B=m
-CONFIG_PANEL_TPO_TD043MTEA1=m
-CONFIG_PANEL_LGPHILIPS_LB035Q02=m
-CONFIG_PANEL_ACX565AKM=m
-# CONFIG_PANEL_N8X0 is not set
-
 CONFIG_DISPLAY_ENCODER_TFP410=m
 CONFIG_DISPLAY_ENCODER_TPD12S015=m
 CONFIG_DISPLAY_CONNECTOR_DVI=m
@@ -282,6 +248,16 @@ CONFIG_DISPLAY_PANEL_LGPHILIPS_LB035Q02=m
 CONFIG_DISPLAY_PANEL_SHARP_LS037V7DW01=m
 CONFIG_DISPLAY_PANEL_TPO_TD043MTEA1=m
 CONFIG_DISPLAY_PANEL_NEC_NL8048HL11=m
+# CONFIG_PANEL_GENERIC_DPI is not set
+# CONFIG_PANEL_TFP410 is not set
+# CONFIG_PANEL_LGPHILIPS_LB035Q02 is not set
+# CONFIG_PANEL_SHARP_LS037V7DW01 is not set
+# CONFIG_PANEL_NEC_NL8048HL11_01B is not set
+# CONFIG_PANEL_PICODLP is not set
+# CONFIG_PANEL_TAAL is not set
+# CONFIG_PANEL_TPO_TD043MTEA1 is not set
+# CONFIG_PANEL_ACX565AKM is not set
+# CONFIG_PANEL_N8X0 is not set
 
 # Enable V4L2 drivers for OMAP2+
 CONFIG_MEDIA_CONTROLLER=y
@@ -325,6 +301,7 @@ CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC3X=m
 CONFIG_SND_SOC_TWL4030=m
 CONFIG_SND_SOC_TWL6040=m
+CONFIG_SND_SOC_PCM1792A=m
 CONFIG_RADIO_WL128X=m
 
 CONFIG_OMAP_REMOTEPROC=m
@@ -344,6 +321,31 @@ CONFIG_OMAP_REMOTEPROC=m
 # CONFIG_OMAP_MUX_DEBUG is not set
 # CONFIG_VIDEO_OMAP3_DEBUG is not set
 
+# AM33xx
+CONFIG_SOC_AM33XX=y
+CONFIG_SOC_AM43XX=y
+CONFIG_AM335X_PHY_USB=m
+CONFIG_MFD_TI_AM335X_TSCADC=m
+CONFIG_TI_ST=m
+CONFIG_TI_SOC_THERMAL=m
+CONFIG_TI_DAC7512=m
+CONFIG_TI_DAVINCI_EMAC=m
+CONFIG_TI_DAVINCI_MDIO=m
+CONFIG_TI_DAVINCI_CPDMA=m
+CONFIG_TI_CPSW=m
+CONFIG_TI_CPTS=y
+CONFIG_TI_EMIF=m
+CONFIG_DRM_TILCDC=m
+CONFIG_SPI_DAVINCI=m
+CONFIG_MFD_TPS65217=m
+CONFIG_REGULATOR_TI_ABB=y
+CONFIG_REGULATOR_TPS65217=m
+CONFIG_BACKLIGHT_TPS65217=m
+CONFIG_TI_PRIV_EDMA=y
+CONFIG_TI_EDMA=y
+CONFIG_TI_CPPI41=m
+CONFIG_MFD_TI_AM335X_TSCADC=m
+
 # Allwinner a1x
 CONFIG_PINCTRL_SUNXI=y
 CONFIG_MDIO_SUN4I=m
diff --git a/config-armv7-lpae b/config-armv7-lpae
index 9ed69d67b..7110c3f7c 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -33,6 +33,7 @@ CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 
 # Cortex-A15
 CONFIG_ARM_ERRATA_798181=y
+CONFIG_ARM_ERRATA_773022=y
 
 CONFIG_KVM=y
 CONFIG_KVM_ARM_HOST=y
diff --git a/kernel.spec b/kernel.spec
index e269d344d..4808e8154 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2303,6 +2303,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Sun Sep  8 2013 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor updates to OMAP and AM33xx
+
 * Sat Sep 07 2013 Josh Boyer <jwboyer@fedoraproject.org>
 - Add patch to fix ARM kernel neon build