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
4d4a339d
Commit
4d4a339d
authored
Jul 15, 2010
by
Eric Miao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ARM] mmp: move mmp2 specific timer code to mmp2.c
Signed-off-by:
Eric Miao
<
eric.y.miao@gmail.com
>
parent
8022887c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
21 deletions
+21
-21
arch/arm/mach-mmp/mmp2.c
arch/arm/mach-mmp/mmp2.c
+21
-0
arch/arm/mach-mmp/time.c
arch/arm/mach-mmp/time.c
+0
-21
No files found.
arch/arm/mach-mmp/mmp2.c
View file @
4d4a339d
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
#include <asm/hardware/cache-tauros2.h>
#include <asm/hardware/cache-tauros2.h>
#include <asm/mach/time.h>
#include <mach/addr-map.h>
#include <mach/addr-map.h>
#include <mach/regs-apbc.h>
#include <mach/regs-apbc.h>
#include <mach/regs-apmu.h>
#include <mach/regs-apmu.h>
...
@@ -158,6 +159,26 @@ static int __init mmp2_init(void)
...
@@ -158,6 +159,26 @@ static int __init mmp2_init(void)
}
}
postcore_initcall
(
mmp2_init
);
postcore_initcall
(
mmp2_init
);
static
void
__init
mmp2_timer_init
(
void
)
{
unsigned
long
clk_rst
;
__raw_writel
(
APBC_APBCLK
|
APBC_RST
,
APBC_MMP2_TIMERS
);
/*
* enable bus/functional clock, enable 6.5MHz (divider 4),
* release reset
*/
clk_rst
=
APBC_APBCLK
|
APBC_FNCLK
|
APBC_FNCLKSEL
(
1
);
__raw_writel
(
clk_rst
,
APBC_MMP2_TIMERS
);
timer_init
(
IRQ_MMP2_TIMER1
);
}
struct
sys_timer
mmp2_timer
=
{
.
init
=
mmp2_timer_init
,
};
/* on-chip devices */
/* on-chip devices */
MMP2_DEVICE
(
uart1
,
"pxa2xx-uart"
,
0
,
UART1
,
0xd4030000
,
0x30
,
4
,
5
);
MMP2_DEVICE
(
uart1
,
"pxa2xx-uart"
,
0
,
UART1
,
0xd4030000
,
0x30
,
4
,
5
);
MMP2_DEVICE
(
uart2
,
"pxa2xx-uart"
,
1
,
UART2
,
0xd4017000
,
0x30
,
20
,
21
);
MMP2_DEVICE
(
uart2
,
"pxa2xx-uart"
,
1
,
UART2
,
0xd4017000
,
0x30
,
20
,
21
);
...
...
arch/arm/mach-mmp/time.c
View file @
4d4a339d
...
@@ -200,24 +200,3 @@ void __init timer_init(int irq)
...
@@ -200,24 +200,3 @@ void __init timer_init(int irq)
clocksource_register
(
&
cksrc
);
clocksource_register
(
&
cksrc
);
clockevents_register_device
(
&
ckevt
);
clockevents_register_device
(
&
ckevt
);
}
}
static
void
__init
mmp2_timer_init
(
void
)
{
unsigned
long
clk_rst
;
__raw_writel
(
APBC_APBCLK
|
APBC_RST
,
APBC_MMP2_TIMERS
);
/*
* enable bus/functional clock, enable 6.5MHz (divider 4),
* release reset
*/
clk_rst
=
APBC_APBCLK
|
APBC_FNCLK
|
APBC_FNCLKSEL
(
1
);
__raw_writel
(
clk_rst
,
APBC_MMP2_TIMERS
);
timer_init
(
IRQ_MMP2_TIMER1
);
}
struct
sys_timer
mmp2_timer
=
{
.
init
=
mmp2_timer_init
,
};
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