Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel...

diff --cc drivers/cpufreq/amd-pstate.c
index 024d33d5e3670acfaa469030c1596aa85df2cba6,41d83dd50a710aa2a47f559ed01cf6264007810c..6789eed1bb5ba00a6519a2c4c6d110c8f7abe27f
--- 1/drivers/cpufreq/amd-pstate.c
--- 2/drivers/cpufreq/amd-pstate.c
+++ b/drivers/cpufreq/amd-pstate.c
@@@ -984,20 -995,16 +984,20 @@@ static int amd_pstate_cpu_init(struct c
        policy->cpuinfo.transition_latency = amd_pstate_get_transition_latency(policy->cpu);
        policy->transition_delay_us = amd_pstate_get_transition_delay_us(policy->cpu);
  
 -      policy->min = min_freq;
 -      policy->max = max_freq;
 +      perf = READ_ONCE(cpudata->perf);
  
 -      policy->cpuinfo.min_freq = min_freq;
 -      policy->cpuinfo.max_freq = max_freq;
 +      policy->cpuinfo.min_freq = policy->min = perf_to_freq(perf,
 +                                                            cpudata->nominal_freq,
 +                                                            perf.lowest_perf);
 +      policy->cpuinfo.max_freq = policy->max = perf_to_freq(perf,
 +                                                            cpudata->nominal_freq,
 +                                                            perf.highest_perf);
 +
 +      ret = amd_pstate_cppc_enable(policy);
 +      if (ret)
 +              goto free_cpudata1;
  
-       policy->boost_enabled = READ_ONCE(cpudata->boost_supported);
+       policy->boost_supported = READ_ONCE(cpudata->boost_supported);
  
        /* It will be updated by governor */
        policy->cur = policy->cpuinfo.min_freq;
@@@ -1474,8 -1490,14 +1474,8 @@@ static int amd_pstate_epp_cpu_init(stru
        /* It will be updated by governor */
        policy->cur = policy->cpuinfo.min_freq;
  
 -      policy->driver_data = cpudata;
 -
 -      policy->min = policy->cpuinfo.min_freq;
 -      policy->max = policy->cpuinfo.max_freq;
  
-       policy->boost_enabled = READ_ONCE(cpudata->boost_supported);
+       policy->boost_supported = READ_ONCE(cpudata->boost_supported);
  
        /*
         * Set the policy to provide a valid fallback value in case

diff --cc drivers/cpufreq/cpufreq.c
Simple merge

diff --cc include/linux/cpufreq.h
Simple merge