[kernel/f18] Fix Beagle (omap), update vexpress

[Peter Robinson]

commit 3b5b67be2b874eb91a878e2c0835478b8a712857
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Mar 5 19:33:16 2013 +0000

    Fix Beagle (omap), update vexpress

 config-arm-omap |   22 +++++++++++++++-------
 config-armv7    |   23 +++++++++++++++++++++++
 kernel.spec     |    4 ++++
 3 files changed, 42 insertions(+), 7 deletions(-)
---
diff --git a/config-arm-omap b/config-arm-omap
index 976d438..38a73b4 100644
--- a/config-arm-omap
+++ b/config-arm-omap
@@ -6,8 +6,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
@@ -28,8 +26,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
 #
@@ -146,6 +142,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
 #
@@ -211,10 +214,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-armv7 b/config-armv7
index cc93074..0f84775 100644
--- a/config-armv7
+++ b/config-armv7
@@ -138,8 +138,10 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_LBDAF=y
 
 CONFIG_COMMON_CLK=y
+CONFIG_REGULATOR=y
 
 # Versatile and highbank
+CONFIG_VEXPRESS_CONFIG=y
 CONFIG_ARM_TIMER_SP804=y
 
 CONFIG_SERIO_AMBAKMI=m
@@ -177,6 +179,7 @@ CONFIG_I2C_VERSATILE=m
 CONFIG_OC_ETM=y
 CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
 CONFIG_SENSORS_VEXPRESS=m
+CONFIG_REGULATOR_VEXPRESS=m
 
 # unknown and needs review
 CONFIG_ARM_AMBA=y
@@ -367,6 +370,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
diff --git a/kernel.spec b/kernel.spec
index 9c6a88f..fa33e72 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1609,6 +1609,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
@@ -2334,6 +2335,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Tue Mar  5 2013 Peter Robinson <pbrobinson at fedoraproject.org>
+- Fix Beagle (omap), update vexpress
+
 * Tue Mar 05 2013 Josh Boyer <jwboyer at redhat.com>
 - Backport 4 fixes for efivarfs (rhbz 917984)
 - Enable CONFIG_IP6_NF_TARGET_MASQUERADE