Update vexpress and omap options (fix MMC on qemu, hopefully fix OMAP3)

4 files changed, 39 insertions, 30 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
diff --git a/config-arm-tegra b/config-arm-tegra
index eaeaa4f9e..ec6f03587 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -108,7 +108,8 @@ CONFIG_LEDS_RENESAS_TPU=y
 
 CONFIG_OF=y
 CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_SERIAL_TEGRA=m
+# Need to fix, needs patch
+# CONFIG_SERIAL_TEGRA is not set
 CONFIG_OF_GPIO=y
 CONFIG_OF_PCI=y
 CONFIG_OF_PCI_IRQ=y
diff --git a/config-armv7 b/config-armv7
index 73ce436be..cc3ff539e 100644
--- a/config-armv7
+++ b/config-armv7
@@ -381,6 +381,26 @@ CONFIG_FB_SSD1307=m
 
 # Regulator drivers
 CONFIG_REGULATOR_FAN53555=m
+# CONFIG_CHARGER_MANAGER is not set
+# CONFIG_REGULATOR_DUMMY is not set
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+CONFIG_RFKILL_REGULATOR=m
+CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_AD5398=m
+CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX8649=m
+CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_MAX8952=m
+CONFIG_REGULATOR_MAX8973=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_TPS51632=m
+CONFIG_REGULATOR_TPS62360=m
+CONFIG_REGULATOR_TPS65023=m
+CONFIG_REGULATOR_TPS6507X=m
+
 # Needs work/investigation
 
 # CONFIG_ARM_CHARLCD is not set
@@ -433,27 +453,6 @@ CONFIG_PERF_EVENTS=y
 # CONFIG_MFD_DA9055 is not set
 # CONFIG_MFD_LP8788 is not set
 # CONFIG_MFD_MAX8907 is not set
-# CONFIG_REGULATOR_FAN53555 is not set
-# CONFIG_REGULATOR_ANATOP is not set
-# CONFIG_REGULATOR_DUMMY is not set
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
-# CONFIG_REGULATOR_GPIO is not set
-# CONFIG_REGULATOR_AD5398 is not set
-# CONFIG_REGULATOR_ISL6271A is not set
-# CONFIG_REGULATOR_MAX1586 is not set
-# CONFIG_REGULATOR_MAX8649 is not set
-# CONFIG_REGULATOR_MAX8660 is not set
-# CONFIG_REGULATOR_MAX8952 is not set
-# CONFIG_REGULATOR_MAX8973 is not set
-# CONFIG_REGULATOR_LP3971 is not set
-# CONFIG_REGULATOR_LP3972 is not set
-# CONFIG_REGULATOR_LP8755 is not set
-# CONFIG_REGULATOR_TPS51632 is not set
-# CONFIG_REGULATOR_TPS62360 is not set
-# CONFIG_REGULATOR_TPS65023 is not set
-# CONFIG_REGULATOR_TPS6507X is not set
-# CONFIG_REGULATOR_VEXPRESS is not set
 # CONFIG_IR_RX51 is not set
 # CONFIG_VIDEO_DM6446_CCDC is not set
 # CONFIG_PANEL_TAAL is not set
diff --git a/kernel.spec b/kernel.spec
index 55b9fd44c..fca4780a5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1563,6 +1563,7 @@ BuildKernel() {
     make -s ARCH=$Arch V=1 dtbs
     mkdir -p $RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer
     install -m 644 arch/arm/boot/dts/*.dtb $RPM_BUILD_ROOT/boot/dtb-$KernelVer/
+    rm -f arch/arm/boot/dts/*.dtb
 %else
     make -s ARCH=$Arch V=1 %{?_smp_mflags} $MakeTarget %{?sparse_mflags}
 %endif
@@ -2271,7 +2272,7 @@ fi
 #                 ||     ||
 %changelog
 * Mon Mar  4 2013 Peter Robinson <pbrobinson@fedoraproject.org>
-- Minor ARM updates
+- Update vexpress and omap options (fix MMC on qemu, hopefully fix OMAP3)
 
 * Sun Mar 03 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git15.1
 - Linux v3.8-10734-ga7c1120