From: tanner <tanner@mach.kyb.local>
Date: Sun, 2 May 2010 15:41:40 +0000 (+0200)
Subject: 599->600 fix
X-Git-Tag: kernel-power-settings-0.4~2
X-Git-Url: http://git.maemo.org/git/?p=kernel-power;a=commitdiff_plain;h=1f596e5088aba5bef77ae32660e38d1178bea8e0

599->600 fix
---

diff --git a/kernel-power-2.6.28/debian/changelog b/kernel-power-2.6.28/debian/changelog
index 358d280..548cd0e 100644
--- a/kernel-power-2.6.28/debian/changelog
+++ b/kernel-power-2.6.28/debian/changelog
@@ -1,3 +1,9 @@
+kernel-power (2.6.28-maemo26) fremantle; urgency=low
+
+  * 599Mhz is now interpreted as 600MHz, keep ignoring 600MHz setting by telephone app
+
+ -- Thomas Tanner <maemo@tannerlab.com>  Fri, 16 Apr 2010 23:11:43 +0200
+
 kernel-power (2.6.28-maemo25) fremantle; urgency=low
 
    * control: new bugtracker, fix builddeps, set display name, mention reboot
diff --git a/kernel-power-2.6.28/debian/patches/overclock.diff b/kernel-power-2.6.28/debian/patches/overclock.diff
index 0c594a0..31724fa 100644
--- a/kernel-power-2.6.28/debian/patches/overclock.diff
+++ b/kernel-power-2.6.28/debian/patches/overclock.diff
@@ -138,18 +138,20 @@
   * cpufreq_per_cpu_attr_write() / store_##file_name() - sysfs write access
   */
 -#define store_one(file_name, object)			\
-+#define store_one(file_name, object,ignore)			\
++#define store_one(file_name, object,ignore,replace)			\
  static ssize_t store_##file_name					\
  (struct cpufreq_policy *policy, const char *buf, size_t count)		\
  {									\
-@@ -479,15 +479,15 @@
+@@ -479,15 +479,17 @@
  	ret = sscanf (buf, "%u", &new_policy.object);			\
  	if (ret != 1)							\
  		return -EINVAL;						\
 -									\
 -	ret = __cpufreq_set_policy(policy, &new_policy);		\
-+	if (new_policy.object != ignore && new_policy.object >= 100000)	\
++	if (new_policy.object != ignore && new_policy.object >= 100000) {	\
++	    if (new_policy.object == replace) new_policy.object = ignore;	\
 +	    ret = __cpufreq_set_policy(policy, &new_policy);		\
++	}								\
  	policy->user_policy.object = policy->object;			\
  									\
  	return ret ? ret : count;					\
@@ -157,8 +159,8 @@
  
 -store_one(scaling_min_freq,min);
 -store_one(scaling_max_freq,max);
-+store_one(scaling_min_freq,min,0);
-+store_one(scaling_max_freq,max,600000);
++store_one(scaling_min_freq,min,0,0);
++store_one(scaling_max_freq,max,600000,599000);
  
  /**
   * show_cpuinfo_cur_freq - current CPU frequency as detected by hardware
diff --git a/kernel-power-2.6.28/debian/rx51power_defconfig b/kernel-power-2.6.28/debian/rx51power_defconfig
index 544f0a5..71dc4fa 100644
--- a/kernel-power-2.6.28/debian/rx51power_defconfig
+++ b/kernel-power-2.6.28/debian/rx51power_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.28.10power-omap1
-# Wed Apr 14 22:22:49 2010
+# Sun May  2 13:08:58 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1529,7 +1529,12 @@ CONFIG_DISPLAY_SUPPORT=y
 #
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE is not set
+#CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FONTS is not set
+#CONFIG_FONT_8x8=y
+#CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set