summaryrefslogtreecommitdiffstats
path: root/config-arm-omap
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2013-03-04 19:59:47 +0000
committerPeter Robinson <pbrobinson@gmail.com>2013-03-04 19:59:47 +0000
commit5341f551988c1684421644c89228133ac95aef25 (patch)
tree442d2cd6b3997d01ee40d3b82b671130431ddb9f /config-arm-omap
parent078f71f7dd25bb8acc5a706cc92c3109c65bf118 (diff)
downloadkernel-5341f551988c1684421644c89228133ac95aef25.tar.gz
kernel-5341f551988c1684421644c89228133ac95aef25.tar.xz
kernel-5341f551988c1684421644c89228133ac95aef25.zip
Update vexpress and omap options (fix MMC on qemu, hopefully fix OMAP3)
Diffstat (limited to 'config-arm-omap')
-rw-r--r--config-arm-omap22
1 files changed, 15 insertions, 7 deletions
diff --git a/config-arm-omap b/config-arm-omap
index 8ac6cb9c9..3ec36d0cf 100644
--- a/config-arm-omap
+++ b/config-arm-omap
@@ -29,8 +29,6 @@ CONFIG_ARCH_OMAP2PLUS=y
#
# OMAP Feature Selections
#
-CONFIG_OMAP_SMARTREFLEX=y
-CONFIG_OMAP_SMARTREFLEX_CLASS3=y
CONFIG_OMAP_RESET_CLOCKS=y
CONFIG_OMAP_MUX=y
# CONFIG_OMAP_MUX_DEBUG is not set
@@ -51,8 +49,6 @@ CONFIG_HWSPINLOCK_OMAP=m
CONFIG_DMA_OMAP=y
# CONFIG_DMADEVICES_VDEBUG is not set
-CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
-
#
# TI OMAP2/3/4 Specific Features
#
@@ -169,6 +165,13 @@ CONFIG_OMAP_BANDGAP=y
CONFIG_OMAP4_THERMAL=y
CONFIG_OMAP5_THERMAL=y
+# OMAP3 thermal/power
+CONFIG_POWER_AVS=y
+CONFIG_POWER_AVS_OMAP=y
+CONFIG_POWER_AVS_OMAP_CLASS3=y
+
+CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
+
#
# OMAP Hardware
#
@@ -234,10 +237,15 @@ CONFIG_REGULATOR_TPS65910=y
CONFIG_MEDIA_CONTROLLER=y
CONFIG_VIDEO_V4L2_SUBDEV_API=y
CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_VPFE_CAPTURE=m
CONFIG_VIDEO_OMAP2_VOUT=m
-CONFIG_VIDEO_DM6446_CCDC=m
-# CONFIG_VIDEO_OMAP3 is not set
+CONFIG_VIDEO_OMAP3=m
+CONFIG_VIDEO_VPFE_CAPTURE=m
+# The ones below are for TI Davinci
+# CONFIG_VIDEO_VPSS_SYSTEM is not set
+# CONFIG_VIDEO_DM6446_CCDC is not set
+# CONFIG_VIDEO_DM644X_VPBE is not set
+# CONFIG_VIDEO_DM355_CCDC is not set
+# CONFIG_VIDEO_ISIF is not set
# Also enable vivi driver - useful for testing a full kernelspace V4L2 driver
CONFIG_V4L_TEST_DRIVERS=y
CONFIG_VIDEO_VIVI=m