git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
arm
/
mach-s3c2410
/
mach-rx3715.c
diff --git
a/arch/arm/mach-s3c2410/mach-rx3715.c
b/arch/arm/mach-s3c2410/mach-rx3715.c
index
c577c5f
..
cd8d4ff
100644
(file)
--- a/
arch/arm/mach-s3c2410/mach-rx3715.c
+++ b/
arch/arm/mach-s3c2410/mach-rx3715.c
@@
-12,6
+12,8
@@
* Modifications:
* 16-Sep-2004 BJD Copied from mach-h1940.c
* 25-Oct-2004 BJD Updates for 2.6.10-rc1
* Modifications:
* 16-Sep-2004 BJD Copied from mach-h1940.c
* 25-Oct-2004 BJD Updates for 2.6.10-rc1
+ * 10-Jan-2005 BJD Removed include of s3c2410.h s3c2440.h
+ * 14-Jan-2005 BJD Added new clock init
*/
#include <linux/kernel.h>
*/
#include <linux/kernel.h>
@@
-38,8
+40,6
@@
#include <asm/arch/regs-serial.h>
#include <asm/arch/regs-gpio.h>
#include <asm/arch/regs-serial.h>
#include <asm/arch/regs-gpio.h>
-#include "s3c2410.h"
-#include "s3c2440.h"
#include "clock.h"
#include "devs.h"
#include "cpu.h"
#include "clock.h"
#include "devs.h"
#include "cpu.h"
@@
-92,16
+92,15
@@
static struct s3c24xx_board rx3715_board __initdata = {
void __init rx3715_map_io(void)
{
void __init rx3715_map_io(void)
{
- s3c24xx_xtal = 16934000;
-
s3c24xx_init_io(rx3715_iodesc, ARRAY_SIZE(rx3715_iodesc));
s3c24xx_init_io(rx3715_iodesc, ARRAY_SIZE(rx3715_iodesc));
- s3c2440_init_uarts(rx3715_uartcfgs, ARRAY_SIZE(rx3715_uartcfgs));
+ s3c24xx_init_clocks(16934000);
+ s3c24xx_init_uarts(rx3715_uartcfgs, ARRAY_SIZE(rx3715_uartcfgs));
s3c24xx_set_board(&rx3715_board);
}
void __init rx3715_init_irq(void)
{
s3c24xx_set_board(&rx3715_board);
}
void __init rx3715_init_irq(void)
{
- s3c24
10
_init_irq();
+ s3c24
xx
_init_irq();
}
#ifdef CONFIG_PM
}
#ifdef CONFIG_PM
@@
-120,5
+119,5
@@
MACHINE_START(RX3715, "IPAQ-RX3715")
MAPIO(rx3715_map_io)
INITIRQ(rx3715_init_irq)
INIT_MACHINE(rx3715_init_machine)
MAPIO(rx3715_map_io)
INITIRQ(rx3715_init_irq)
INIT_MACHINE(rx3715_init_machine)
-
.timer = &s3c2410
_timer,
+
.timer = &s3c24xx
_timer,
MACHINE_END
MACHINE_END