Skip to content

Commit

Permalink
PM / devfreq: remove checks for CONFIG_EXYNOS_ASV
Browse files Browse the repository at this point in the history
Checks for CONFIG_EXYNOS_ASV were added in v3.3. But the related Kconfig
symbol has never been added to the tree. Remove these checks, as they
always evaluate to false.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
[Merge conflict resolved by MyungJoo]
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
  • Loading branch information
pebolle authored and myungjoo committed May 24, 2014
1 parent 2456963 commit cb7063f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 15 deletions.
3 changes: 1 addition & 2 deletions drivers/devfreq/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ config ARM_EXYNOS4_BUS_DEVFREQ
and Exynos4212/4412 memory interface and bus (vdd_mif + vdd_int).
It reads PPMU counters of memory controllers and adjusts
the operating frequencies and voltages with OPP support.
To operate with optimal voltages, ASV support is required
(CONFIG_EXYNOS_ASV).
This does not yet operate with optimal voltages.

config ARM_EXYNOS5_BUS_DEVFREQ
bool "ARM Exynos5250 Bus DEVFREQ Driver"
Expand Down
17 changes: 4 additions & 13 deletions drivers/devfreq/exynos/exynos4_bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@
#include "exynos_ppmu.h"
#include "exynos4_bus.h"

/* Exynos4 ASV has been in the mailing list, but not upstreamed, yet. */
#ifdef CONFIG_EXYNOS_ASV
extern unsigned int exynos_result_of_asv;
#endif

#define MAX_SAFEVOLT 1200000 /* 1.2V */

enum exynos4_busf_type {
Expand Down Expand Up @@ -723,11 +718,11 @@ static int exynos4210_init_tables(struct busfreq_data *data)
data->top_divtable[i] = tmp;
}

#ifdef CONFIG_EXYNOS_ASV
tmp = exynos4_result_of_asv;
#else
/*
* TODO: init tmp based on busfreq_data
* (device-tree or platform-data)
*/
tmp = 0; /* Max voltages for the reliability of the unknown */
#endif

pr_debug("ASV Group of Exynos4 is %d\n", tmp);
/* Use merged grouping for voltage */
Expand Down Expand Up @@ -808,11 +803,7 @@ static int exynos4x12_init_tables(struct busfreq_data *data)
data->dmc_divtable[i] = tmp;
}

#ifdef CONFIG_EXYNOS_ASV
tmp = exynos4_result_of_asv;
#else
tmp = 0; /* Max voltages for the reliability of the unknown */
#endif

if (tmp > 8)
tmp = 0;
Expand Down

0 comments on commit cb7063f

Please sign in to comment.