hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git

This commit is contained in:
Russell King 2008-09-13 20:10:59 +01:00 committed by Russell King
parent c33de47bce 9fbe604456
commit 68ddb1d963
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-mx3/pcm037.c
View File

@ -54,7 +54,7 @@ static struct platform_device pcm037_flash = {
}; };
static struct imxuart_platform_data uart_pdata = { static struct imxuart_platform_data uart_pdata = {
.flags = 0, .flags = IMXUART_HAVE_RTSCTS,
}; };
static struct platform_device *devices[] __initdata = { static struct platform_device *devices[] __initdata = {

27
drivers/serial/imx.c
View File

@ -127,8 +127,13 @@
#define UCR3_RXDSEN (1<<6) /* Receive status interrupt enable */ #define UCR3_RXDSEN (1<<6) /* Receive status interrupt enable */
#define UCR3_AIRINTEN (1<<5) /* Async IR wake interrupt enable */ #define UCR3_AIRINTEN (1<<5) /* Async IR wake interrupt enable */
#define UCR3_AWAKEN (1<<4) /* Async wake interrupt enable */ #define UCR3_AWAKEN (1<<4) /* Async wake interrupt enable */
#define UCR3_REF25 (1<<3) /* Ref freq 25 MHz */ #ifdef CONFIG_ARCH_IMX
#define UCR3_REF30 (1<<2) /* Ref Freq 30 MHz */ #define UCR3_REF25 (1<<3) /* Ref freq 25 MHz, only on mx1 */
#define UCR3_REF30 (1<<2) /* Ref Freq 30 MHz, only on mx1 */
#endif
#if defined CONFIG_ARCH_MX2 || defined CONFIG_ARCH_MX3
#define UCR3_RXDMUXSEL (1<<2) /* RXD Muxed Input Select, on mx2/mx3 */
#endif
#define UCR3_INVT (1<<1) /* Inverted Infrared transmission */ #define UCR3_INVT (1<<1) /* Inverted Infrared transmission */
#define UCR3_BPEN (1<<0) /* Preset registers enable */ #define UCR3_BPEN (1<<0) /* Preset registers enable */
#define UCR4_CTSTL_32 (32<<10) /* CTS trigger level (32 chars) */ #define UCR4_CTSTL_32 (32<<10) /* CTS trigger level (32 chars) */
@ -445,7 +450,7 @@ static irqreturn_t imx_int(int irq, void *dev_id)
readl(sport->port.membase + UCR1) & UCR1_TXMPTYEN) readl(sport->port.membase + UCR1) & UCR1_TXMPTYEN)
imx_txint(irq, dev_id); imx_txint(irq, dev_id);
if (sts & USR1_RTSS) if (sts & USR1_RTSD)
imx_rtsint(irq, dev_id); imx_rtsint(irq, dev_id);
return IRQ_HANDLED; return IRQ_HANDLED;
@ -598,6 +603,12 @@ static int imx_startup(struct uart_port *port)
temp |= (UCR2_RXEN | UCR2_TXEN); temp |= (UCR2_RXEN | UCR2_TXEN);
writel(temp, sport->port.membase + UCR2); writel(temp, sport->port.membase + UCR2);
#if defined CONFIG_ARCH_MX2 || defined CONFIG_ARCH_MX3
temp = readl(sport->port.membase + UCR3);
temp |= UCR3_RXDMUXSEL;
writel(temp, sport->port.membase + UCR3);
#endif
/* /*
* Enable modem status interrupts * Enable modem status interrupts
*/ */
@ -1133,13 +1144,19 @@ static int serial_imx_probe(struct platform_device *pdev)
if(pdata && (pdata->flags & IMXUART_HAVE_RTSCTS)) if(pdata && (pdata->flags & IMXUART_HAVE_RTSCTS))
sport->have_rtscts = 1; sport->have_rtscts = 1;
if (pdata->init) if (pdata->init) {
pdata->init(pdev); ret = pdata->init(pdev);
if (ret)
goto clkput;
}
uart_add_one_port(&imx_reg, &sport->port); uart_add_one_port(&imx_reg, &sport->port);
platform_set_drvdata(pdev, &sport->port); platform_set_drvdata(pdev, &sport->port);
return 0; return 0;
clkput:
clk_put(sport->clk);
clk_disable(sport->clk);
unmap: unmap:
iounmap(sport->port.membase); iounmap(sport->port.membase);
free: free: