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
119754e5
Commit
119754e5
authored
Jan 14, 2014
by
Mike Turquette
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'clk-next-shmobile' into clk-next
parents
baa39cd2
209f4fed
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
4 deletions
+8
-4
drivers/clk/shmobile/clk-mstp.c
drivers/clk/shmobile/clk-mstp.c
+8
-4
No files found.
drivers/clk/shmobile/clk-mstp.c
View file @
119754e5
...
@@ -160,7 +160,7 @@ static void __init cpg_mstp_clocks_init(struct device_node *np)
...
@@ -160,7 +160,7 @@ static void __init cpg_mstp_clocks_init(struct device_node *np)
unsigned
int
i
;
unsigned
int
i
;
group
=
kzalloc
(
sizeof
(
*
group
),
GFP_KERNEL
);
group
=
kzalloc
(
sizeof
(
*
group
),
GFP_KERNEL
);
clks
=
k
z
alloc
(
MSTP_MAX_CLOCKS
*
sizeof
(
*
clks
),
GFP_KERNEL
);
clks
=
k
m
alloc
(
MSTP_MAX_CLOCKS
*
sizeof
(
*
clks
),
GFP_KERNEL
);
if
(
group
==
NULL
||
clks
==
NULL
)
{
if
(
group
==
NULL
||
clks
==
NULL
)
{
kfree
(
group
);
kfree
(
group
);
kfree
(
clks
);
kfree
(
clks
);
...
@@ -181,6 +181,9 @@ static void __init cpg_mstp_clocks_init(struct device_node *np)
...
@@ -181,6 +181,9 @@ static void __init cpg_mstp_clocks_init(struct device_node *np)
return
;
return
;
}
}
for
(
i
=
0
;
i
<
MSTP_MAX_CLOCKS
;
++
i
)
clks
[
i
]
=
ERR_PTR
(
-
ENOENT
);
for
(
i
=
0
;
i
<
MSTP_MAX_CLOCKS
;
++
i
)
{
for
(
i
=
0
;
i
<
MSTP_MAX_CLOCKS
;
++
i
)
{
const
char
*
parent_name
;
const
char
*
parent_name
;
const
char
*
name
;
const
char
*
name
;
...
@@ -205,10 +208,11 @@ static void __init cpg_mstp_clocks_init(struct device_node *np)
...
@@ -205,10 +208,11 @@ static void __init cpg_mstp_clocks_init(struct device_node *np)
continue
;
continue
;
}
}
clks
[
clkidx
]
=
cpg_mstp_clock_register
(
name
,
parent_name
,
i
,
clks
[
clkidx
]
=
cpg_mstp_clock_register
(
name
,
parent_name
,
group
);
clkidx
,
group
);
if
(
!
IS_ERR
(
clks
[
clkidx
]))
{
if
(
!
IS_ERR
(
clks
[
clkidx
]))
{
group
->
data
.
clk_num
=
max
(
group
->
data
.
clk_num
,
clkidx
);
group
->
data
.
clk_num
=
max
(
group
->
data
.
clk_num
,
clkidx
+
1
);
/*
/*
* Register a clkdev to let board code retrieve the
* Register a clkdev to let board code retrieve the
* clock by name and register aliases for non-DT
* clock by name and register aliases for non-DT
...
...
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