summaryrefslogtreecommitdiffstats
path: root/config-arm-omap
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2013-01-05 20:39:44 +0000
committerPeter Robinson <pbrobinson@gmail.com>2013-01-05 20:39:44 +0000
commit14f894d108cf360b6a72f6291084e7bf8e77cef2 (patch)
treec109b0aa39152c7d8058ddc93a46a6411e7c49fb /config-arm-omap
parentf82b10781df75202d8783d2d6b937920f07af972 (diff)
downloadkernel-14f894d108cf360b6a72f6291084e7bf8e77cef2.tar.gz
kernel-14f894d108cf360b6a72f6291084e7bf8e77cef2.tar.xz
kernel-14f894d108cf360b6a72f6291084e7bf8e77cef2.zip
Initial update of ARM configs for 3.8, Enable DRM driver for tegra, Drop separate imx kernel. Will be reintroduced soon in unified
Diffstat (limited to 'config-arm-omap')
-rw-r--r--config-arm-omap13
1 files changed, 11 insertions, 2 deletions
diff --git a/config-arm-omap b/config-arm-omap
index 68421b06e..71e400246 100644
--- a/config-arm-omap
+++ b/config-arm-omap
@@ -41,7 +41,7 @@ CONFIG_SOC_OMAP3430=y
CONFIG_SOC_TI81XX=y
CONFIG_SOC_AM33XX=y
CONFIG_SOC_OMAPTI816X=y
-CONFIG_SOC_OMAP5=y
+# CONFIG_SOC_OMAP5 is not set
CONFIG_OMAP_PACKAGE_CBB=y
CONFIG_OMAP_PACKAGE_CBL=y
CONFIG_OMAP_PACKAGE_CBS=y
@@ -170,6 +170,7 @@ CONFIG_TOUCHSCREEN_TI_TSCADC=m
CONFIG_SERIAL_OMAP=y
CONFIG_SERIAL_OMAP_CONSOLE=y
CONFIG_OMAP_WATCHDOG=y
+CONFIG_CLK_TWL6040=m
CONFIG_TWL4030_CORE=y
CONFIG_TWL4030_MADC=m
CONFIG_TWL4030_POWER=y
@@ -297,9 +298,16 @@ CONFIG_MMC_OMAP=y
CONFIG_MMC_OMAP_HS=y
CONFIG_TWL4030_USB=y
CONFIG_TWL6030_USB=y
+CONFIG_RTC_DRV_OMAP=m
CONFIG_RTC_DRV_TWL4030=y
+CONFIG_PWM_TIECAP=m
+CONFIG_PWM_TIEHRPWM=m
+CONFIG_PWM_TWL=m
+CONFIG_PWM_TWL_LED=m
+
CONFIG_IR_RX51=m
+CONFIG_BATTERY_RX51=m
# CONFIG_TIDSPBRIDGE is not set
# CONFIG_TIDSPBRIDGE_MEMPOOL_SIZE=0x600000
@@ -333,7 +341,8 @@ CONFIG_CRYPTO_DEV_OMAP_AES=m
# CONFIG_MFD_AAT2870_CORE is not set
# CONFIG_MFD_RC5T583 is not set
# CONFIG_MFD_PALMAS is not set
-# CONFIG_REGULATOR_DUMMY is not set
# CONFIG_REGULATOR_LP3972 is not set
# CONFIG_REGULATOR_LP872X is not set
+# CONFIG_OMAP2_DSS_DEBUG is not set
+# CONFIG_OMAP2_DSS_DEBUGFS is not set