diff options
| author | Simon Shields <keepcalm444@gmail.com> | 2016-01-14 00:04:31 +1100 |
|---|---|---|
| committer | Simon Shields <keepcalm444@gmail.com> | 2016-01-14 00:38:13 +1100 |
| commit | 0fc62e6cd3d3f5d56b50adebd3153e00ddcf5bac (patch) | |
| tree | d4bcc26660d842666e38dd1a7dd5d3fbd8e24575 | |
| parent | f0190e5f80638444d95a06f3bdab5b850ab467e6 (diff) | |
| download | kernel_samsung_smdk4412-0fc62e6cd3d3f5d56b50adebd3153e00ddcf5bac.zip kernel_samsung_smdk4412-0fc62e6cd3d3f5d56b50adebd3153e00ddcf5bac.tar.gz kernel_samsung_smdk4412-0fc62e6cd3d3f5d56b50adebd3153e00ddcf5bac.tar.bz2 | |
smdk4412: revert old a2dp fixes
Revert "cpufreq: pegasusq: allow keeping at least two cores awake", and
revert "i9300: we have bluetooth deadlocks"
This reverts commits 73bb47e7f14bb1d88b70cc46e532b2ec71d66049 and
008e15d4745c3a359ee01ed76529dee2366bac10.
Change-Id: I6ecc5fc2bec9a68d80c9c3cf8d23d4ec448e1c73
| -rw-r--r-- | arch/arm/configs/cyanogenmod_i9300_defconfig | 1 | ||||
| -rw-r--r-- | drivers/cpufreq/Kconfig | 11 | ||||
| -rw-r--r-- | drivers/cpufreq/cpufreq_pegasusq.c | 4 |
3 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/configs/cyanogenmod_i9300_defconfig b/arch/arm/configs/cyanogenmod_i9300_defconfig index fac25af..bfacadb 100644 --- a/arch/arm/configs/cyanogenmod_i9300_defconfig +++ b/arch/arm/configs/cyanogenmod_i9300_defconfig @@ -714,7 +714,6 @@ CONFIG_CMDLINE_EXTEND=y # CPU Frequency scaling # CONFIG_CPU_FREQ=y -CONFIG_HAS_BLUETOOTH_DEADLOCKS=y CONFIG_CPU_FREQ_TABLE=y CONFIG_CPU_FREQ_STAT=y # CONFIG_CPU_FREQ_STAT_DETAILS is not set diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig index 9d4b5dd..8112af3 100644 --- a/drivers/cpufreq/Kconfig +++ b/drivers/cpufreq/Kconfig @@ -17,17 +17,6 @@ config CPU_FREQ if CPU_FREQ -config HAS_BLUETOOTH_DEADLOCKS - bool "System has bluetooth deadlocks" - depends on BT_BCM4334 - default y - help - It seems that Android Lollipop introduced a bug which causes an - event listener to deadlock when A2DP is used and governor forces - only one core to stay awake. This hack prevents such situation by - always leaving at least two cores online. I wish we could get rid - of this at some point. - config CPU_FREQ_TABLE tristate diff --git a/drivers/cpufreq/cpufreq_pegasusq.c b/drivers/cpufreq/cpufreq_pegasusq.c index aa172a1..c44af54 100644 --- a/drivers/cpufreq/cpufreq_pegasusq.c +++ b/drivers/cpufreq/cpufreq_pegasusq.c @@ -155,11 +155,7 @@ static unsigned int get_nr_run_avg(void) #define MAX_HOTPLUG_RATE (40u) #define DEF_MAX_CPU_LOCK (0) -#ifdef CONFIG_HAS_BLUETOOTH_DEADLOCKS -#define DEF_MIN_CPU_LOCK (2) -#else #define DEF_MIN_CPU_LOCK (0) -#endif #define DEF_CPU_UP_FREQ (500000) #define DEF_CPU_DOWN_FREQ (200000) #define DEF_UP_NR_CPUS (1) |