Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
9717453c
Commit
9717453c
authored
Jan 19, 2010
by
Ben Dooks
Browse files
Options
Browse Files
Download
Plain Diff
ARM: Merge next-samsung-serial1
Merge branch 'next-samsung-serial1' into next-samsung-try7
parents
ea2de1dc
51fe5222
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
10 deletions
+15
-10
drivers/serial/samsung.c
drivers/serial/samsung.c
+3
-3
drivers/serial/samsung.h
drivers/serial/samsung.h
+12
-7
No files found.
drivers/serial/samsung.c
View file @
9717453c
...
...
@@ -1374,7 +1374,7 @@ s3c24xx_serial_get_options(struct uart_port *port, int *baud,
* data.
*/
static
int
s3c24xx_serial_init_ports
(
struct
s3c24xx_uart_info
*
info
)
static
int
s3c24xx_serial_init_ports
(
struct
s3c24xx_uart_info
*
*
info
)
{
struct
s3c24xx_uart_port
*
ptr
=
s3c24xx_serial_ports
;
struct
platform_device
**
platdev_ptr
;
...
...
@@ -1385,7 +1385,7 @@ static int s3c24xx_serial_init_ports(struct s3c24xx_uart_info *info)
platdev_ptr
=
s3c24xx_uart_devs
;
for
(
i
=
0
;
i
<
CONFIG_SERIAL_SAMSUNG_UARTS
;
i
++
,
ptr
++
,
platdev_ptr
++
)
{
s3c24xx_serial_init_port
(
ptr
,
info
,
*
platdev_ptr
);
s3c24xx_serial_init_port
(
ptr
,
info
[
i
]
,
*
platdev_ptr
);
}
return
0
;
...
...
@@ -1451,7 +1451,7 @@ static struct console s3c24xx_serial_console = {
};
int
s3c24xx_serial_initconsole
(
struct
platform_driver
*
drv
,
struct
s3c24xx_uart_info
*
info
)
struct
s3c24xx_uart_info
*
*
info
)
{
struct
platform_device
*
dev
=
s3c24xx_uart_devs
[
0
];
...
...
drivers/serial/samsung.h
View file @
9717453c
...
...
@@ -75,19 +75,24 @@ extern int s3c24xx_serial_probe(struct platform_device *dev,
extern
int
__devexit
s3c24xx_serial_remove
(
struct
platform_device
*
dev
);
extern
int
s3c24xx_serial_initconsole
(
struct
platform_driver
*
drv
,
struct
s3c24xx_uart_info
*
uart
);
struct
s3c24xx_uart_info
*
*
uart
);
extern
int
s3c24xx_serial_init
(
struct
platform_driver
*
drv
,
struct
s3c24xx_uart_info
*
info
);
#ifdef CONFIG_SERIAL_SAMSUNG_CONSOLE
#define s3c24xx_console_init(__drv, __inf) \
static int __init s3c_serial_console_init(void) \
{ \
return s3c24xx_serial_initconsole(__drv, __inf); \
} \
\
#define s3c24xx_console_init(__drv, __inf) \
static int __init s3c_serial_console_init(void) \
{ \
struct s3c24xx_uart_info *uinfo[CONFIG_SERIAL_SAMSUNG_UARTS]; \
int i; \
\
for (i = 0; i < CONFIG_SERIAL_SAMSUNG_UARTS; i++) \
uinfo[i] = __inf; \
return s3c24xx_serial_initconsole(__drv, uinfo); \
} \
\
console_initcall(s3c_serial_console_init)
#else
...
...
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