Skip to content

Commit

Permalink
disabled: add HACK so Beagle C4 no longer locks up on reset with CONF…
Browse files Browse the repository at this point in the history
…IG_CPU_FREQ_GOV_ONDEMAND enabled

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  • Loading branch information
RobertCNelson committed Nov 15, 2012
1 parent fbb2568 commit 1750613
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 0 deletions.
8 changes: 8 additions & 0 deletions patch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,13 @@ omap3isp () {
${git} "${DIR}/patches/omap3isp/0004-Revert-media-omap3isp-Introduce-isp_video_check_exte.patch"
}

omap () {
echo "dir: omap/beagle"
#With this hack, ondemand no longer, locks up the Beagle C4 on software reset...
#CONFIG_CPU_FREQ_GOV_ONDEMAND=m
${git} "${DIR}/patches/omap/beagle/0001-HACK-arm-omap-beagle-c4-fix-hardlock-on-software-res.patch"
}

distro
sakoman
beagle
Expand All @@ -167,6 +174,7 @@ sgx
mainline_fixes
#debug
omap3isp
#omap

echo "patch.sh ran successful"

Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
From 13410138a8d9c5cac15f5ffcb6524ef5b885ef02 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Wed, 14 Nov 2012 20:22:56 -0600
Subject: [PATCH] HACK: arm: omap: beagle c4: fix hardlock on software reset
with CONFIG_CPU_FREQ_GOV_ONDEMAND enabled

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
arch/arm/mach-omap2/twl-common.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c
index 50ab9ea..bca1232 100644
--- a/arch/arm/mach-omap2/twl-common.c
+++ b/arch/arm/mach-omap2/twl-common.c
@@ -217,14 +217,14 @@ void __init omap3_pmic_get_config(struct twl4030_platform_data *pmic_data,
u32 pdata_flags, u32 regulators_flags)
{
if (!pmic_data->vdd1) {
- omap3_vdd1.driver_data = &omap3_vdd1_drvdata;
- omap3_vdd1_drvdata.data = voltdm_lookup("mpu_iva");
- pmic_data->vdd1 = &omap3_vdd1;
+// omap3_vdd1.driver_data = &omap3_vdd1_drvdata;
+// omap3_vdd1_drvdata.data = voltdm_lookup("mpu_iva");
+// pmic_data->vdd1 = &omap3_vdd1;
}
if (!pmic_data->vdd2) {
- omap3_vdd2.driver_data = &omap3_vdd2_drvdata;
- omap3_vdd2_drvdata.data = voltdm_lookup("core");
- pmic_data->vdd2 = &omap3_vdd2;
+// omap3_vdd2.driver_data = &omap3_vdd2_drvdata;
+// omap3_vdd2_drvdata.data = voltdm_lookup("core");
+// pmic_data->vdd2 = &omap3_vdd2;
}

/* Common platform data configurations */
--
1.7.10.4

0 comments on commit 1750613

Please sign in to comment.