Commit 6cbab787 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

Merge back cpufreq material for v5.14.

parents 771fac5e bcc936c5
...@@ -365,6 +365,9 @@ argument is passed to the kernel in the command line. ...@@ -365,6 +365,9 @@ argument is passed to the kernel in the command line.
inclusive) including both turbo and non-turbo P-states (see inclusive) including both turbo and non-turbo P-states (see
`Turbo P-states Support`_). `Turbo P-states Support`_).
This attribute is present only if the value exposed by it is the same
for all of the CPUs in the system.
The value of this attribute is not affected by the ``no_turbo`` The value of this attribute is not affected by the ``no_turbo``
setting described `below <no_turbo_attr_>`_. setting described `below <no_turbo_attr_>`_.
...@@ -374,6 +377,9 @@ argument is passed to the kernel in the command line. ...@@ -374,6 +377,9 @@ argument is passed to the kernel in the command line.
Ratio of the `turbo range <turbo_>`_ size to the size of the entire Ratio of the `turbo range <turbo_>`_ size to the size of the entire
range of supported P-states, in percent. range of supported P-states, in percent.
This attribute is present only if the value exposed by it is the same
for all of the CPUs in the system.
This attribute is read-only. This attribute is read-only.
.. _no_turbo_attr: .. _no_turbo_attr:
......
...@@ -211,7 +211,7 @@ void cpufreq_stats_free_table(struct cpufreq_policy *policy) ...@@ -211,7 +211,7 @@ void cpufreq_stats_free_table(struct cpufreq_policy *policy)
void cpufreq_stats_create_table(struct cpufreq_policy *policy) void cpufreq_stats_create_table(struct cpufreq_policy *policy)
{ {
unsigned int i = 0, count = 0, ret = -ENOMEM; unsigned int i = 0, count;
struct cpufreq_stats *stats; struct cpufreq_stats *stats;
unsigned int alloc_size; unsigned int alloc_size;
struct cpufreq_frequency_table *pos; struct cpufreq_frequency_table *pos;
...@@ -253,8 +253,7 @@ void cpufreq_stats_create_table(struct cpufreq_policy *policy) ...@@ -253,8 +253,7 @@ void cpufreq_stats_create_table(struct cpufreq_policy *policy)
stats->last_index = freq_table_get_index(stats, policy->cur); stats->last_index = freq_table_get_index(stats, policy->cur);
policy->stats = stats; policy->stats = stats;
ret = sysfs_create_group(&policy->kobj, &stats_attr_group); if (!sysfs_create_group(&policy->kobj, &stats_attr_group))
if (!ret)
return; return;
/* We failed, release resources */ /* We failed, release resources */
......
This diff is collapsed.
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#include <linux/cpufreq.h> #include <linux/cpufreq.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/sched.h> /* set_cpus_allowed() */
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
......
...@@ -42,6 +42,7 @@ static unsigned int sc520_freq_get_cpu_frequency(unsigned int cpu) ...@@ -42,6 +42,7 @@ static unsigned int sc520_freq_get_cpu_frequency(unsigned int cpu)
default: default:
pr_err("error: cpuctl register has unexpected value %02x\n", pr_err("error: cpuctl register has unexpected value %02x\n",
clockspeed_reg); clockspeed_reg);
fallthrough;
case 0x01: case 0x01:
return 100000; return 100000;
case 0x02: case 0x02:
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include <linux/cpumask.h> #include <linux/cpumask.h>
#include <linux/cpu.h> #include <linux/cpu.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/sched.h> /* set_cpus_allowed() */
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/percpu.h> #include <linux/percpu.h>
#include <linux/sh_clk.h> #include <linux/sh_clk.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment