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
60c99c77
Commit
60c99c77
authored
Feb 14, 2018
by
Tony Lindgren
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'omap-for-v4.16/soc' into omap-for-v4.16/fixes
parents
7928b2cb
392ea5dd
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod.c
+3
-3
No files found.
arch/arm/mach-omap2/omap_hwmod.c
View file @
60c99c77
...
@@ -977,6 +977,9 @@ static int _enable_clocks(struct omap_hwmod *oh)
...
@@ -977,6 +977,9 @@ static int _enable_clocks(struct omap_hwmod *oh)
pr_debug
(
"omap_hwmod: %s: enabling clocks
\n
"
,
oh
->
name
);
pr_debug
(
"omap_hwmod: %s: enabling clocks
\n
"
,
oh
->
name
);
if
(
oh
->
flags
&
HWMOD_OPT_CLKS_NEEDED
)
_enable_optional_clocks
(
oh
);
if
(
oh
->
_clk
)
if
(
oh
->
_clk
)
clk_enable
(
oh
->
_clk
);
clk_enable
(
oh
->
_clk
);
...
@@ -985,9 +988,6 @@ static int _enable_clocks(struct omap_hwmod *oh)
...
@@ -985,9 +988,6 @@ static int _enable_clocks(struct omap_hwmod *oh)
clk_enable
(
os
->
_clk
);
clk_enable
(
os
->
_clk
);
}
}
if
(
oh
->
flags
&
HWMOD_OPT_CLKS_NEEDED
)
_enable_optional_clocks
(
oh
);
/* The opt clocks are controlled by the device driver. */
/* The opt clocks are controlled by the device driver. */
return
0
;
return
0
;
...
...
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