aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/devfreq/exynos
diff options
context:
space:
mode:
authorPaul Bolle <pebolle@tiscali.nl>2014-05-21 16:37:34 -0400
committerMyungJoo Ham <myungjoo.ham@samsung.com>2014-05-24 09:33:51 -0400
commitcb7063f453e543b97285a10343cfc02983d792ad (patch)
treeed97b0552180f45685d38338820213430163da97 /drivers/devfreq/exynos
parent2456963c0b736f4111f9c4517ae12f63d332c312 (diff)
PM / devfreq: remove checks for CONFIG_EXYNOS_ASV
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>
Diffstat (limited to 'drivers/devfreq/exynos')
-rw-r--r--drivers/devfreq/exynos/exynos4_bus.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/drivers/devfreq/exynos/exynos4_bus.c b/drivers/devfreq/exynos/exynos4_bus.c
index bebb0a42b48e..d9b08d3b6830 100644
--- a/drivers/devfreq/exynos/exynos4_bus.c
+++ b/drivers/devfreq/exynos/exynos4_bus.c
@@ -30,11 +30,6 @@
30#include "exynos_ppmu.h" 30#include "exynos_ppmu.h"
31#include "exynos4_bus.h" 31#include "exynos4_bus.h"
32 32
33/* Exynos4 ASV has been in the mailing list, but not upstreamed, yet. */
34#ifdef CONFIG_EXYNOS_ASV
35extern unsigned int exynos_result_of_asv;
36#endif
37
38#define MAX_SAFEVOLT 1200000 /* 1.2V */ 33#define MAX_SAFEVOLT 1200000 /* 1.2V */
39 34
40enum exynos4_busf_type { 35enum exynos4_busf_type {
@@ -723,11 +718,11 @@ static int exynos4210_init_tables(struct busfreq_data *data)
723 data->top_divtable[i] = tmp; 718 data->top_divtable[i] = tmp;
724 } 719 }
725 720
726#ifdef CONFIG_EXYNOS_ASV 721 /*
727 tmp = exynos4_result_of_asv; 722 * TODO: init tmp based on busfreq_data
728#else 723 * (device-tree or platform-data)
724 */
729 tmp = 0; /* Max voltages for the reliability of the unknown */ 725 tmp = 0; /* Max voltages for the reliability of the unknown */
730#endif
731 726
732 pr_debug("ASV Group of Exynos4 is %d\n", tmp); 727 pr_debug("ASV Group of Exynos4 is %d\n", tmp);
733 /* Use merged grouping for voltage */ 728 /* Use merged grouping for voltage */
@@ -808,11 +803,7 @@ static int exynos4x12_init_tables(struct busfreq_data *data)
808 data->dmc_divtable[i] = tmp; 803 data->dmc_divtable[i] = tmp;
809 } 804 }
810 805
811#ifdef CONFIG_EXYNOS_ASV
812 tmp = exynos4_result_of_asv;
813#else
814 tmp = 0; /* Max voltages for the reliability of the unknown */ 806 tmp = 0; /* Max voltages for the reliability of the unknown */
815#endif
816 807
817 if (tmp > 8) 808 if (tmp > 8)
818 tmp = 0; 809 tmp = 0;