Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
8546df6f
cloud-kernel
项目概览
openanolis
/
cloud-kernel
12 个月 前同步成功
通知
152
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8546df6f
编写于
11月 08, 2005
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge master.kernel.org:/home/rmk/linux-2.6-serial
上级
9f04012c
15a93807
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
22 addition
and
20 deletion
+22
-20
drivers/net/ioc3-eth.c
drivers/net/ioc3-eth.c
+22
-20
未找到文件。
drivers/net/ioc3-eth.c
浏览文件 @
8546df6f
...
...
@@ -46,10 +46,8 @@
#include <linux/udp.h>
#ifdef CONFIG_SERIAL_8250
#include <linux/serial.h>
#include <asm/serial.h>
#define IOC3_BAUD (22000000 / (3*16))
#define IOC3_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
#include <linux/serial_core.h>
#include <linux/serial_8250.h>
#endif
#include <linux/netdevice.h>
...
...
@@ -1146,12 +1144,11 @@ static inline int ioc3_is_menet(struct pci_dev *pdev)
* around ioc3 oddities in this respect.
*
* The IOC3 serials use a 22MHz clock rate with an additional divider by 3.
* (IOC3_BAUD = (22000000 / (3*16)))
*/
static
void
__devinit
ioc3_serial_probe
(
struct
pci_dev
*
pdev
,
struct
ioc3
*
ioc3
)
{
struct
serial_struct
req
;
struct
uart_port
port
;
/*
* We need to recognice and treat the fourth MENET serial as it
...
...
@@ -1165,20 +1162,25 @@ static void __devinit ioc3_serial_probe(struct pci_dev *pdev, struct ioc3 *ioc3)
if
(
ioc3_is_menet
(
pdev
)
&&
PCI_SLOT
(
pdev
->
devfn
)
==
3
)
return
;
/* Register to interrupt zero because we share the interrupt with
the serial driver which we don't properly support yet. */
memset
(
&
req
,
0
,
sizeof
(
req
));
req
.
irq
=
0
;
req
.
flags
=
IOC3_COM_FLAGS
;
req
.
io_type
=
SERIAL_IO_MEM
;
req
.
iomem_reg_shift
=
0
;
req
.
baud_base
=
IOC3_BAUD
;
req
.
iomem_base
=
(
unsigned
char
*
)
&
ioc3
->
sregs
.
uarta
;
register_serial
(
&
req
);
req
.
iomem_base
=
(
unsigned
char
*
)
&
ioc3
->
sregs
.
uartb
;
register_serial
(
&
req
);
/*
* Register to interrupt zero because we share the interrupt with
* the serial driver which we don't properly support yet.
*
* Can't use UPF_IOREMAP as the whole of IOC3 resources have already
* been registered.
*/
memset
(
&
port
,
0
,
sizeof
(
port
));
port
.
irq
=
0
;
port
.
flags
=
UPF_SKIP_TEST
|
UPF_BOOT_AUTOCONF
;
port
.
iotype
=
UPIO_MEM
;
port
.
regshift
=
0
;
port
.
uartclk
=
22000000
/
3
;
port
.
membase
=
(
unsigned
char
*
)
&
ioc3
->
sregs
.
uarta
;
serial8250_register_port
(
&
port
);
port
.
membase
=
(
unsigned
char
*
)
&
ioc3
->
sregs
.
uartb
;
serial8250_register_port
(
&
port
);
}
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录