cpufreq: renable, but disable xM 800Mhz opp point (temp)

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

patch.sh

@@ -80,6 +80,9 @@ beagle () {
 
 	#Status: not for upstream
 	${git} "${DIR}/patches/beagle/0004-zeroMAP-Open-your-eyes.patch"
+
+	#cpufreq: only 800Mhz seems to cause hard lock... disable for now..
+	${git} "${DIR}/patches/beagle/0005-TEMP-Beagle-xM-cpufreq-disable-800Mhz-opp.patch"
 }
 
 sprz319_erratum () {
@@ -129,6 +132,11 @@ mainline_fixes () {
 	${git} "${DIR}/patches/mainline-fixes/0002-ARM-omap-add-dtb-targets.patch"
 }
 
+debug () {
+	echo "debug: cpufreq"
+	${git} "${DIR}/patches/debug/0001-beagle_xm-cpufreq-debug.patch"
+}
+
 distro
 sakoman
 beagle
@@ -140,6 +148,7 @@ panda
 omap_fixes
 sgx
 mainline_fixes
+#debug
 
 echo "patch.sh ran successful"
 

patches/beagle/0005-TEMP-Beagle-xM-cpufreq-disable-800Mhz-opp.patch

+From 916bfc3d796af6e27d507adfe69970bcf84ea426 Mon Sep 17 00:00:00 2001
+From: Robert Nelson <robertcnelson@gmail.com>
+Date: Fri, 14 Sep 2012 09:40:45 -0500
+Subject: [PATCH 5/5] TEMP: Beagle xM: cpufreq: disable 800Mhz opp
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ arch/arm/mach-omap2/board-omap3beagle.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index ff13498..619b323 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -841,7 +841,8 @@ static void __init beagle_opp_init(void)
+ 	}
+ 
+ 	/* Custom OPP enabled for all xM versions */
+-	if (cpu_is_omap3630()) {
++	//if (cpu_is_omap3630()) {
++	if (0) {
+ 		struct device *mpu_dev, *iva_dev;
+ 
+ 		mpu_dev = omap_device_get_by_hwmod_name("mpu");
+-- 
+1.7.10.4
+

patches/debug/0001-beagle_xm-cpufreq-debug.patch

@@ -5,40 +5,27 @@ Subject: [PATCH] beagle_xm: cpufreq debug
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
 ---
- arch/arm/plat-omap/clock.c     |    2 ++
- drivers/cpufreq/omap-cpufreq.c |    1 +
- 2 files changed, 3 insertions(+)
+ arch/arm/plat-omap/clock.c |    2 ++
+ 1 file changed, 2 insertions(+)
 
 diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
-index b392bf5..11822fd 100644
+index b392bf5..36f8ba7 100644
 --- a/arch/arm/plat-omap/clock.c
 +++ b/arch/arm/plat-omap/clock.c
 @@ -128,11 +128,13 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
  	if (!arch_clock || !arch_clock->clk_set_rate)
  		return ret;
  
-+	pr_info("clock: clk_set_rate: rate %ld\n", rate);
++	pr_info("cpufreq: clk_set_rate: requesting: %ld\n", rate);
  	spin_lock_irqsave(&clockfw_lock, flags);
  	ret = arch_clock->clk_set_rate(clk, rate);
  	if (ret == 0)
  		propagate_rate(clk);
  	spin_unlock_irqrestore(&clockfw_lock, flags);
-+	pr_info("clock: clk_set_rate: rate %ld Success\n", rate);
++	pr_info("cpufreq: clk_set_rate: setting: %ld Success\n", rate);
  
  	return ret;
  }
-diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c
-index b47034e..b35e351 100644
---- a/drivers/cpufreq/omap-cpufreq.c
-+++ b/drivers/cpufreq/omap-cpufreq.c
-@@ -148,6 +148,7 @@ static int omap_target(struct cpufreq_policy *policy,
- 
- 	ret = clk_set_rate(mpu_clk, freqs.new * 1000);
- 
-+	pr_info("cpufreq: omap_target: cleared: clk_set_rate\n");
- 	/* scaling down?  scale voltage after frequency */
- 	if (mpu_reg && (freqs.new < freqs.old)) {
- 		r = regulator_set_voltage(mpu_reg, volt - tol, volt + tol);
 -- 
 1.7.10.4
 

patches/defconfig

 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.6.0-rc4 Kernel Configuration
+# Linux/arm 3.6.0-rc5 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -556,7 +556,28 @@ CONFIG_AUTO_ZRELADDR=y
 #
 # CPU Frequency scaling
 #
-# CONFIG_CPU_FREQ is not set
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+
+#
+# ARM CPU frequency scaling drivers
+#
+CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
+# CONFIG_ARM_EXYNOS4210_CPUFREQ is not set
+# CONFIG_ARM_EXYNOS4X12_CPUFREQ is not set
+# CONFIG_ARM_EXYNOS5250_CPUFREQ is not set
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y

version.sh

@@ -23,7 +23,7 @@ config="omap2plus_defconfig"
 #Kernel/Build
 KERNEL_REL=3.6
 KERNEL_TAG=${KERNEL_REL}-rc5
-BUILD=d2.1
+BUILD=d2.2
 
 #git branch
 #BRANCH=