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-smdk2410.c
diff --git
a/arch/arm/mach-s3c2410/mach-smdk2410.c
b/arch/arm/mach-s3c2410/mach-smdk2410.c
index
9f42865
..
cd272f7
100644
(file)
--- a/
arch/arm/mach-s3c2410/mach-smdk2410.c
+++ b/
arch/arm/mach-s3c2410/mach-smdk2410.c
@@
-46,7
+46,6
@@
#include <asm/arch/regs-serial.h>
#include <asm/arch/regs-serial.h>
-#include "s3c2410.h"
#include "devs.h"
#include "cpu.h"
#include "devs.h"
#include "cpu.h"
@@
-58,14
+57,10
@@
static struct map_desc smdk2410_iodesc[] __initdata = {
#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE
#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE
-/* base baud rate for all our UARTs */
-static unsigned long smdk2410_serial_clock = 24*1000*1000;
-
static struct s3c2410_uartcfg smdk2410_uartcfgs[] = {
[0] = {
.hwport = 0,
.flags = 0,
static struct s3c2410_uartcfg smdk2410_uartcfgs[] = {
[0] = {
.hwport = 0,
.flags = 0,
- .clock = &smdk2410_serial_clock,
.ucon = UCON,
.ulcon = ULCON,
.ufcon = UFCON,
.ucon = UCON,
.ulcon = ULCON,
.ufcon = UFCON,
@@
-73,7
+68,6
@@
static struct s3c2410_uartcfg smdk2410_uartcfgs[] = {
[1] = {
.hwport = 1,
.flags = 0,
[1] = {
.hwport = 1,
.flags = 0,
- .clock = &smdk2410_serial_clock,
.ucon = UCON,
.ulcon = ULCON,
.ufcon = UFCON,
.ucon = UCON,
.ulcon = ULCON,
.ufcon = UFCON,
@@
-81,7
+75,6
@@
static struct s3c2410_uartcfg smdk2410_uartcfgs[] = {
[2] = {
.hwport = 2,
.flags = 0,
[2] = {
.hwport = 2,
.flags = 0,
- .clock = &smdk2410_serial_clock,
.ucon = UCON,
.ulcon = ULCON,
.ufcon = UFCON,
.ucon = UCON,
.ulcon = ULCON,
.ufcon = UFCON,
@@
-96,7
+89,7
@@
static struct platform_device *smdk2410_devices[] __initdata = {
&s3c_device_iis,
};
&s3c_device_iis,
};
-static struct s3c24
10
_board smdk2410_board __initdata = {
+static struct s3c24
xx
_board smdk2410_board __initdata = {
.devices = smdk2410_devices,
.devices_count = ARRAY_SIZE(smdk2410_devices)
};
.devices = smdk2410_devices,
.devices_count = ARRAY_SIZE(smdk2410_devices)
};
@@
-104,18
+97,14
@@
static struct s3c2410_board smdk2410_board __initdata = {
void __init smdk2410_map_io(void)
{
s3c24xx_init_io(smdk2410_iodesc, ARRAY_SIZE(smdk2410_iodesc));
void __init smdk2410_map_io(void)
{
s3c24xx_init_io(smdk2410_iodesc, ARRAY_SIZE(smdk2410_iodesc));
- s3c2410_init_uarts(smdk2410_uartcfgs, ARRAY_SIZE(smdk2410_uartcfgs));
- s3c2410_set_board(&smdk2410_board);
+ s3c24xx_init_clocks(0);
+ s3c24xx_init_uarts(smdk2410_uartcfgs, ARRAY_SIZE(smdk2410_uartcfgs));
+ s3c24xx_set_board(&smdk2410_board);
}
void __init smdk2410_init_irq(void)
{
}
void __init smdk2410_init_irq(void)
{
- s3c2410_init_irq();
-}
-
-void __init smdk2410_init_time(void)
-{
- s3c2410_init_time();
+ s3c24xx_init_irq();
}
MACHINE_START(SMDK2410, "SMDK2410") /* @TODO: request a new identifier and switch
}
MACHINE_START(SMDK2410, "SMDK2410") /* @TODO: request a new identifier and switch
@@
-125,7
+114,7
@@
MACHINE_START(SMDK2410, "SMDK2410") /* @TODO: request a new identifier and switc
BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
MAPIO(smdk2410_map_io)
INITIRQ(smdk2410_init_irq)
BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
MAPIO(smdk2410_map_io)
INITIRQ(smdk2410_init_irq)
- INITTIME(smdk2410_init_time)
+ .timer = &s3c24xx_timer,
MACHINE_END
MACHINE_END