linux-msm7xxxx: update defconfigs and SRCREV

4 files changed, 11 insertions, 9 deletions

diff --git a/packages/linux/linux-msm7xxxx/htcdiamond/defconfig b/packages/linux/linux-msm7xxxx/htcdiamond/defconfig
index 930a1e15f9..ab6975290f 100644
--- a/packages/linux/linux-msm7xxxx/htcdiamond/defconfig
+++ b/packages/linux/linux-msm7xxxx/htcdiamond/defconfig
@@ -178,6 +178,7 @@ CONFIG_MSM_AMSS_VERSION=6225
 CONFIG_MSM_AMSS_VERSION_6225=y
 # CONFIG_MACH_HALIBUT is not set
 CONFIG_MACH_HTCRAPHAEL=y
+CONFIG_MACH_HTCDIAMOND=y
 # CONFIG_MACH_TROUT is not set
 # CONFIG_TROUT_PWRSINK is not set
 # CONFIG_MSM_LL_DEBUG_UART1 is not set
diff --git a/packages/linux/linux-msm7xxxx/htcraphael/defconfig b/packages/linux/linux-msm7xxxx/htcraphael/defconfig
index 930a1e15f9..ab6975290f 100644
--- a/packages/linux/linux-msm7xxxx/htcraphael/defconfig
+++ b/packages/linux/linux-msm7xxxx/htcraphael/defconfig
@@ -178,6 +178,7 @@ CONFIG_MSM_AMSS_VERSION=6225
 CONFIG_MSM_AMSS_VERSION_6225=y
 # CONFIG_MACH_HALIBUT is not set
 CONFIG_MACH_HTCRAPHAEL=y
+CONFIG_MACH_HTCDIAMOND=y
 # CONFIG_MACH_TROUT is not set
 # CONFIG_TROUT_PWRSINK is not set
 # CONFIG_MSM_LL_DEBUG_UART1 is not set
diff --git a/packages/linux/linux-msm7xxxx/htctitan/defconfig b/packages/linux/linux-msm7xxxx/htctitan/defconfig
index 4113007e89..aade78e75b 100644
--- a/packages/linux/linux-msm7xxxx/htctitan/defconfig
+++ b/packages/linux/linux-msm7xxxx/htctitan/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.25
-# Sat Dec  6 06:38:11 2008
+# Sat Jan  3 15:05:28 2009
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -190,9 +190,9 @@ CONFIG_MSM7X00A_SLEEP_MODE=0
 # CONFIG_MSM7X00A_IDLE_SLEEP_MODE_POWER_COLLAPSE_SUSPEND is not set
 # CONFIG_MSM7X00A_IDLE_SLEEP_MODE_POWER_COLLAPSE is not set
 # CONFIG_MSM7X00A_IDLE_SLEEP_MODE_APPS_SLEEP is not set
-CONFIG_MSM7X00A_IDLE_SLEEP_MODE_RAMP_DOWN_AND_WAIT_FOR_INTERRUPT=y
-# CONFIG_MSM7X00A_IDLE_SLEEP_WAIT_FOR_INTERRUPT is not set
-CONFIG_MSM7X00A_IDLE_SLEEP_MODE=3
+# CONFIG_MSM7X00A_IDLE_SLEEP_MODE_RAMP_DOWN_AND_WAIT_FOR_INTERRUPT is not set
+CONFIG_MSM7X00A_IDLE_SLEEP_WAIT_FOR_INTERRUPT=y
+CONFIG_MSM7X00A_IDLE_SLEEP_MODE=4
 CONFIG_MSM7X00A_IDLE_SLEEP_MIN_TIME=20000000
 CONFIG_MSM7X00A_IDLE_SPIN_TIME=80000
 # CONFIG_MSM_IDLE_STATS is not set
diff --git a/packages/linux/linux-msm7xxxx_git.bb b/packages/linux/linux-msm7xxxx_git.bb
index 3dcf100a39..a2972bbe8d 100644
--- a/packages/linux/linux-msm7xxxx_git.bb
+++ b/packages/linux/linux-msm7xxxx_git.bb
@@ -4,16 +4,16 @@ PV = "2.6.25+${PR}+gitr${SRCREV}"
 PV_htckaiser = "2.6.24+${PR}+gitr${SRCREV}"
 PV_htcpolaris = "2.6.24+${PR}+gitr${SRCREV}"
 
-PR = "r1"
+PR = "r2"
 
 COMPATIBLE_MACHINE = "htckaiser|htcpolaris|htcraphael|htcdiamond|htcvogue|htctitan"
 
 SRCREV_htckaiser = "1082670ccae30e6592311cc9dee93ba978382a25"
 SRCREV_htcpolaris = "1082670ccae30e6592311cc9dee93ba978382a25"
-SRCREV_htcraphael = "6dd4ca4878b7c2d8cacf09632fdc446851d4232b"
-SRCREV_htcdiamond = "6dd4ca4878b7c2d8cacf09632fdc446851d4232b"
-SRCREV_htcvogue = "febeb3476fb6f047d9bd987ceeaa61d2c053fce8"
-SRCREV_htctitan = "febeb3476fb6f047d9bd987ceeaa61d2c053fce8"
+SRCREV_htcraphael = "c07884fc4c99845e2d940009e494f83e22509e3d"
+SRCREV_htcdiamond = "c07884fc4c99845e2d940009e494f83e22509e3d"
+SRCREV_htcvogue = "8cfc6730b38091c908b2df3b906a3a54f27e1bb2"
+SRCREV_htctitan = "8cfc6730b38091c908b2df3b906a3a54f27e1bb2"
 
 SRC_URI = "git://git.linuxtogo.org/home/groups/mobile-linux/kernel.git;branch=htc-msm-2.6.25;protocol=git file://defconfig"
 SRC_URI_htckaiser = "git://git.linuxtogo.org/home/groups/mobile-linux/kernel.git;branch=htc-msm;protocol=git  file://defconfig"