From: Jiri.Pinkava@vscht.cz (Jiří Pinkava)
To: linux-arm-kernel@lists.infradead.org
Subject: PATCH 3/6] n30: Clean up UARTs configuration
Date: Mon, 4 Oct 2010 02:26:55 +0200 [thread overview]
Message-ID: <4CA91F4F.8080204@vscht.cz> (raw)
In-Reply-To: <4CA91F05.3040602@vscht.cz>
Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz>
---
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
next prev parent reply other threads:[~2010-10-04 0:26 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-04 0:23 [PATCH 0/6] - Acer n35 fixes and features Jiří Pinkava
2010-10-04 0:24 ` [PATCH 1/6] n35: fix key codes and types Jiří Pinkava
2010-10-04 0:25 ` [PATCH 2/6] n35: Update GPIO documentation for Acer n35 Jiří Pinkava
2010-10-04 0:26 ` Jiří Pinkava [this message]
2010-10-04 0:29 ` [PATCH 4/6] n30: Fix MMC power management Jiří Pinkava
2010-10-04 0:31 ` [PATCH 5/6] n30: Add touchscreen support for Ace n35 Jiří Pinkava
2010-10-04 0:32 ` [PATCH 6/6] n35: Add LCD backlight regulation Jiří Pinkava
2010-10-10 23:38 ` [PATCH 1/6] n35: fix key codes and types Ben Dooks
2010-10-13 7:49 ` Jiří Pinkava
2010-10-06 22:25 ` [PATCH 0/6] - Acer n35 fixes and features Ben Dooks
2010-10-10 23:43 ` Ben Dooks
2010-10-13 7:56 ` [PATCH 1/6] n35: fix key codes Jiri.Pinkava at vscht.cz
2010-10-13 7:56 ` [PATCH 2/6] n35: Update GPIO documentation for Acer n35 Jiri.Pinkava at vscht.cz
2010-10-13 7:56 ` [PATCH 3/6] n30: Clean up UARTs configuration Jiri.Pinkava at vscht.cz
2010-10-13 7:56 ` [PATCH 4/6] n30: Fix MMC power management on Acer n30 / n35 Jiri.Pinkava at vscht.cz
2010-10-13 7:56 ` [PATCH 5/6] n30: Add touchscreen support for " Jiri.Pinkava at vscht.cz
2010-10-13 7:56 ` [PATCH 6/6] n35: Add LCD backlight regulation on Acer n35 Jiri.Pinkava at vscht.cz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4CA91F4F.8080204@vscht.cz \
--to=jiri.pinkava@vscht.cz \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).