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
Kirill Smelkov
linux
Commits
124dcf79
Commit
124dcf79
authored
Nov 28, 2017
by
Tony Lindgren
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'omap-for-v4.14/fixes' into omap-for-v4.15/fixes-v2
parents
2db57789
6301d584
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletion
+7
-1
arch/arm/mach-omap2/cm_common.c
arch/arm/mach-omap2/cm_common.c
+5
-1
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+1
-0
arch/arm/mach-omap2/prcm-common.h
arch/arm/mach-omap2/prcm-common.h
+1
-0
No files found.
arch/arm/mach-omap2/cm_common.c
View file @
124dcf79
...
...
@@ -68,14 +68,17 @@ void __init omap2_set_globals_cm(void __iomem *cm, void __iomem *cm2)
int
cm_split_idlest_reg
(
struct
clk_omap_reg
*
idlest_reg
,
s16
*
prcm_inst
,
u8
*
idlest_reg_id
)
{
int
ret
;
if
(
!
cm_ll_data
->
split_idlest_reg
)
{
WARN_ONCE
(
1
,
"cm: %s: no low-level function defined
\n
"
,
__func__
);
return
-
EINVAL
;
}
ret
urn
cm_ll_data
->
split_idlest_reg
(
idlest_reg
,
prcm_inst
,
ret
=
cm_ll_data
->
split_idlest_reg
(
idlest_reg
,
prcm_inst
,
idlest_reg_id
);
*
prcm_inst
-=
cm_base
.
offset
;
return
ret
;
}
/**
...
...
@@ -337,6 +340,7 @@ int __init omap2_cm_base_init(void)
if
(
mem
)
{
mem
->
pa
=
res
.
start
+
data
->
offset
;
mem
->
va
=
data
->
mem
+
data
->
offset
;
mem
->
offset
=
data
->
offset
;
}
data
->
np
=
np
;
...
...
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
View file @
124dcf79
...
...
@@ -1646,6 +1646,7 @@ static struct omap_hwmod omap3xxx_mmc3_hwmod = {
.
main_clk
=
"mmchs3_fck"
,
.
prcm
=
{
.
omap2
=
{
.
module_offs
=
CORE_MOD
,
.
prcm_reg_id
=
1
,
.
module_bit
=
OMAP3430_EN_MMC3_SHIFT
,
.
idlest_reg_id
=
1
,
...
...
arch/arm/mach-omap2/prcm-common.h
View file @
124dcf79
...
...
@@ -528,6 +528,7 @@ struct omap_prcm_irq_setup {
struct
omap_domain_base
{
u32
pa
;
void
__iomem
*
va
;
s16
offset
;
};
/**
...
...
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