Commit 480c64ae authored by Viresh Kumar's avatar Viresh Kumar
Browse files

Merge branch 'opp/boost-data' into cpufreq/arm/linux-next

parents d2399501 abb3f971

drivers/opp/core.c

+1 −0
Original line number Diff line number Diff line
@@ -2065,6 +2065,7 @@ int _opp_add_v1(struct opp_table *opp_table, struct device *dev, 
	/* populate the opp table */

	new_opp->rates[0] = data->freq;

	new_opp->level = data->level;

	new_opp->turbo = data->turbo;

	tol = u_volt * opp_table->voltage_tolerance_v1 / 100;

	new_opp->supplies[0].u_volt = u_volt;

	new_opp->supplies[0].u_volt_min = u_volt - tol;

include/linux/pm_opp.h

+2 −0
Original line number Diff line number Diff line
@@ -87,12 +87,14 @@ struct dev_pm_opp_config { 


/**

 * struct dev_pm_opp_data - The data to use to initialize an OPP.

 * @turbo: Flag to indicate whether the OPP is to be marked turbo or not.

 * @level: The performance level for the OPP. Set level to OPP_LEVEL_UNSET if

 * level field isn't used.

 * @freq: The clock rate in Hz for the OPP.

 * @u_volt: The voltage in uV for the OPP.

 */

struct dev_pm_opp_data {

	bool turbo;

	unsigned int level;

	unsigned long freq;

	unsigned long u_volt;