summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-arm-generic2
-rw-r--r--config-arm-omap13
-rw-r--r--kernel.spec3
3 files changed, 14 insertions, 4 deletions
diff --git a/config-arm-generic b/config-arm-generic
index 6137f6f64..856af8e43 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -23,7 +23,6 @@ CONFIG_FPE_FASTFPE=y
# Generic ARM Errata
CONFIG_ARM_ERRATA_720789=y
CONFIG_ARM_ERRATA_751472=y
-CONFIG_OMAP4_ERRATA_I688=y
# Generic ARM config options
CONFIG_ZBOOT_ROM_TEXT=0
@@ -85,6 +84,7 @@ CONFIG_LBDAF=y
CONFIG_RFKILL_GPIO=m
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIO_GENERIC_PLATFORM=m
CONFIG_SND_ARM=y
CONFIG_SND_ARMAACI=m
diff --git a/config-arm-omap b/config-arm-omap
index 481612470..3513ef062 100644
--- a/config-arm-omap
+++ b/config-arm-omap
@@ -42,6 +42,7 @@ CONFIG_SOC_OMAP3430=y
CONFIG_OMAP_PACKAGE_CBB=y
CONFIG_OMAP_PACKAGE_CBL=y
CONFIG_OMAP_PACKAGE_CBS=y
+CONFIG_OMAP4_ERRATA_I688=y
#
# OMAP Board Type
@@ -70,6 +71,8 @@ CONFIG_MACH_OMAP_3630SDP=y
CONFIG_MACH_OMAP_4430SDP=y
CONFIG_MACH_OMAP4_PANDA=y
CONFIG_MACH_TI8168EVM=y
+# CONFIG_MACH_NOKIA_RM680 is not set
+# CONFIG_MACH_NOKIA_RX51 is not set
# CONFIG_MACH_TI8148EVM is not set
CONFIG_MACH_OMAP3_WESTBRIDGE_AST_PNAND_HAL=y
@@ -150,9 +153,10 @@ CONFIG_MTD_NAND_OMAP_PREFETCH_DMA=y
CONFIG_WL1251_SPI=m
CONFIG_WL12XX_SPI=m
CONFIG_WL12XX_SDIO_TEST=m
-CONFIG_INPUT_TWL4030_PWRBUTTON=y
-CONFIG_INPUT_TWL4030_VIBRA=y
-CONFIG_INPUT_TWL6040_VIBRA=y
+CONFIG_INPUT_TWL4030_PWRBUTTON=m
+CONFIG_INPUT_TWL4030_VIBRA=m
+CONFIG_INPUT_TWL6040_VIBRA=m
+CONFIG_TOUCHSCREEN_TI_TSCADC=m
CONFIG_SERIAL_OMAP=y
CONFIG_SERIAL_OMAP_CONSOLE=y
CONFIG_OMAP_WATCHDOG=y
@@ -160,6 +164,8 @@ CONFIG_TWL4030_CORE=y
# CONFIG_TWL4030_MADC is not set
CONFIG_TWL4030_POWER=y
CONFIG_TWL4030_CODEC=y
+CONFIG_GPIO_TWL4030=m
+CONFIG_CHARGER_TWL4030=m
# CONFIG_TWL6030_PWM is not set
CONFIG_MTD_ONENAND_OMAP2=y
@@ -217,6 +223,7 @@ CONFIG_SND_OMAP_SOC_IGEP0020=y
# CONFIG_SND_OMAP_SOC_OMAP4_HDMI is not set
CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
CONFIG_SND_SOC_I2C_AND_SPI=y
+# CONFIG_SND_OMAP_SOC_RX51 is not set
# CONFIG_SND_SOC_ALL_CODECS is not set
CONFIG_SND_SOC_TLV320AIC23=y
CONFIG_SND_SOC_TLV320AIC3X=y
diff --git a/kernel.spec b/kernel.spec
index c28328c09..f8bd639dd 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2290,6 +2290,9 @@ fi
# ||----w |
# || ||
%changelog
+* Sat Jun 02 2012 Peter Robinson <pbrobinson@fedoraproject.org>
+- ARM OMAP updates
+
* Sat Jun 02 2012 Josh Boyer <jwboyer@redhat.com> - 3.5.0-0.rc0.git12.1
- Linux v3.4-10115-g829f51d