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
daa56a06
Commit
daa56a06
authored
Sep 04, 2012
by
Olof Johansson
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ux500/asic-id' into next/soc
* ux500/asic-id: ARM: ux500: Correct Ux500 family names usage
parents
c1270363
79964bcd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
arch/arm/mach-ux500/clock.c
arch/arm/mach-ux500/clock.c
+1
-1
arch/arm/mach-ux500/platsmp.c
arch/arm/mach-ux500/platsmp.c
+1
-1
arch/arm/mach-ux500/timer.c
arch/arm/mach-ux500/timer.c
+1
-1
No files found.
arch/arm/mach-ux500/clock.c
View file @
daa56a06
...
...
@@ -149,7 +149,7 @@ static unsigned long clk_mtu_get_rate(struct clk *clk)
unsigned
long
mturate
;
unsigned
long
retclk
;
if
(
cpu_is_u8500_family
())
if
(
cpu_is_u8500_family
()
||
cpu_is_ux540_family
()
)
addr
=
__io_address
(
U8500_PRCMU_BASE
);
else
ux500_unknown_soc
();
...
...
arch/arm/mach-ux500/platsmp.c
View file @
daa56a06
...
...
@@ -118,7 +118,7 @@ static void __init wakeup_secondary(void)
{
void
__iomem
*
backupram
;
if
(
cpu_is_u8500_family
())
if
(
cpu_is_u8500_family
()
||
cpu_is_ux540_family
()
)
backupram
=
__io_address
(
U8500_BACKUPRAM0_BASE
);
else
ux500_unknown_soc
();
...
...
arch/arm/mach-ux500/timer.c
View file @
daa56a06
...
...
@@ -54,7 +54,7 @@ static void __init ux500_timer_init(void)
void
__iomem
*
tmp_base
;
struct
device_node
*
np
;
if
(
cpu_is_u8500_family
())
{
if
(
cpu_is_u8500_family
()
||
cpu_is_ux540_family
()
)
{
mtu_timer_base
=
__io_address
(
U8500_MTU0_BASE
);
prcmu_timer_base
=
__io_address
(
U8500_PRCMU_TIMER_4_BASE
);
}
else
{
...
...
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