Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
27266a18
cloud-kernel
项目概览
openanolis
/
cloud-kernel
1 年多 前同步成功
通知
160
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
27266a18
编写于
2月 03, 2006
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge master.kernel.org:/home/rmk/linux-2.6-serial
上级
f3e39e67
9a8ffccf
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
29 addition
and
2 deletion
+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
未找到文件。
drivers/serial/8250_pci.c
浏览文件 @
27266a18
...
@@ -439,6 +439,20 @@ static int pci_siig_init(struct pci_dev *dev)
...
@@ -439,6 +439,20 @@ static int pci_siig_init(struct pci_dev *dev)
return
-
ENODEV
;
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
* Timedia has an explosion of boards, and to avoid the PCI table from
* growing *huge*, we use this function to collapse some 70 entries
* growing *huge*, we use this function to collapse some 70 entries
...
@@ -748,7 +762,7 @@ static struct pci_serial_quirk pci_serial_quirks[] = {
...
@@ -748,7 +762,7 @@ static struct pci_serial_quirk pci_serial_quirks[] = {
.
subvendor
=
PCI_ANY_ID
,
.
subvendor
=
PCI_ANY_ID
,
.
subdevice
=
PCI_ANY_ID
,
.
subdevice
=
PCI_ANY_ID
,
.
init
=
pci_siig_init
,
.
init
=
pci_siig_init
,
.
setup
=
pci_
default
_setup
,
.
setup
=
pci_
siig
_setup
,
},
},
/*
/*
* Titan cards
* Titan cards
...
@@ -2141,6 +2155,15 @@ static struct pci_device_id serial_pci_tbl[] = {
...
@@ -2141,6 +2155,15 @@ static struct pci_device_id serial_pci_tbl[] = {
{
PCI_VENDOR_ID_SIIG
,
PCI_DEVICE_ID_SIIG_4S_20x_850
,
{
PCI_VENDOR_ID_SIIG
,
PCI_DEVICE_ID_SIIG_4S_20x_850
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
pbn_b0_bt_4_921600
},
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
* Computone devices submitted by Doug McNash dmcnash@computone.com
...
...
drivers/serial/Kconfig
浏览文件 @
27266a18
...
@@ -98,6 +98,7 @@ config SERIAL_8250_NR_UARTS
...
@@ -98,6 +98,7 @@ config SERIAL_8250_NR_UARTS
config SERIAL_8250_RUNTIME_UARTS
config SERIAL_8250_RUNTIME_UARTS
int "Number of 8250/16550 serial ports to register at runtime"
int "Number of 8250/16550 serial ports to register at runtime"
depends on SERIAL_8250
depends on SERIAL_8250
range 0 SERIAL_8250_NR_UARTS
default "4"
default "4"
help
help
Set this to the maximum number of serial ports you want
Set this to the maximum number of serial ports you want
...
...
drivers/serial/serial_core.c
浏览文件 @
27266a18
...
@@ -2237,7 +2237,7 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *port)
...
@@ -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
* If this port is a console, then the spinlock is already
* initialised.
* initialised.
*/
*/
if
(
!
uart_console
(
port
))
if
(
!
(
uart_console
(
port
)
&&
(
port
->
cons
->
flags
&
CON_ENABLED
)
))
spin_lock_init
(
&
port
->
lock
);
spin_lock_init
(
&
port
->
lock
);
uart_configure_port
(
drv
,
state
,
port
);
uart_configure_port
(
drv
,
state
,
port
);
...
...
include/linux/pci_ids.h
浏览文件 @
27266a18
...
@@ -1670,6 +1670,9 @@
...
@@ -1670,6 +1670,9 @@
#define PCI_DEVICE_ID_SIIG_2S1P_20x_550 0x2060
#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_650 0x2061
#define PCI_DEVICE_ID_SIIG_2S1P_20x_850 0x2062
#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_SUBDEVICE_ID_SIIG_QUARTET_SERIAL 0x2050
#define PCI_VENDOR_ID_RADISYS 0x1331
#define PCI_VENDOR_ID_RADISYS 0x1331
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录