diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 08:34:55 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 08:34:55 -0400 |
| commit | f2b7e3c54a304677a1142829fb5913595885379f (patch) | |
| tree | 1eb941524c7325672f947dab525d96228b362e20 /arch/arm/mach-s5pv210/mach-smdkv210.c | |
| parent | 6b8eda04ffdc24b68d379a32358f4f09a425a380 (diff) | |
| parent | 0fdb480e7fb1ecdd4076ddf8b6ab16b0d77406c1 (diff) | |
Merge branch 'next-s5p' into for-next
Conflicts:
arch/arm/mach-s5pv210/mach-aquila.c
arch/arm/mach-s5pv210/mach-goni.c
Diffstat (limited to 'arch/arm/mach-s5pv210/mach-smdkv210.c')
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-smdkv210.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c index 1e4ed147dbc7..fbbc0a3c3738 100644 --- a/arch/arm/mach-s5pv210/mach-smdkv210.c +++ b/arch/arm/mach-s5pv210/mach-smdkv210.c | |||
| @@ -33,16 +33,16 @@ | |||
| 33 | #include <plat/keypad.h> | 33 | #include <plat/keypad.h> |
| 34 | 34 | ||
| 35 | /* Following are default values for UCON, ULCON and UFCON UART registers */ | 35 | /* Following are default values for UCON, ULCON and UFCON UART registers */ |
| 36 | #define S5PV210_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ | 36 | #define SMDKV210_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ |
| 37 | S3C2410_UCON_RXILEVEL | \ | 37 | S3C2410_UCON_RXILEVEL | \ |
| 38 | S3C2410_UCON_TXIRQMODE | \ | 38 | S3C2410_UCON_TXIRQMODE | \ |
| 39 | S3C2410_UCON_RXIRQMODE | \ | 39 | S3C2410_UCON_RXIRQMODE | \ |
| 40 | S3C2410_UCON_RXFIFO_TOI | \ | 40 | S3C2410_UCON_RXFIFO_TOI | \ |
| 41 | S3C2443_UCON_RXERR_IRQEN) | 41 | S3C2443_UCON_RXERR_IRQEN) |
| 42 | 42 | ||
| 43 | #define S5PV210_ULCON_DEFAULT S3C2410_LCON_CS8 | 43 | #define SMDKV210_ULCON_DEFAULT S3C2410_LCON_CS8 |
| 44 | 44 | ||
| 45 | #define S5PV210_UFCON_DEFAULT (S3C2410_UFCON_FIFOMODE | \ | 45 | #define SMDKV210_UFCON_DEFAULT (S3C2410_UFCON_FIFOMODE | \ |
| 46 | S5PV210_UFCON_TXTRIG4 | \ | 46 | S5PV210_UFCON_TXTRIG4 | \ |
| 47 | S5PV210_UFCON_RXTRIG4) | 47 | S5PV210_UFCON_RXTRIG4) |
| 48 | 48 | ||
| @@ -50,30 +50,30 @@ static struct s3c2410_uartcfg smdkv210_uartcfgs[] __initdata = { | |||
| 50 | [0] = { | 50 | [0] = { |
| 51 | .hwport = 0, | 51 | .hwport = 0, |
| 52 | .flags = 0, | 52 | .flags = 0, |
| 53 | .ucon = S5PV210_UCON_DEFAULT, | 53 | .ucon = SMDKV210_UCON_DEFAULT, |
| 54 | .ulcon = S5PV210_ULCON_DEFAULT, | 54 | .ulcon = SMDKV210_ULCON_DEFAULT, |
| 55 | .ufcon = S5PV210_UFCON_DEFAULT, | 55 | .ufcon = SMDKV210_UFCON_DEFAULT, |
| 56 | }, | 56 | }, |
| 57 | [1] = { | 57 | [1] = { |
| 58 | .hwport = 1, | 58 | .hwport = 1, |
| 59 | .flags = 0, | 59 | .flags = 0, |
| 60 | .ucon = S5PV210_UCON_DEFAULT, | 60 | .ucon = SMDKV210_UCON_DEFAULT, |
| 61 | .ulcon = S5PV210_ULCON_DEFAULT, | 61 | .ulcon = SMDKV210_ULCON_DEFAULT, |
| 62 | .ufcon = S5PV210_UFCON_DEFAULT, | 62 | .ufcon = SMDKV210_UFCON_DEFAULT, |
| 63 | }, | 63 | }, |
| 64 | [2] = { | 64 | [2] = { |
| 65 | .hwport = 2, | 65 | .hwport = 2, |
| 66 | .flags = 0, | 66 | .flags = 0, |
| 67 | .ucon = S5PV210_UCON_DEFAULT, | 67 | .ucon = SMDKV210_UCON_DEFAULT, |
| 68 | .ulcon = S5PV210_ULCON_DEFAULT, | 68 | .ulcon = SMDKV210_ULCON_DEFAULT, |
| 69 | .ufcon = S5PV210_UFCON_DEFAULT, | 69 | .ufcon = SMDKV210_UFCON_DEFAULT, |
| 70 | }, | 70 | }, |
| 71 | [3] = { | 71 | [3] = { |
| 72 | .hwport = 3, | 72 | .hwport = 3, |
| 73 | .flags = 0, | 73 | .flags = 0, |
| 74 | .ucon = S5PV210_UCON_DEFAULT, | 74 | .ucon = SMDKV210_UCON_DEFAULT, |
| 75 | .ulcon = S5PV210_ULCON_DEFAULT, | 75 | .ulcon = SMDKV210_ULCON_DEFAULT, |
| 76 | .ufcon = S5PV210_UFCON_DEFAULT, | 76 | .ufcon = SMDKV210_UFCON_DEFAULT, |
| 77 | }, | 77 | }, |
| 78 | }; | 78 | }; |
| 79 | 79 | ||