Skip to content

Commit 480c64a

Browse files
committed
Merge branch 'opp/boost-data' into cpufreq/arm/linux-next
2 parents d239950 + abb3f97 commit 480c64a

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

drivers/opp/core.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2065,6 +2065,7 @@ int _opp_add_v1(struct opp_table *opp_table, struct device *dev,
20652065
/* populate the opp table */
20662066
new_opp->rates[0] = data->freq;
20672067
new_opp->level = data->level;
2068+
new_opp->turbo = data->turbo;
20682069
tol = u_volt * opp_table->voltage_tolerance_v1 / 100;
20692070
new_opp->supplies[0].u_volt = u_volt;
20702071
new_opp->supplies[0].u_volt_min = u_volt - tol;

include/linux/pm_opp.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,14 @@ struct dev_pm_opp_config {
8787

8888
/**
8989
* struct dev_pm_opp_data - The data to use to initialize an OPP.
90+
* @turbo: Flag to indicate whether the OPP is to be marked turbo or not.
9091
* @level: The performance level for the OPP. Set level to OPP_LEVEL_UNSET if
9192
* level field isn't used.
9293
* @freq: The clock rate in Hz for the OPP.
9394
* @u_volt: The voltage in uV for the OPP.
9495
*/
9596
struct dev_pm_opp_data {
97+
bool turbo;
9698
unsigned int level;
9799
unsigned long freq;
98100
unsigned long u_volt;

0 commit comments

Comments
 (0)