Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
68ddb1d9
Commit
68ddb1d9
authored
Sep 13, 2008
by
Russell King
Committed by
Russell King
Sep 13, 2008
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-rmk' of
git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git
parents
c33de47b
9fbe6044
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
6 deletions
+23
-6
arch/arm/mach-mx3/pcm037.c
arch/arm/mach-mx3/pcm037.c
+1
-1
drivers/serial/imx.c
drivers/serial/imx.c
+22
-5
No files found.
arch/arm/mach-mx3/pcm037.c
View file @
68ddb1d9
...
...
@@ -54,7 +54,7 @@ static struct platform_device pcm037_flash = {
};
static
struct
imxuart_platform_data
uart_pdata
=
{
.
flags
=
0
,
.
flags
=
IMXUART_HAVE_RTSCTS
,
};
static
struct
platform_device
*
devices
[]
__initdata
=
{
...
...
drivers/serial/imx.c
View file @
68ddb1d9
...
...
@@ -127,8 +127,13 @@
#define UCR3_RXDSEN (1<<6)
/* Receive status interrupt enable */
#define UCR3_AIRINTEN (1<<5)
/* Async IR wake interrupt enable */
#define UCR3_AWAKEN (1<<4)
/* Async wake interrupt enable */
#define UCR3_REF25 (1<<3)
/* Ref freq 25 MHz */
#define UCR3_REF30 (1<<2)
/* Ref Freq 30 MHz */
#ifdef CONFIG_ARCH_IMX
#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_BPEN (1<<0)
/* Preset registers enable */
#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
)
imx_txint
(
irq
,
dev_id
);
if
(
sts
&
USR1_RTS
S
)
if
(
sts
&
USR1_RTS
D
)
imx_rtsint
(
irq
,
dev_id
);
return
IRQ_HANDLED
;
...
...
@@ -598,6 +603,12 @@ static int imx_startup(struct uart_port *port)
temp
|=
(
UCR2_RXEN
|
UCR2_TXEN
);
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
*/
...
...
@@ -1133,13 +1144,19 @@ static int serial_imx_probe(struct platform_device *pdev)
if
(
pdata
&&
(
pdata
->
flags
&
IMXUART_HAVE_RTSCTS
))
sport
->
have_rtscts
=
1
;
if
(
pdata
->
init
)
pdata
->
init
(
pdev
);
if
(
pdata
->
init
)
{
ret
=
pdata
->
init
(
pdev
);
if
(
ret
)
goto
clkput
;
}
uart_add_one_port
(
&
imx_reg
,
&
sport
->
port
);
platform_set_drvdata
(
pdev
,
&
sport
->
port
);
return
0
;
clkput:
clk_put
(
sport
->
clk
);
clk_disable
(
sport
->
clk
);
unmap:
iounmap
(
sport
->
port
.
membase
);
free:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment