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
nexedi
linux
Commits
8b27e49f
Commit
8b27e49f
authored
Mar 04, 2004
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://bk.arm.linux.org.uk/linux-2.6-serial
into ppc970.osdl.org:/home/torvalds/v2.5/linux
parents
1610726a
f48c43e5
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
29 deletions
+12
-29
drivers/pci/pci.ids
drivers/pci/pci.ids
+2
-0
drivers/serial/8250.c
drivers/serial/8250.c
+3
-7
drivers/serial/8250_pci.c
drivers/serial/8250_pci.c
+7
-2
drivers/serial/Kconfig
drivers/serial/Kconfig
+0
-6
drivers/serial/clps711x.c
drivers/serial/clps711x.c
+0
-9
drivers/serial/serial_core.c
drivers/serial/serial_core.c
+0
-5
No files found.
drivers/pci/pci.ids
View file @
8b27e49f
...
...
@@ -5601,6 +5601,8 @@
14da National Aerospace Laboratories
14db AFAVLAB Technology Inc
2120 TK9902
2180 P028
2182 P030
14dc Amplicon Liveline Ltd
0000 PCI230
0001 PCI242
...
...
drivers/serial/8250.c
View file @
8b27e49f
...
...
@@ -16,12 +16,8 @@
*
* A note about mapbase / membase
*
* mapbase is the physical address of the IO port. Currently, we don't
* support this very well, and it may well be dropped from this driver
* in future. As such, mapbase should be NULL.
*
* membase is an 'ioremapped' cookie. This is compatible with the old
* serial.c driver, and is currently the preferred form.
* mapbase is the physical address of the IO port.
* membase is an 'ioremapped' cookie.
*/
#include <linux/config.h>
#include <linux/module.h>
...
...
@@ -1976,7 +1972,7 @@ static int __init serial8250_console_setup(struct console *co, char *options)
if
(
co
->
index
>=
UART_NR
)
co
->
index
=
0
;
port
=
&
serial8250_ports
[
co
->
index
].
port
;
if
(
port
->
type
==
PORT_UNKNOWN
)
if
(
!
port
->
ops
)
return
-
ENODEV
;
/*
...
...
drivers/serial/8250_pci.c
View file @
8b27e49f
...
...
@@ -145,8 +145,10 @@ afavlab_setup(struct pci_dev *dev, struct pci_board *board,
bar
=
FL_GET_BASE
(
board
->
flags
);
if
(
idx
<
4
)
bar
+=
idx
;
else
else
{
bar
=
4
;
offset
+=
(
idx
-
4
)
*
board
->
uart_offset
;
}
return
setup_port
(
dev
,
req
,
bar
,
offset
,
board
->
reg_shift
);
}
...
...
@@ -1772,7 +1774,7 @@ static struct pci_device_id serial_pci_tbl[] = {
pbn_b0_4_115200
},
{
PCI_VENDOR_ID_OXSEMI
,
PCI_DEVICE_ID_OXSEMI_16PCI952
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
pbn_b0_
2_1152
00
},
pbn_b0_
bt_2_9216
00
},
/*
* Digitan DS560-558, from jimd@esoft.com
...
...
@@ -1891,6 +1893,9 @@ static struct pci_device_id serial_pci_tbl[] = {
{
PCI_VENDOR_ID_AFAVLAB
,
PCI_DEVICE_ID_AFAVLAB_P028
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
pbn_b0_bt_8_115200
},
{
PCI_VENDOR_ID_AFAVLAB
,
PCI_DEVICE_ID_AFAVLAB_P030
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
pbn_b0_bt_8_115200
},
{
PCI_VENDOR_ID_LAVA
,
PCI_DEVICE_ID_LAVA_DSERIAL
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
...
...
drivers/serial/Kconfig
View file @
8b27e49f
...
...
@@ -250,12 +250,6 @@ config SERIAL_CLPS711X_CONSOLE
your boot loader (lilo or loadlin) about how to pass options to the
kernel at boot time.)
config SERIAL_CLPS711X_OLD_NAME
bool "Use the old 2.4 names for CLPS711X serial port"
depends on SERIAL_CLPS711X=y
help
::: To be written :::
config SERIAL_DZ
bool "DECstation DZ serial driver"
depends on DECSTATION
...
...
drivers/serial/clps711x.c
View file @
8b27e49f
...
...
@@ -49,19 +49,10 @@
#define UART_NR 2
#ifndef CONFIG_SERIAL_CLPS711X_OLD_NAME
#define SERIAL_CLPS711X_MAJOR 204
#define SERIAL_CLPS711X_MINOR 40
#define SERIAL_CLPS711X_NR UART_NR
#else
#warning The old names/device number for this driver if compatabity is needed
#define SERIAL_CLPS711X_MAJOR 204
#define SERIAL_CLPS711X_MINOR 16
#define SERIAL_CLPS711X_NR UART_NR
#endif
/*
* We use the relevant SYSCON register as a base address for these ports.
*/
...
...
drivers/serial/serial_core.c
View file @
8b27e49f
...
...
@@ -175,8 +175,6 @@ static int uart_startup(struct uart_state *state, int init_hw)
uart_circ_clear
(
&
info
->
xmit
);
}
port
->
mctrl
=
0
;
retval
=
port
->
ops
->
startup
(
port
);
if
(
retval
==
0
)
{
if
(
init_hw
)
{
...
...
@@ -1874,9 +1872,6 @@ uart_set_options(struct uart_port *port, struct console *co,
if
(
flow
==
'r'
)
termios
.
c_cflag
|=
CRTSCTS
;
if
(
!
port
->
ops
)
return
0
;
/* "console=" on ia64 */
port
->
ops
->
set_termios
(
port
,
&
termios
,
NULL
);
co
->
cflag
=
termios
.
c_cflag
;
...
...
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