aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Xu <Lionel.Xu@freescale.com>2011-11-16 17:03:36 +0800
committerEric Miao <eric.miao@linaro.org>2011-12-01 11:36:38 +0800
commit77baa2cd195cabc1686f0ed5517a8eafd58864c1 (patch)
treed4b90c17987e4575aa6aa7eeaec507dfea6af891
parentf6c4c0b11439580a27a5e1a26c75a3bb5b69fafb (diff)
ENGR00139276-2 MX6 BT: Enable basic bluetooth support to mx6q platform
Modify uart driver to support DCE/DTE mode Signed-off-by: Lionel Xu <Lionel.Xu@freescale.com>
-rw-r--r--drivers/tty/serial/imx.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 531d442415b..70c1da61d2e 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -135,6 +135,7 @@
#define UFCR_RFDIV (7<<7) /* Reference freq divider mask */
#define UFCR_RFDIV_REG(x) (((x) < 7 ? 6 - (x) : 6) << 7)
#define UFCR_TXTL_SHF 10 /* Transmitter trigger level shift */
+#define UFCR_DCEDTE (1<<6)
#define USR1_PARITYERR (1<<15) /* Parity error interrupt flag */
#define USR1_RTSS (1<<14) /* RTS pin status */
#define USR1_TRDY (1<<13) /* Transmitter ready interrupt/dma flag */
@@ -189,6 +190,7 @@ struct imx_port {
unsigned int old_status;
int txirq,rxirq,rtsirq;
unsigned int have_rtscts:1;
+ unsigned int use_dcedte:1;
unsigned int use_irda:1;
unsigned int irda_inv_rx:1;
unsigned int irda_inv_tx:1;
@@ -928,6 +930,10 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios,
ufcr = readl(sport->port.membase + UFCR);
ufcr = (ufcr & (~UFCR_RFDIV)) | UFCR_RFDIV_REG(div);
+
+ if (sport->use_dcedte)
+ ufcr |= UFCR_DCEDTE;
+
writel(ufcr, sport->port.membase + UFCR);
writel(num, sport->port.membase + UBIR);
@@ -1311,7 +1317,8 @@ static int serial_imx_probe(struct platform_device *pdev)
pdata = pdev->dev.platform_data;
if (pdata && (pdata->flags & IMXUART_HAVE_RTSCTS))
sport->have_rtscts = 1;
-
+ if (pdata && (pdata->flags & IMXUART_USE_DCEDTE))
+ sport->use_dcedte = 1;
#ifdef CONFIG_IRDA
if (pdata && (pdata->flags & IMXUART_IRDA))
sport->use_irda = 1;