Эх сурвалжийг харах

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>
Paul Bolle 11 жил өмнө
parent
commit
cb7063f453

+ 1 - 2
drivers/devfreq/Kconfig

@@ -76,8 +76,7 @@ config ARM_EXYNOS4_BUS_DEVFREQ
 	  and Exynos4212/4412 memory interface and bus (vdd_mif + vdd_int).
 	  and Exynos4212/4412 memory interface and bus (vdd_mif + vdd_int).
 	  It reads PPMU counters of memory controllers and adjusts
 	  It reads PPMU counters of memory controllers and adjusts
 	  the operating frequencies and voltages with OPP support.
 	  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
 config ARM_EXYNOS5_BUS_DEVFREQ
 	bool "ARM Exynos5250 Bus DEVFREQ Driver"
 	bool "ARM Exynos5250 Bus DEVFREQ Driver"

+ 4 - 13
drivers/devfreq/exynos/exynos4_bus.c

@@ -30,11 +30,6 @@
 #include "exynos_ppmu.h"
 #include "exynos_ppmu.h"
 #include "exynos4_bus.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 */
 #define MAX_SAFEVOLT	1200000 /* 1.2V */
 
 
 enum exynos4_busf_type {
 enum exynos4_busf_type {
@@ -723,11 +718,11 @@ static int exynos4210_init_tables(struct busfreq_data *data)
 		data->top_divtable[i] = tmp;
 		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 */
 	tmp = 0; /* Max voltages for the reliability of the unknown */
-#endif
 
 
 	pr_debug("ASV Group of Exynos4 is %d\n", tmp);
 	pr_debug("ASV Group of Exynos4 is %d\n", tmp);
 	/* Use merged grouping for voltage */
 	/* Use merged grouping for voltage */
@@ -808,11 +803,7 @@ static int exynos4x12_init_tables(struct busfreq_data *data)
 		data->dmc_divtable[i] = tmp;
 		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 */
 	tmp = 0; /* Max voltages for the reliability of the unknown */
-#endif
 
 
 	if (tmp > 8)
 	if (tmp > 8)
 		tmp = 0;
 		tmp = 0;