Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
1179c2ae
Commit
1179c2ae
authored
Mar 05, 2018
by
Rafael J. Wysocki
Browse files
Options
Browse Files
Download
Plain Diff
Merge cpufreq fixes from v4.16-rc4.
parents
0f555518
5c8b2623
0373ca74
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
8 deletions
+22
-8
drivers/cpufreq/Kconfig.arm
drivers/cpufreq/Kconfig.arm
+3
-3
drivers/cpufreq/s3c24xx-cpufreq.c
drivers/cpufreq/s3c24xx-cpufreq.c
+7
-1
drivers/cpufreq/scpi-cpufreq.c
drivers/cpufreq/scpi-cpufreq.c
+12
-4
No files found.
drivers/cpufreq/Kconfig.arm
View file @
1179c2ae
...
@@ -44,10 +44,10 @@ config ARM_DT_BL_CPUFREQ
...
@@ -44,10 +44,10 @@ config ARM_DT_BL_CPUFREQ
config ARM_SCPI_CPUFREQ
config ARM_SCPI_CPUFREQ
tristate "SCPI based CPUfreq driver"
tristate "SCPI based CPUfreq driver"
depends on ARM_
BIG_LITTLE_CPUFREQ && ARM_
SCPI_PROTOCOL && COMMON_CLK_SCPI
depends on ARM_SCPI_PROTOCOL && COMMON_CLK_SCPI
help
help
This adds the CPUfreq driver support for ARM
big.LITTLE platforms
This adds the CPUfreq driver support for ARM
platforms using SCPI
using SCPI
protocol for CPU power management.
protocol for CPU power management.
This driver uses SCPI Message Protocol driver to interact with the
This driver uses SCPI Message Protocol driver to interact with the
firmware providing the CPU DVFS functionality.
firmware providing the CPU DVFS functionality.
...
...
drivers/cpufreq/s3c24xx-cpufreq.c
View file @
1179c2ae
...
@@ -351,7 +351,13 @@ struct clk *s3c_cpufreq_clk_get(struct device *dev, const char *name)
...
@@ -351,7 +351,13 @@ struct clk *s3c_cpufreq_clk_get(struct device *dev, const char *name)
static
int
s3c_cpufreq_init
(
struct
cpufreq_policy
*
policy
)
static
int
s3c_cpufreq_init
(
struct
cpufreq_policy
*
policy
)
{
{
policy
->
clk
=
clk_arm
;
policy
->
clk
=
clk_arm
;
return
cpufreq_generic_init
(
policy
,
ftab
,
cpu_cur
.
info
->
latency
);
policy
->
cpuinfo
.
transition_latency
=
cpu_cur
.
info
->
latency
;
if
(
ftab
)
return
cpufreq_table_validate_and_show
(
policy
,
ftab
);
return
0
;
}
}
static
int
__init
s3c_cpufreq_initclks
(
void
)
static
int
__init
s3c_cpufreq_initclks
(
void
)
...
...
drivers/cpufreq/scpi-cpufreq.c
View file @
1179c2ae
...
@@ -51,15 +51,23 @@ static unsigned int scpi_cpufreq_get_rate(unsigned int cpu)
...
@@ -51,15 +51,23 @@ static unsigned int scpi_cpufreq_get_rate(unsigned int cpu)
static
int
static
int
scpi_cpufreq_set_target
(
struct
cpufreq_policy
*
policy
,
unsigned
int
index
)
scpi_cpufreq_set_target
(
struct
cpufreq_policy
*
policy
,
unsigned
int
index
)
{
{
unsigned
long
freq
=
policy
->
freq_table
[
index
].
frequency
;
struct
scpi_data
*
priv
=
policy
->
driver_data
;
struct
scpi_data
*
priv
=
policy
->
driver_data
;
u64
rate
=
policy
->
freq_table
[
index
].
frequency
*
1000
;
u64
rate
=
freq
*
1000
;
int
ret
;
int
ret
;
ret
=
clk_set_rate
(
priv
->
clk
,
rate
);
ret
=
clk_set_rate
(
priv
->
clk
,
rate
);
if
(
!
ret
&&
(
clk_get_rate
(
priv
->
clk
)
!=
rate
))
ret
=
-
EIO
;
if
(
ret
)
return
ret
;
return
ret
;
if
(
clk_get_rate
(
priv
->
clk
)
!=
rate
)
return
-
EIO
;
arch_set_freq_scale
(
policy
->
related_cpus
,
freq
,
policy
->
cpuinfo
.
max_freq
);
return
0
;
}
}
static
int
static
int
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment