Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb7063f4 authored by Paul Bolle's avatar Paul Bolle Committed by MyungJoo Ham
Browse files

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: default avatarPaul Bolle <pebolle@tiscali.nl>
[Merge conflict resolved by MyungJoo]
Signed-off-by: default avatarMyungJoo Ham <myungjoo.ham@samsung.com>
parent 2456963c

drivers/devfreq/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -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"

drivers/devfreq/exynos/exynos4_bus.c

+4 −13
Original line number Diff line number Diff line
@@ -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 {
@@ -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 */
@@ -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;