Skip to content

Commit 62dd256

Browse files
committed
disabled: add HACK so Beagle C4 no longer locks up on reset with CONFIG_CPU_FREQ_GOV_ONDEMAND enabled
Signed-off-by: Robert Nelson <[email protected]>
1 parent db69fdc commit 62dd256

File tree

2 files changed

+43
-0
lines changed

2 files changed

+43
-0
lines changed

patch.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@ omap () {
8383
#cpufreq: only 800Mhz seems to cause hard lock... disable for now..
8484
${git} "${DIR}/patches/omap/beagle/0005-TEMP-Beagle-xM-cpufreq-disable-800Mhz-opp.patch"
8585

86+
#With this hack, ondemand no longer, locks up the Beagle C4 on software reset...
87+
#CONFIG_CPU_FREQ_GOV_ONDEMAND=m
88+
#${git} "${DIR}/patches/omap/beagle/0006-HACK-arm-omap-beagle-c4-fix-hardlock-on-software-res.patch"
89+
8690
echo "dir: omap/panda"
8791
#Status: not for upstream: push device tree version upstream...
8892
${git} "${DIR}/patches/omap/panda/0001-panda-fix-wl12xx-regulator.patch"
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
From 886925515f6168e907255e7dec0c4a6ff4e00f50 Mon Sep 17 00:00:00 2001
2+
From: Robert Nelson <[email protected]>
3+
Date: Wed, 14 Nov 2012 20:22:56 -0600
4+
Subject: [PATCH 6/6] HACK: arm: omap: beagle c4: fix hardlock on software
5+
reset with CONFIG_CPU_FREQ_GOV_ONDEMAND enabled
6+
7+
Signed-off-by: Robert Nelson <[email protected]>
8+
---
9+
arch/arm/mach-omap2/twl-common.c | 12 ++++++------
10+
1 file changed, 6 insertions(+), 6 deletions(-)
11+
12+
diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c
13+
index 1b3f88a..23cf370 100644
14+
--- a/arch/arm/mach-omap2/twl-common.c
15+
+++ b/arch/arm/mach-omap2/twl-common.c
16+
@@ -203,14 +203,14 @@ void __init omap3_pmic_get_config(struct twl4030_platform_data *pmic_data,
17+
u32 pdata_flags, u32 regulators_flags)
18+
{
19+
if (!pmic_data->vdd1) {
20+
- omap3_vdd1.driver_data = &omap3_vdd1_drvdata;
21+
- omap3_vdd1_drvdata.data = voltdm_lookup("mpu_iva");
22+
- pmic_data->vdd1 = &omap3_vdd1;
23+
+// omap3_vdd1.driver_data = &omap3_vdd1_drvdata;
24+
+// omap3_vdd1_drvdata.data = voltdm_lookup("mpu_iva");
25+
+// pmic_data->vdd1 = &omap3_vdd1;
26+
}
27+
if (!pmic_data->vdd2) {
28+
- omap3_vdd2.driver_data = &omap3_vdd2_drvdata;
29+
- omap3_vdd2_drvdata.data = voltdm_lookup("core");
30+
- pmic_data->vdd2 = &omap3_vdd2;
31+
+// omap3_vdd2.driver_data = &omap3_vdd2_drvdata;
32+
+// omap3_vdd2_drvdata.data = voltdm_lookup("core");
33+
+// pmic_data->vdd2 = &omap3_vdd2;
34+
}
35+
36+
/* Common platform data configurations */
37+
--
38+
1.7.10.4
39+

0 commit comments

Comments
 (0)