mrst:pmu: Don't enable s0i3 unless fw is >= 0x48
Additionally, add the debug mrst_pmu_s0i3_enable back in to allow
s0i3 to be forced on regardless of fw version.
Signed-off-by: Kristen Carlson Accardi <kris...@linux.intel.com>
Index: linux-2.6.37/arch/x86/platform/mrst/pmu.c
===================================================================
--- linux-2.6.37.orig/arch/x86/platform/mrst/pmu.c 2011-06-13
14:45:28.000000000 -0700
+++ linux-2.6.37/arch/x86/platform/mrst/pmu.c 2011-06-17 13:16:33.500390988
-0700
@@ -662,6 +662,9 @@
/* /sys/kernel/debug/mrst_pmu */
(void) debugfs_create_file("mrst_pmu", S_IFREG | S_IRUGO,
NULL, NULL, &devices_state_operations);
+ (void) debugfs_create_bool("mrst_pmu_s0i3_enable",
+ S_IFREG | S_IWUSR | S_IRUGO, NULL,
+ (u32 *) &mrst_pmu_s0i3_enable);
(void) debugfs_create_u32("mrst_pmu_wait_ready_calls", S_IFREG |
S_IWUSR | S_IRUGO, NULL, (u32 *) &pmu_wait_ready_calls);
(void) debugfs_create_u32("mrst_pmu_wait_ready_udelays", S_IFREG |
S_IWUSR | S_IRUGO, NULL, (u32 *) &pmu_wait_ready_udelays);
(void) debugfs_create_u32("mrst_pmu_wait_ready_udelays_max", S_IFREG |
S_IWUSR | S_IRUGO, NULL, (u32 *) &pmu_wait_ready_udelays_max);
@@ -764,7 +767,7 @@
printk(KERN_INFO "mrst_pmu: firmware v%x\n", fw_version);
- if ((scu_major >= 0xC0) && (scu_minor >= 0x46)) {
+ if ((scu_major >= 0xC0) && (scu_minor >= 0x48)) {
printk(KERN_INFO "mrst_pmu: enabling S0i3\n");
mrst_pmu_s0i3_enable = true;
} else {
_______________________________________________
MeeGo-kernel mailing list
MeeGo-kernel@lists.meego.com
http://lists.meego.com/listinfo/meego-kernel
