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
359c533f
Commit
359c533f
authored
Sep 07, 2018
by
Tony Lindgren
Browse files
Options
Browse Files
Download
Plain Diff
Merge commit '
1dbcb97c
' into omap-for-v4.20/soc
parents
5b394b2d
1dbcb97c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
38 additions
and
1 deletion
+38
-1
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod.c
+38
-1
No files found.
arch/arm/mach-omap2/omap_hwmod.c
View file @
359c533f
...
@@ -2160,6 +2160,37 @@ static int of_dev_hwmod_lookup(struct device_node *np,
...
@@ -2160,6 +2160,37 @@ static int of_dev_hwmod_lookup(struct device_node *np,
return
-
ENODEV
;
return
-
ENODEV
;
}
}
/**
* omap_hwmod_fix_mpu_rt_idx - fix up mpu_rt_idx register offsets
*
* @oh: struct omap_hwmod *
* @np: struct device_node *
*
* Fix up module register offsets for modules with mpu_rt_idx.
* Only needed for cpsw with interconnect target module defined
* in device tree while still using legacy hwmod platform data
* for rev, sysc and syss registers.
*
* Can be removed when all cpsw hwmod platform data has been
* dropped.
*/
static
void
omap_hwmod_fix_mpu_rt_idx
(
struct
omap_hwmod
*
oh
,
struct
device_node
*
np
,
struct
resource
*
res
)
{
struct
device_node
*
child
=
NULL
;
int
error
;
child
=
of_get_next_child
(
np
,
child
);
if
(
!
child
)
return
;
error
=
of_address_to_resource
(
child
,
oh
->
mpu_rt_idx
,
res
);
if
(
error
)
pr_err
(
"%s: error mapping mpu_rt_idx: %i
\n
"
,
__func__
,
error
);
}
/**
/**
* omap_hwmod_parse_module_range - map module IO range from device tree
* omap_hwmod_parse_module_range - map module IO range from device tree
* @oh: struct omap_hwmod *
* @oh: struct omap_hwmod *
...
@@ -2220,7 +2251,13 @@ int omap_hwmod_parse_module_range(struct omap_hwmod *oh,
...
@@ -2220,7 +2251,13 @@ int omap_hwmod_parse_module_range(struct omap_hwmod *oh,
size
=
be32_to_cpup
(
ranges
);
size
=
be32_to_cpup
(
ranges
);
pr_debug
(
"omap_hwmod: %s %s at 0x%llx size 0x%llx
\n
"
,
pr_debug
(
"omap_hwmod: %s %s at 0x%llx size 0x%llx
\n
"
,
oh
->
name
,
np
->
name
,
base
,
size
);
oh
?
oh
->
name
:
""
,
np
->
name
,
base
,
size
);
if
(
oh
&&
oh
->
mpu_rt_idx
)
{
omap_hwmod_fix_mpu_rt_idx
(
oh
,
np
,
res
);
return
0
;
}
res
->
start
=
base
;
res
->
start
=
base
;
res
->
end
=
base
+
size
-
1
;
res
->
end
=
base
+
size
-
1
;
...
...
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