Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci-2.6.23
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-2.6.23
Commits
27266a18
Commit
27266a18
authored
Feb 03, 2006
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/home/rmk/linux-2.6-serial
parents
f3e39e67
9a8ffccf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
2 deletions
+29
-2
drivers/serial/8250_pci.c
drivers/serial/8250_pci.c
+24
-1
drivers/serial/Kconfig
drivers/serial/Kconfig
+1
-0
drivers/serial/serial_core.c
drivers/serial/serial_core.c
+1
-1
include/linux/pci_ids.h
include/linux/pci_ids.h
+3
-0
No files found.
drivers/serial/8250_pci.c
View file @
27266a18
...
...
@@ -439,6 +439,20 @@ static int pci_siig_init(struct pci_dev *dev)
return
-
ENODEV
;
}
static
int
pci_siig_setup
(
struct
serial_private
*
priv
,
struct
pciserial_board
*
board
,
struct
uart_port
*
port
,
int
idx
)
{
unsigned
int
bar
=
FL_GET_BASE
(
board
->
flags
)
+
idx
,
offset
=
0
;
if
(
idx
>
3
)
{
bar
=
4
;
offset
=
(
idx
-
4
)
*
8
;
}
return
setup_port
(
priv
,
port
,
bar
,
offset
,
0
);
}
/*
* Timedia has an explosion of boards, and to avoid the PCI table from
* growing *huge*, we use this function to collapse some 70 entries
...
...
@@ -748,7 +762,7 @@ static struct pci_serial_quirk pci_serial_quirks[] = {
.
subvendor
=
PCI_ANY_ID
,
.
subdevice
=
PCI_ANY_ID
,
.
init
=
pci_siig_init
,
.
setup
=
pci_
default
_setup
,
.
setup
=
pci_
siig
_setup
,
},
/*
* Titan cards
...
...
@@ -2141,6 +2155,15 @@ static struct pci_device_id serial_pci_tbl[] = {
{
PCI_VENDOR_ID_SIIG
,
PCI_DEVICE_ID_SIIG_4S_20x_850
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
pbn_b0_bt_4_921600
},
{
PCI_VENDOR_ID_SIIG
,
PCI_DEVICE_ID_SIIG_8S_20x_550
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
pbn_b0_bt_8_921600
},
{
PCI_VENDOR_ID_SIIG
,
PCI_DEVICE_ID_SIIG_8S_20x_650
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
pbn_b0_bt_8_921600
},
{
PCI_VENDOR_ID_SIIG
,
PCI_DEVICE_ID_SIIG_8S_20x_850
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
pbn_b0_bt_8_921600
},
/*
* Computone devices submitted by Doug McNash dmcnash@computone.com
...
...
drivers/serial/Kconfig
View file @
27266a18
...
...
@@ -98,6 +98,7 @@ config SERIAL_8250_NR_UARTS
config SERIAL_8250_RUNTIME_UARTS
int "Number of 8250/16550 serial ports to register at runtime"
depends on SERIAL_8250
range 0 SERIAL_8250_NR_UARTS
default "4"
help
Set this to the maximum number of serial ports you want
...
...
drivers/serial/serial_core.c
View file @
27266a18
...
...
@@ -2237,7 +2237,7 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *port)
* If this port is a console, then the spinlock is already
* initialised.
*/
if
(
!
uart_console
(
port
))
if
(
!
(
uart_console
(
port
)
&&
(
port
->
cons
->
flags
&
CON_ENABLED
)
))
spin_lock_init
(
&
port
->
lock
);
uart_configure_port
(
drv
,
state
,
port
);
...
...
include/linux/pci_ids.h
View file @
27266a18
...
...
@@ -1670,6 +1670,9 @@
#define PCI_DEVICE_ID_SIIG_2S1P_20x_550 0x2060
#define PCI_DEVICE_ID_SIIG_2S1P_20x_650 0x2061
#define PCI_DEVICE_ID_SIIG_2S1P_20x_850 0x2062
#define PCI_DEVICE_ID_SIIG_8S_20x_550 0x2080
#define PCI_DEVICE_ID_SIIG_8S_20x_650 0x2081
#define PCI_DEVICE_ID_SIIG_8S_20x_850 0x2082
#define PCI_SUBDEVICE_ID_SIIG_QUARTET_SERIAL 0x2050
#define PCI_VENDOR_ID_RADISYS 0x1331
...
...
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