From 91e51701b30a09790b1420a3a5298221e6eb4384 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 31 Dec 2011 16:25:21 +0100 Subject: Import patches from Jiri Pinkava --- ...p-UARTs-configuration-replace-numeric-con.patch | 84 ++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 linux/3.1.6/0003-n30-Clean-up-UARTs-configuration-replace-numeric-con.patch (limited to 'linux/3.1.6/0003-n30-Clean-up-UARTs-configuration-replace-numeric-con.patch') diff --git a/linux/3.1.6/0003-n30-Clean-up-UARTs-configuration-replace-numeric-con.patch b/linux/3.1.6/0003-n30-Clean-up-UARTs-configuration-replace-numeric-con.patch new file mode 100644 index 0000000..ef66723 --- /dev/null +++ b/linux/3.1.6/0003-n30-Clean-up-UARTs-configuration-replace-numeric-con.patch @@ -0,0 +1,84 @@ +From 01eb4ac8cc0ca178786d01bd696dc2092716e466 Mon Sep 17 00:00:00 2001 +From: Jiri Pinkava +Date: Mon, 24 May 2010 10:29:46 +0200 +Subject: [PATCH 03/14] n30: Clean up UARTs configuration (replace numeric constants) + +Signed-off-by: Jiri Pinkava +--- + arch/arm/mach-s3c2410/mach-n30.c | 28 +++++++++++++++------- + arch/arm/plat-samsung/include/plat/regs-serial.h | 3 ++ + 2 files changed, 22 insertions(+), 9 deletions(-) + +diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c +index abbb9b5..895e1e9a 100644 +--- a/arch/arm/mach-s3c2410/mach-n30.c ++++ b/arch/arm/mach-s3c2410/mach-n30.c +@@ -55,32 +55,42 @@ static struct map_desc n30_iodesc[] __initdata = { + /* nothing here yet */ + }; + ++#define UCON (S3C2410_UCON_DEFAULT | \ ++ S3C2443_UCON_RXERR_IRQEN) ++ ++#define ULCON (S3C2410_LCON_CS8 | \ ++ S3C2410_LCON_PNONE) ++ ++#define UFCON (S3C2410_UFCON_FIFOMODE | \ ++ S3C2410_UFCON_RXTRIG8 | \ ++ S3C2410_UFCON_TXTRIG4) ++ + static struct s3c2410_uartcfg n30_uartcfgs[] = { + /* Normal serial port */ + [0] = { + .hwport = 0, + .flags = 0, +- .ucon = 0x2c5, +- .ulcon = 0x03, +- .ufcon = 0x51, ++ .ucon = UCON, ++ .ulcon = ULCON, ++ .ufcon = UFCON, + }, + /* IR port */ + [1] = { + .hwport = 1, + .flags = 0, + .uart_flags = UPF_CONS_FLOW, +- .ucon = 0x2c5, +- .ulcon = 0x43, +- .ufcon = 0x51, ++ .ucon = UCON, ++ .ulcon = ULCON | S3C2410_LCON_IRM, ++ .ufcon = UFCON, + }, + /* On the N30 the bluetooth controller is connected here. + * On the N35 and variants the GPS receiver is connected here. */ + [2] = { + .hwport = 2, + .flags = 0, +- .ucon = 0x2c5, +- .ulcon = 0x03, +- .ufcon = 0x51, ++ .ucon = UCON, ++ .ulcon = ULCON, ++ .ufcon = UFCON, + }, + }; + +diff --git a/arch/arm/plat-samsung/include/plat/regs-serial.h b/arch/arm/plat-samsung/include/plat/regs-serial.h +index 788837e..c64beca 100644 +--- a/arch/arm/plat-samsung/include/plat/regs-serial.h ++++ b/arch/arm/plat-samsung/include/plat/regs-serial.h +@@ -114,6 +114,9 @@ + + #define S3C2410_UFCON_FIFOMODE (1<<0) + #define S3C2410_UFCON_TXTRIG0 (0<<6) ++#define S3C2410_UFCON_TXTRIG4 (1<<6) ++#define S3C2410_UFCON_TXTRIG8 (2<<6) ++#define S3C2410_UFCON_TXTRIG12 (3<<6) + #define S3C2410_UFCON_RXTRIG8 (1<<4) + #define S3C2410_UFCON_RXTRIG12 (2<<4) + +-- +1.7.3.1 + -- cgit v1.2.3