Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Linux-御风守护者
linux
提交
17be03f0
L
linux
项目概览
Linux-御风守护者
/
linux
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
17be03f0
编写于
2月 08, 2006
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge master.kernel.org:/home/rmk/linux-2.6-serial
上级
cce0cac1
85d1494e
变更
49
隐藏空白更改
内联
并排
Showing
49 changed file
with
108 addition
and
113 deletion
+108
-113
arch/arm/mach-imx/mx1ads.c
arch/arm/mach-imx/mx1ads.c
+0
-1
arch/mips/cobalt/setup.c
arch/mips/cobalt/setup.c
+1
-1
arch/mips/lasat/setup.c
arch/mips/lasat/setup.c
+2
-2
arch/mips/mips-boards/atlas/atlas_setup.c
arch/mips/mips-boards/atlas/atlas_setup.c
+2
-2
arch/mips/mips-boards/sead/sead_setup.c
arch/mips/mips-boards/sead/sead_setup.c
+2
-2
arch/mips/mips-boards/sim/sim_setup.c
arch/mips/mips-boards/sim/sim_setup.c
+2
-2
arch/mips/momentum/jaguar_atx/ja-console.c
arch/mips/momentum/jaguar_atx/ja-console.c
+1
-1
arch/mips/philips/pnx8550/common/platform.c
arch/mips/philips/pnx8550/common/platform.c
+4
-4
arch/mips/pmc-sierra/yosemite/setup.c
arch/mips/pmc-sierra/yosemite/setup.c
+1
-1
arch/mips/sgi-ip32/ip32-setup.c
arch/mips/sgi-ip32/ip32-setup.c
+4
-9
arch/ppc/platforms/4xx/bamboo.c
arch/ppc/platforms/4xx/bamboo.c
+2
-2
arch/ppc/platforms/4xx/bubinga.c
arch/ppc/platforms/4xx/bubinga.c
+2
-2
arch/ppc/platforms/4xx/ebony.c
arch/ppc/platforms/4xx/ebony.c
+2
-2
arch/ppc/platforms/4xx/luan.c
arch/ppc/platforms/4xx/luan.c
+2
-2
arch/ppc/platforms/4xx/ocotea.c
arch/ppc/platforms/4xx/ocotea.c
+2
-2
arch/ppc/platforms/4xx/xilinx_ml300.c
arch/ppc/platforms/4xx/xilinx_ml300.c
+2
-2
arch/ppc/platforms/4xx/yucca.c
arch/ppc/platforms/4xx/yucca.c
+2
-2
arch/ppc/platforms/83xx/mpc834x_sys.c
arch/ppc/platforms/83xx/mpc834x_sys.c
+2
-2
arch/ppc/platforms/85xx/mpc8540_ads.c
arch/ppc/platforms/85xx/mpc8540_ads.c
+2
-2
arch/ppc/platforms/85xx/mpc85xx_cds_common.c
arch/ppc/platforms/85xx/mpc85xx_cds_common.c
+2
-2
arch/ppc/platforms/85xx/sbc8560.c
arch/ppc/platforms/85xx/sbc8560.c
+1
-1
arch/ppc/platforms/85xx/tqm85xx.c
arch/ppc/platforms/85xx/tqm85xx.c
+2
-2
arch/ppc/platforms/chestnut.c
arch/ppc/platforms/chestnut.c
+1
-1
arch/ppc/platforms/ev64260.c
arch/ppc/platforms/ev64260.c
+1
-1
arch/ppc/platforms/radstone_ppc7d.c
arch/ppc/platforms/radstone_ppc7d.c
+1
-1
arch/ppc/platforms/spruce.c
arch/ppc/platforms/spruce.c
+2
-2
arch/ppc/syslib/ppc83xx_setup.c
arch/ppc/syslib/ppc83xx_setup.c
+1
-1
arch/ppc/syslib/ppc85xx_setup.c
arch/ppc/syslib/ppc85xx_setup.c
+1
-1
drivers/serial/21285.c
drivers/serial/21285.c
+1
-1
drivers/serial/8250.c
drivers/serial/8250.c
+1
-0
drivers/serial/8250_au1x00.c
drivers/serial/8250_au1x00.c
+0
-1
drivers/serial/8250_pci.c
drivers/serial/8250_pci.c
+4
-0
drivers/serial/amba-pl010.c
drivers/serial/amba-pl010.c
+2
-2
drivers/serial/au1x00_uart.c
drivers/serial/au1x00_uart.c
+6
-6
drivers/serial/cpm_uart/cpm_uart_core.c
drivers/serial/cpm_uart/cpm_uart_core.c
+10
-15
drivers/serial/dz.c
drivers/serial/dz.c
+2
-1
drivers/serial/imx.c
drivers/serial/imx.c
+2
-2
drivers/serial/ip22zilog.c
drivers/serial/ip22zilog.c
+4
-4
drivers/serial/m32r_sio.c
drivers/serial/m32r_sio.c
+1
-1
drivers/serial/mux.c
drivers/serial/mux.c
+1
-1
drivers/serial/pmac_zilog.c
drivers/serial/pmac_zilog.c
+1
-1
drivers/serial/sa1100.c
drivers/serial/sa1100.c
+1
-1
drivers/serial/serial_lh7a40x.c
drivers/serial/serial_lh7a40x.c
+3
-3
drivers/serial/sh-sci.c
drivers/serial/sh-sci.c
+10
-10
drivers/serial/sunsab.c
drivers/serial/sunsab.c
+1
-1
drivers/serial/sunsu.c
drivers/serial/sunsu.c
+5
-5
drivers/serial/sunzilog.c
drivers/serial/sunzilog.c
+2
-2
drivers/serial/v850e_uart.c
drivers/serial/v850e_uart.c
+1
-1
include/linux/pci_ids.h
include/linux/pci_ids.h
+1
-0
未找到文件。
arch/arm/mach-imx/mx1ads.c
浏览文件 @
17be03f0
...
...
@@ -27,7 +27,6 @@
#include <asm/mach/arch.h>
#include <linux/interrupt.h>
#include "generic.h"
#include <asm/serial.h>
static
struct
resource
cs89x0_resources
[]
=
{
[
0
]
=
{
...
...
arch/mips/cobalt/setup.c
浏览文件 @
17be03f0
...
...
@@ -140,7 +140,7 @@ void __init plat_setup(void)
uart
.
type
=
PORT_UNKNOWN
;
uart
.
uartclk
=
18432000
;
uart
.
irq
=
COBALT_SERIAL_IRQ
;
uart
.
flags
=
STD_COM_FLAGS
;
uart
.
flags
=
UPF_BOOT_AUTOCONF
|
UPF_SKIP_TEST
;
uart
.
iobase
=
0xc800000
;
uart
.
iotype
=
UPIO_PORT
;
...
...
arch/mips/lasat/setup.c
浏览文件 @
17be03f0
...
...
@@ -134,8 +134,8 @@ void __init serial_init(void)
memset
(
&
s
,
0
,
sizeof
(
s
));
s
.
flags
=
STD_COM_FLAGS
;
s
.
iotype
=
SERIAL_
IO_MEM
;
s
.
flags
=
UPF_BOOT_AUTOCONF
|
UPF_SKIP_TEST
;
s
.
iotype
=
UP
IO_MEM
;
if
(
mips_machtype
==
MACH_LASAT_100
)
{
s
.
uartclk
=
LASAT_BASE_BAUD_100
*
16
;
...
...
arch/mips/mips-boards/atlas/atlas_setup.c
浏览文件 @
17be03f0
...
...
@@ -82,8 +82,8 @@ static void __init serial_init(void)
#endif
s
.
irq
=
ATLASINT_UART
;
s
.
uartclk
=
ATLAS_BASE_BAUD
*
16
;
s
.
flags
=
ASYNC_BOOT_AUTOCONF
|
ASYNC_SKIP_TEST
|
ASYNC
_AUTO_IRQ
;
s
.
iotype
=
SERIAL_
IO_PORT
;
s
.
flags
=
UPF_BOOT_AUTOCONF
|
UPF_SKIP_TEST
|
UPF
_AUTO_IRQ
;
s
.
iotype
=
UP
IO_PORT
;
s
.
regshift
=
3
;
if
(
early_serial_setup
(
&
s
)
!=
0
)
{
...
...
arch/mips/mips-boards/sead/sead_setup.c
浏览文件 @
17be03f0
...
...
@@ -71,8 +71,8 @@ static void __init serial_init(void)
#endif
s
.
irq
=
MIPSCPU_INT_BASE
+
MIPSCPU_INT_UART0
;
s
.
uartclk
=
SEAD_BASE_BAUD
*
16
;
s
.
flags
=
ASYNC_BOOT_AUTOCONF
|
ASYNC_SKIP_TEST
|
ASYNC
_AUTO_IRQ
;
s
.
iotype
=
0
;
s
.
flags
=
UPF_BOOT_AUTOCONF
|
UPF_SKIP_TEST
|
UPF
_AUTO_IRQ
;
s
.
iotype
=
UPIO_PORT
;
s
.
regshift
=
3
;
if
(
early_serial_setup
(
&
s
)
!=
0
)
{
...
...
arch/mips/mips-boards/sim/sim_setup.c
浏览文件 @
17be03f0
...
...
@@ -88,8 +88,8 @@ static void __init serial_init(void)
but poll for now */
s
.
irq
=
0
;
s
.
uartclk
=
BASE_BAUD
*
16
;
s
.
flags
=
ASYNC
_BOOT_AUTOCONF
|
UPF_SKIP_TEST
;
s
.
iotype
=
SERIAL_IO_PORT
|
ASYNC_SKIP_TES
T
;
s
.
flags
=
UPF
_BOOT_AUTOCONF
|
UPF_SKIP_TEST
;
s
.
iotype
=
UPIO_POR
T
;
s
.
regshift
=
0
;
s
.
timeout
=
4
;
...
...
arch/mips/momentum/jaguar_atx/ja-console.c
浏览文件 @
17be03f0
...
...
@@ -93,7 +93,7 @@ static void inline ja_console_probe(void)
up
.
uartclk
=
JAGUAR_ATX_UART_CLK
;
up
.
regshift
=
2
;
up
.
iotype
=
UPIO_MEM
;
up
.
flags
=
ASYNC_BOOT_AUTOCONF
|
ASYNC
_SKIP_TEST
;
up
.
flags
=
UPF_BOOT_AUTOCONF
|
UPF
_SKIP_TEST
;
up
.
line
=
0
;
if
(
early_serial_setup
(
&
up
))
...
...
arch/mips/philips/pnx8550/common/platform.c
浏览文件 @
17be03f0
...
...
@@ -66,28 +66,28 @@ struct ip3106_port ip3106_ports[] = {
[
0
]
=
{
.
port
=
{
.
type
=
PORT_IP3106
,
.
iotype
=
SERIAL_
IO_MEM
,
.
iotype
=
UP
IO_MEM
,
.
membase
=
(
void
__iomem
*
)
PNX8550_UART_PORT0
,
.
mapbase
=
PNX8550_UART_PORT0
,
.
irq
=
PNX8550_UART_INT
(
0
),
.
uartclk
=
3692300
,
.
fifosize
=
16
,
.
ops
=
&
ip3106_pops
,
.
flags
=
ASYNC
_BOOT_AUTOCONF
,
.
flags
=
UPF
_BOOT_AUTOCONF
,
.
line
=
0
,
},
},
[
1
]
=
{
.
port
=
{
.
type
=
PORT_IP3106
,
.
iotype
=
SERIAL_
IO_MEM
,
.
iotype
=
UP
IO_MEM
,
.
membase
=
(
void
__iomem
*
)
PNX8550_UART_PORT1
,
.
mapbase
=
PNX8550_UART_PORT1
,
.
irq
=
PNX8550_UART_INT
(
1
),
.
uartclk
=
3692300
,
.
fifosize
=
16
,
.
ops
=
&
ip3106_pops
,
.
flags
=
ASYNC
_BOOT_AUTOCONF
,
.
flags
=
UPF
_BOOT_AUTOCONF
,
.
line
=
1
,
},
},
...
...
arch/mips/pmc-sierra/yosemite/setup.c
浏览文件 @
17be03f0
...
...
@@ -185,7 +185,7 @@ static void __init py_uart_setup(void)
up
.
uartclk
=
TITAN_UART_CLK
;
up
.
regshift
=
0
;
up
.
iotype
=
UPIO_MEM
;
up
.
flags
=
ASYNC_BOOT_AUTOCONF
|
ASYNC
_SKIP_TEST
;
up
.
flags
=
UPF_BOOT_AUTOCONF
|
UPF
_SKIP_TEST
;
up
.
line
=
0
;
if
(
early_serial_setup
(
&
up
))
...
...
arch/mips/sgi-ip32/ip32-setup.c
浏览文件 @
17be03f0
...
...
@@ -66,11 +66,6 @@ static inline void str2eaddr(unsigned char *ea, unsigned char *str)
#include <linux/tty.h>
#include <linux/serial.h>
#include <linux/serial_core.h>
extern
int
early_serial_setup
(
struct
uart_port
*
port
);
#define STD_COM_FLAGS (ASYNC_SKIP_TEST)
#define BASE_BAUD (1843200 / 16)
#endif
/* CONFIG_SERIAL_8250 */
/* An arbitrary time; this can be decreased if reliability looks good */
...
...
@@ -110,8 +105,8 @@ void __init plat_setup(void)
o2_serial
[
0
].
type
=
PORT_16550A
;
o2_serial
[
0
].
line
=
0
;
o2_serial
[
0
].
irq
=
MACEISA_SERIAL1_IRQ
;
o2_serial
[
0
].
flags
=
STD_COM_FLAGS
;
o2_serial
[
0
].
uartclk
=
BASE_BAUD
*
16
;
o2_serial
[
0
].
flags
=
UPF_SKIP_TEST
;
o2_serial
[
0
].
uartclk
=
1843200
;
o2_serial
[
0
].
iotype
=
UPIO_MEM
;
o2_serial
[
0
].
membase
=
(
char
*
)
&
mace
->
isa
.
serial1
;
o2_serial
[
0
].
fifosize
=
14
;
...
...
@@ -121,8 +116,8 @@ void __init plat_setup(void)
o2_serial
[
1
].
type
=
PORT_16550A
;
o2_serial
[
1
].
line
=
1
;
o2_serial
[
1
].
irq
=
MACEISA_SERIAL2_IRQ
;
o2_serial
[
1
].
flags
=
STD_COM_FLAGS
;
o2_serial
[
1
].
uartclk
=
BASE_BAUD
*
16
;
o2_serial
[
1
].
flags
=
UPF_SKIP_TEST
;
o2_serial
[
1
].
uartclk
=
1843200
;
o2_serial
[
1
].
iotype
=
UPIO_MEM
;
o2_serial
[
1
].
membase
=
(
char
*
)
&
mace
->
isa
.
serial2
;
o2_serial
[
1
].
fifosize
=
14
;
...
...
arch/ppc/platforms/4xx/bamboo.c
浏览文件 @
17be03f0
...
...
@@ -332,8 +332,8 @@ bamboo_early_serial_map(void)
port
.
irq
=
0
;
port
.
uartclk
=
clocks
.
uart0
;
port
.
regshift
=
0
;
port
.
iotype
=
SERIAL_
IO_MEM
;
port
.
flags
=
ASYNC_BOOT_AUTOCONF
|
ASYNC
_SKIP_TEST
;
port
.
iotype
=
UP
IO_MEM
;
port
.
flags
=
UPF_BOOT_AUTOCONF
|
UPF
_SKIP_TEST
;
port
.
line
=
0
;
if
(
early_serial_setup
(
&
port
)
!=
0
)
{
...
...
arch/ppc/platforms/4xx/bubinga.c
浏览文件 @
17be03f0
...
...
@@ -97,8 +97,8 @@ bubinga_early_serial_map(void)
port
.
irq
=
ACTING_UART0_INT
;
port
.
uartclk
=
uart_clock
;
port
.
regshift
=
0
;
port
.
iotype
=
SERIAL_
IO_MEM
;
port
.
flags
=
ASYNC_BOOT_AUTOCONF
|
ASYNC
_SKIP_TEST
;
port
.
iotype
=
UP
IO_MEM
;
port
.
flags
=
UPF_BOOT_AUTOCONF
|
UPF
_SKIP_TEST
;
port
.
line
=
0
;
if
(
early_serial_setup
(
&
port
)
!=
0
)
{
...
...
arch/ppc/platforms/4xx/ebony.c
浏览文件 @
17be03f0
...
...
@@ -225,8 +225,8 @@ ebony_early_serial_map(void)
port
.
irq
=
0
;
port
.
uartclk
=
clocks
.
uart0
;
port
.
regshift
=
0
;
port
.
iotype
=
SERIAL_
IO_MEM
;
port
.
flags
=
ASYNC_BOOT_AUTOCONF
|
ASYNC
_SKIP_TEST
;
port
.
iotype
=
UP
IO_MEM
;
port
.
flags
=
UPF_BOOT_AUTOCONF
|
UPF
_SKIP_TEST
;
port
.
line
=
0
;
if
(
early_serial_setup
(
&
port
)
!=
0
)
{
...
...
arch/ppc/platforms/4xx/luan.c
浏览文件 @
17be03f0
...
...
@@ -279,8 +279,8 @@ luan_early_serial_map(void)
port
.
irq
=
UART0_INT
;
port
.
uartclk
=
clocks
.
uart0
;
port
.
regshift
=
0
;
port
.
iotype
=
SERIAL_
IO_MEM
;
port
.
flags
=
ASYNC_BOOT_AUTOCONF
|
ASYNC
_SKIP_TEST
;
port
.
iotype
=
UP
IO_MEM
;
port
.
flags
=
UPF_BOOT_AUTOCONF
|
UPF
_SKIP_TEST
;
port
.
line
=
0
;
if
(
early_serial_setup
(
&
port
)
!=
0
)
{
...
...
arch/ppc/platforms/4xx/ocotea.c
浏览文件 @
17be03f0
...
...
@@ -248,8 +248,8 @@ ocotea_early_serial_map(void)
port
.
irq
=
UART0_INT
;
port
.
uartclk
=
clocks
.
uart0
;
port
.
regshift
=
0
;
port
.
iotype
=
SERIAL_
IO_MEM
;
port
.
flags
=
ASYNC_BOOT_AUTOCONF
|
ASYNC
_SKIP_TEST
;
port
.
iotype
=
UP
IO_MEM
;
port
.
flags
=
UPF_BOOT_AUTOCONF
|
UPF
_SKIP_TEST
;
port
.
line
=
0
;
if
(
early_serial_setup
(
&
port
)
!=
0
)
{
...
...
arch/ppc/platforms/4xx/xilinx_ml300.c
浏览文件 @
17be03f0
...
...
@@ -95,8 +95,8 @@ ml300_early_serial_map(void)
port
.
irq
=
old_ports
[
i
].
irq
;
port
.
uartclk
=
old_ports
[
i
].
baud_base
*
16
;
port
.
regshift
=
old_ports
[
i
].
iomem_reg_shift
;
port
.
iotype
=
SERIAL_
IO_MEM
;
port
.
flags
=
ASYNC_BOOT_AUTOCONF
|
ASYNC
_SKIP_TEST
;
port
.
iotype
=
UP
IO_MEM
;
port
.
flags
=
UPF_BOOT_AUTOCONF
|
UPF
_SKIP_TEST
;
port
.
line
=
i
;
if
(
early_serial_setup
(
&
port
)
!=
0
)
{
...
...
arch/ppc/platforms/4xx/yucca.c
浏览文件 @
17be03f0
...
...
@@ -305,8 +305,8 @@ yucca_early_serial_map(void)
port
.
irq
=
UART0_INT
;
port
.
uartclk
=
clocks
.
uart0
;
port
.
regshift
=
0
;
port
.
iotype
=
SERIAL_
IO_MEM
;
port
.
flags
=
ASYNC_BOOT_AUTOCONF
|
ASYNC
_SKIP_TEST
;
port
.
iotype
=
UP
IO_MEM
;
port
.
flags
=
UPF_BOOT_AUTOCONF
|
UPF
_SKIP_TEST
;
port
.
line
=
0
;
if
(
early_serial_setup
(
&
port
)
!=
0
)
{
...
...
arch/ppc/platforms/83xx/mpc834x_sys.c
浏览文件 @
17be03f0
...
...
@@ -301,14 +301,14 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
struct
uart_port
p
;
memset
(
&
p
,
0
,
sizeof
(
p
));
p
.
iotype
=
SERIAL_
IO_MEM
;
p
.
iotype
=
UP
IO_MEM
;
p
.
membase
=
(
unsigned
char
__iomem
*
)(
VIRT_IMMRBAR
+
0x4500
);
p
.
uartclk
=
binfo
->
bi_busfreq
;
gen550_init
(
0
,
&
p
);
memset
(
&
p
,
0
,
sizeof
(
p
));
p
.
iotype
=
SERIAL_
IO_MEM
;
p
.
iotype
=
UP
IO_MEM
;
p
.
membase
=
(
unsigned
char
__iomem
*
)(
VIRT_IMMRBAR
+
0x4600
);
p
.
uartclk
=
binfo
->
bi_busfreq
;
...
...
arch/ppc/platforms/85xx/mpc8540_ads.c
浏览文件 @
17be03f0
...
...
@@ -162,14 +162,14 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
binfo
->
bi_immr_base
,
MPC85xx_CCSRBAR_SIZE
,
_PAGE_IO
,
0
);
memset
(
&
p
,
0
,
sizeof
(
p
));
p
.
iotype
=
SERIAL_
IO_MEM
;
p
.
iotype
=
UP
IO_MEM
;
p
.
membase
=
(
void
*
)
binfo
->
bi_immr_base
+
MPC85xx_UART0_OFFSET
;
p
.
uartclk
=
binfo
->
bi_busfreq
;
gen550_init
(
0
,
&
p
);
memset
(
&
p
,
0
,
sizeof
(
p
));
p
.
iotype
=
SERIAL_
IO_MEM
;
p
.
iotype
=
UP
IO_MEM
;
p
.
membase
=
(
void
*
)
binfo
->
bi_immr_base
+
MPC85xx_UART1_OFFSET
;
p
.
uartclk
=
binfo
->
bi_busfreq
;
...
...
arch/ppc/platforms/85xx/mpc85xx_cds_common.c
浏览文件 @
17be03f0
...
...
@@ -534,14 +534,14 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
binfo
->
bi_immr_base
,
MPC85xx_CCSRBAR_SIZE
,
_PAGE_IO
,
0
);
memset
(
&
p
,
0
,
sizeof
(
p
));
p
.
iotype
=
SERIAL_
IO_MEM
;
p
.
iotype
=
UP
IO_MEM
;
p
.
membase
=
(
void
*
)
binfo
->
bi_immr_base
+
MPC85xx_UART0_OFFSET
;
p
.
uartclk
=
binfo
->
bi_busfreq
;
gen550_init
(
0
,
&
p
);
memset
(
&
p
,
0
,
sizeof
(
p
));
p
.
iotype
=
SERIAL_
IO_MEM
;
p
.
iotype
=
UP
IO_MEM
;
p
.
membase
=
(
void
*
)
binfo
->
bi_immr_base
+
MPC85xx_UART1_OFFSET
;
p
.
uartclk
=
binfo
->
bi_busfreq
;
...
...
arch/ppc/platforms/85xx/sbc8560.c
浏览文件 @
17be03f0
...
...
@@ -64,7 +64,7 @@ sbc8560_early_serial_map(void)
uart_req
.
irq
=
MPC85xx_IRQ_EXT9
;
uart_req
.
flags
=
STD_COM_FLAGS
;
uart_req
.
uartclk
=
BASE_BAUD
*
16
;
uart_req
.
iotype
=
SERIAL_
IO_MEM
;
uart_req
.
iotype
=
UP
IO_MEM
;
uart_req
.
mapbase
=
UARTA_ADDR
;
uart_req
.
membase
=
ioremap
(
uart_req
.
mapbase
,
MPC85xx_UART0_SIZE
);
uart_req
.
type
=
PORT_16650
;
...
...
arch/ppc/platforms/85xx/tqm85xx.c
浏览文件 @
17be03f0
...
...
@@ -346,14 +346,14 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
binfo
->
bi_immr_base
,
MPC85xx_CCSRBAR_SIZE
,
_PAGE_IO
,
0
);
memset
(
&
p
,
0
,
sizeof
(
p
));
p
.
iotype
=
SERIAL_
IO_MEM
;
p
.
iotype
=
UP
IO_MEM
;
p
.
membase
=
(
void
*
)
binfo
->
bi_immr_base
+
MPC85xx_UART0_OFFSET
;
p
.
uartclk
=
binfo
->
bi_busfreq
;
gen550_init
(
0
,
&
p
);
memset
(
&
p
,
0
,
sizeof
(
p
));
p
.
iotype
=
SERIAL_
IO_MEM
;
p
.
iotype
=
UP
IO_MEM
;
p
.
membase
=
(
void
*
)
binfo
->
bi_immr_base
+
MPC85xx_UART1_OFFSET
;
p
.
uartclk
=
binfo
->
bi_busfreq
;
...
...
arch/ppc/platforms/chestnut.c
浏览文件 @
17be03f0
...
...
@@ -116,7 +116,7 @@ chestnut_early_serial_map(void)
port
.
uartclk
=
BASE_BAUD
*
16
;
port
.
irq
=
UART0_INT
;
port
.
flags
=
STD_COM_FLAGS
|
UPF_IOREMAP
;
port
.
iotype
=
SERIAL_
IO_MEM
;
port
.
iotype
=
UP
IO_MEM
;
port
.
mapbase
=
CHESTNUT_UART0_IO_BASE
;
port
.
regshift
=
0
;
...
...
arch/ppc/platforms/ev64260.c
浏览文件 @
17be03f0
...
...
@@ -330,7 +330,7 @@ ev64260_early_serial_map(void)
port
.
irq
=
EV64260_UART_0_IRQ
;
port
.
uartclk
=
BASE_BAUD
*
16
;
port
.
regshift
=
2
;
port
.
iotype
=
SERIAL_
IO_MEM
;
port
.
iotype
=
UP
IO_MEM
;
port
.
flags
=
STD_COM_FLAGS
;
#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
...
...
arch/ppc/platforms/radstone_ppc7d.c
浏览文件 @
17be03f0
...
...
@@ -100,7 +100,7 @@ static void __init ppc7d_early_serial_map(void)
serial_req
.
uartclk
=
UART_CLK
;
serial_req
.
irq
=
4
;
serial_req
.
flags
=
STD_COM_FLAGS
;
serial_req
.
iotype
=
SERIAL_
IO_MEM
;
serial_req
.
iotype
=
UP
IO_MEM
;
serial_req
.
membase
=
(
u_char
*
)
PPC7D_SERIAL_0
;
gen550_init
(
0
,
&
serial_req
);
...
...
arch/ppc/platforms/spruce.c
浏览文件 @
17be03f0
...
...
@@ -176,8 +176,8 @@ spruce_early_serial_map(void)
memset
(
&
serial_req
,
0
,
sizeof
(
serial_req
));
serial_req
.
uartclk
=
uart_clk
;
serial_req
.
irq
=
UART0_INT
;
serial_req
.
flags
=
ASYNC
_BOOT_AUTOCONF
;
serial_req
.
iotype
=
SERIAL_
IO_MEM
;
serial_req
.
flags
=
UPF
_BOOT_AUTOCONF
;
serial_req
.
iotype
=
UP
IO_MEM
;
serial_req
.
membase
=
(
u_char
*
)
UART0_IO_BASE
;
serial_req
.
regshift
=
0
;
...
...
arch/ppc/syslib/ppc83xx_setup.c
浏览文件 @
17be03f0
...
...
@@ -108,7 +108,7 @@ mpc83xx_early_serial_map(void)
#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
memset
(
&
serial_req
,
0
,
sizeof
(
serial_req
));
serial_req
.
iotype
=
SERIAL_
IO_MEM
;
serial_req
.
iotype
=
UP
IO_MEM
;
serial_req
.
mapbase
=
pdata
[
0
].
mapbase
;
serial_req
.
membase
=
pdata
[
0
].
membase
;
serial_req
.
regshift
=
0
;
...
...
arch/ppc/syslib/ppc85xx_setup.c
浏览文件 @
17be03f0
...
...
@@ -90,7 +90,7 @@ mpc85xx_early_serial_map(void)
#if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB)
memset
(
&
serial_req
,
0
,
sizeof
(
serial_req
));
serial_req
.
iotype
=
SERIAL_
IO_MEM
;
serial_req
.
iotype
=
UP
IO_MEM
;
serial_req
.
mapbase
=
pdata
[
0
].
mapbase
;
serial_req
.
membase
=
pdata
[
0
].
membase
;
serial_req
.
regshift
=
0
;
...
...
drivers/serial/21285.c
浏览文件 @
17be03f0
...
...
@@ -362,7 +362,7 @@ static struct uart_ops serial21285_ops = {
static
struct
uart_port
serial21285_port
=
{
.
mapbase
=
0x42000160
,
.
iotype
=
SERIAL_
IO_MEM
,
.
iotype
=
UP
IO_MEM
,
.
irq
=
NO_IRQ
,
.
fifosize
=
16
,
.
ops
=
&
serial21285_ops
,
...
...
drivers/serial/8250.c
浏览文件 @
17be03f0
...
...
@@ -2229,6 +2229,7 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
* and restore the IER
*/
wait_for_xmitr
(
up
,
BOTH_EMPTY
);
up
->
ier
|=
UART_IER_THRI
;
serial_out
(
up
,
UART_IER
,
ier
|
UART_IER_THRI
);
}
...
...
drivers/serial/8250_au1x00.c
浏览文件 @
17be03f0
...
...
@@ -56,7 +56,6 @@ static struct plat_serial8250_port au1x00_data[] = {
#elif defined(CONFIG_SOC_AU1550)
PORT
(
UART0_ADDR
,
AU1550_UART0_INT
),
PORT
(
UART1_ADDR
,
AU1550_UART1_INT
),
PORT
(
UART2_ADDR
,
AU1550_UART2_INT
),
PORT
(
UART3_ADDR
,
AU1550_UART3_INT
),
#elif defined(CONFIG_SOC_AU1200)
PORT
(
UART0_ADDR
,
AU1200_UART0_INT
),
...
...
drivers/serial/8250_pci.c
浏览文件 @
17be03f0
...
...
@@ -1882,6 +1882,10 @@ static struct pci_device_id serial_pci_tbl[] = {
PCI_SUBVENDOR_ID_CONNECT_TECH
,
PCI_SUBDEVICE_ID_CONNECT_TECH_TITAN_4
,
0
,
0
,
pbn_b0_4_1843200
},
{
PCI_VENDOR_ID_OXSEMI
,
PCI_DEVICE_ID_OXSEMI_16PCI954
,
PCI_VENDOR_ID_AFAVLAB
,
PCI_SUBDEVICE_ID_AFAVLAB_P061
,
0
,
0
,
pbn_b0_4_1152000
},
{
PCI_VENDOR_ID_EXAR
,
PCI_DEVICE_ID_EXAR_XR17C152
,
PCI_SUBVENDOR_ID_CONNECT_TECH
,
PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_2_232
,
0
,
0
,
...
...
drivers/serial/amba-pl010.c
浏览文件 @
17be03f0
...
...
@@ -561,7 +561,7 @@ static struct uart_amba_port amba_ports[UART_NR] = {
.
port
=
{
.
membase
=
(
void
*
)
IO_ADDRESS
(
INTEGRATOR_UART0_BASE
),
.
mapbase
=
INTEGRATOR_UART0_BASE
,
.
iotype
=
SERIAL_
IO_MEM
,
.
iotype
=
UP
IO_MEM
,
.
irq
=
IRQ_UARTINT0
,
.
uartclk
=
14745600
,
.
fifosize
=
16
,
...
...
@@ -576,7 +576,7 @@ static struct uart_amba_port amba_ports[UART_NR] = {
.
port
=
{
.
membase
=
(
void
*
)
IO_ADDRESS
(
INTEGRATOR_UART1_BASE
),
.
mapbase
=
INTEGRATOR_UART1_BASE
,
.
iotype
=
SERIAL_
IO_MEM
,
.
iotype
=
UP
IO_MEM
,
.
irq
=
IRQ_UARTINT1
,
.
uartclk
=
14745600
,
.
fifosize
=
16
,
...
...
drivers/serial/au1x00_uart.c
浏览文件 @
17be03f0
...
...
@@ -892,7 +892,7 @@ serial8250_request_std_resource(struct uart_8250_port *up, struct resource **res
int
ret
=
0
;
switch
(
up
->
port
.
iotype
)
{
case
SERIAL_
IO_MEM
:
case
UP
IO_MEM
:
if
(
up
->
port
.
mapbase
)
{
*
res
=
request_mem_region
(
up
->
port
.
mapbase
,
size
,
"serial"
);
if
(
!*
res
)
...
...
@@ -900,8 +900,8 @@ serial8250_request_std_resource(struct uart_8250_port *up, struct resource **res
}
break
;
case
SERIAL_
IO_HUB6
:
case
SERIAL_
IO_PORT
:
case
UP
IO_HUB6
:
case
UP
IO_PORT
:
*
res
=
request_region
(
up
->
port
.
iobase
,
size
,
"serial"
);
if
(
!*
res
)
ret
=
-
EBUSY
;
...
...
@@ -919,7 +919,7 @@ static void serial8250_release_port(struct uart_port *port)
size
<<=
up
->
port
.
regshift
;
switch
(
up
->
port
.
iotype
)
{
case
SERIAL_
IO_MEM
:
case
UP
IO_MEM
:
if
(
up
->
port
.
mapbase
)
{
/*
* Unmap the area.
...
...
@@ -935,8 +935,8 @@ static void serial8250_release_port(struct uart_port *port)
}
break
;
case
SERIAL_
IO_HUB6
:
case
SERIAL_
IO_PORT
:
case
UP
IO_HUB6
:
case
UP
IO_PORT
:
start
=
up
->
port
.
iobase
;
if
(
size
)
...
...
drivers/serial/cpm_uart/cpm_uart_core.c
浏览文件 @
17be03f0
...
...
@@ -252,12 +252,9 @@ static void cpm_uart_int_rx(struct uart_port *port, struct pt_regs *regs)
/* If we have not enough room in tty flip buffer, then we try
* later, which will be the next rx-interrupt or a timeout
*/
if
((
tty
->
flip
.
count
+
i
)
>=
TTY_FLIPBUF_SIZE
)
{
tty
->
flip
.
work
.
func
((
void
*
)
tty
);
if
((
tty
->
flip
.
count
+
i
)
>=
TTY_FLIPBUF_SIZE
)
{
printk
(
KERN_WARNING
"TTY_DONT_FLIP set
\n
"
);
return
;
}
if
(
tty_buffer_request_room
(
tty
,
i
)
<
i
)
{
printk
(
KERN_WARNING
"No room in flip buffer
\n
"
);
return
;
}
/* get pointer */
...
...
@@ -276,9 +273,7 @@ static void cpm_uart_int_rx(struct uart_port *port, struct pt_regs *regs)
continue
;
error_return:
*
tty
->
flip
.
char_buf_ptr
++
=
ch
;
*
tty
->
flip
.
flag_buf_ptr
++
=
flg
;
tty
->
flip
.
count
++
;
tty_insert_flip_char
(
tty
,
ch
,
flg
);
}
/* End while (i--) */
...
...
@@ -908,7 +903,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = {
.
port
=
{
.
irq
=
SMC1_IRQ
,
.
ops
=
&
cpm_uart_pops
,
.
iotype
=
SERIAL_
IO_MEM
,
.
iotype
=
UP
IO_MEM
,
.
lock
=
SPIN_LOCK_UNLOCKED
,
},
.
flags
=
FLAG_SMC
,
...
...
@@ -922,7 +917,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = {
.
port
=
{
.
irq
=
SMC2_IRQ
,
.
ops
=
&
cpm_uart_pops
,
.
iotype
=
SERIAL_
IO_MEM
,
.
iotype
=
UP
IO_MEM
,
.
lock
=
SPIN_LOCK_UNLOCKED
,
},
.
flags
=
FLAG_SMC
,
...
...
@@ -939,7 +934,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = {
.
port
=
{
.
irq
=
SCC1_IRQ
,
.
ops
=
&
cpm_uart_pops
,
.
iotype
=
SERIAL_
IO_MEM
,
.
iotype
=
UP
IO_MEM
,
.
lock
=
SPIN_LOCK_UNLOCKED
,
},
.
tx_nrfifos
=
TX_NUM_FIFO
,
...
...
@@ -953,7 +948,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = {
.
port
=
{
.
irq
=
SCC2_IRQ
,
.
ops
=
&
cpm_uart_pops
,
.
iotype
=
SERIAL_
IO_MEM
,
.
iotype
=
UP
IO_MEM
,
.
lock
=
SPIN_LOCK_UNLOCKED
,
},
.
tx_nrfifos
=
TX_NUM_FIFO
,
...
...
@@ -967,7 +962,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = {
.
port
=
{
.
irq
=
SCC3_IRQ
,
.
ops
=
&
cpm_uart_pops
,
.
iotype
=
SERIAL_
IO_MEM
,
.
iotype
=
UP
IO_MEM
,
.
lock
=
SPIN_LOCK_UNLOCKED
,
},
.
tx_nrfifos
=
TX_NUM_FIFO
,
...
...
@@ -981,7 +976,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = {
.
port
=
{
.
irq
=
SCC4_IRQ
,
.
ops
=
&
cpm_uart_pops
,
.
iotype
=
SERIAL_
IO_MEM
,
.
iotype
=
UP
IO_MEM
,
.
lock
=
SPIN_LOCK_UNLOCKED
,
},
.
tx_nrfifos
=
TX_NUM_FIFO
,
...
...
drivers/serial/dz.c
浏览文件 @
17be03f0
...
...
@@ -262,6 +262,7 @@ static inline void dz_receive_chars(struct dz_port *dport)
}
tty_insert_flip_char
(
tty
,
ch
,
flag
);
ignore_char:
;
}
while
(
status
&
DZ_DVAL
);
if
(
tty
)
...
...
@@ -650,7 +651,7 @@ static void __init dz_init_ports(void)
for
(
i
=
0
,
dport
=
dz_ports
;
i
<
DZ_NB_PORT
;
i
++
,
dport
++
)
{
spin_lock_init
(
&
dport
->
port
.
lock
);
dport
->
port
.
membase
=
(
char
*
)
base
;
dport
->
port
.
iotype
=
SERIAL_
IO_PORT
;
dport
->
port
.
iotype
=
UP
IO_PORT
;
dport
->
port
.
irq
=
dec_interrupt
[
DEC_IRQ_DZ11
];
dport
->
port
.
line
=
i
;
dport
->
port
.
fifosize
=
1
;
...
...
drivers/serial/imx.c
浏览文件 @
17be03f0
...
...
@@ -668,7 +668,7 @@ static struct imx_port imx_ports[] = {
.
rtsirq
=
UART1_MINT_RTS
,
.
port
=
{
.
type
=
PORT_IMX
,
.
iotype
=
SERIAL_
IO_MEM
,
.
iotype
=
UP
IO_MEM
,
.
membase
=
(
void
*
)
IMX_UART1_BASE
,
.
mapbase
=
IMX_UART1_BASE
,
/* FIXME */
.
irq
=
UART1_MINT_RX
,
...
...
@@ -684,7 +684,7 @@ static struct imx_port imx_ports[] = {
.
rtsirq
=
UART2_MINT_RTS
,
.
port
=
{
.
type
=
PORT_IMX
,
.
iotype
=
SERIAL_
IO_MEM
,
.
iotype
=
UP
IO_MEM
,
.
membase
=
(
void
*
)
IMX_UART2_BASE
,
.
mapbase
=
IMX_UART2_BASE
,
/* FIXME */
.
irq
=
UART2_MINT_RX
,
...
...
drivers/serial/ip22zilog.c
浏览文件 @
17be03f0
...
...
@@ -215,7 +215,7 @@ static void __load_zsregs(struct zilog_channel *channel, unsigned char *regs)
/* Lower and upper byte of baud rate generator divisor. */
write_zsreg
(
channel
,
R12
,
regs
[
R12
]);
write_zsreg
(
channel
,
R13
,
regs
[
R13
]);
/* Now rewrite R14, with BRENAB (if set). */
write_zsreg
(
channel
,
R14
,
regs
[
R14
]);
...
...
@@ -571,7 +571,7 @@ static void ip22zilog_set_mctrl(struct uart_port *port, unsigned int mctrl)
else
clear_bits
|=
DTR
;
/* NOTE: Not subject to 'transmitter active' rule. */
/* NOTE: Not subject to 'transmitter active' rule. */
up
->
curregs
[
R5
]
|=
set_bits
;
up
->
curregs
[
R5
]
&=
~
clear_bits
;
write_zsreg
(
channel
,
R5
,
up
->
curregs
[
R5
]);
...
...
@@ -654,7 +654,7 @@ static void ip22zilog_enable_ms(struct uart_port *port)
if
(
new_reg
!=
up
->
curregs
[
R15
])
{
up
->
curregs
[
R15
]
=
new_reg
;
/* NOTE: Not subject to 'transmitter active' rule. */
/* NOTE: Not subject to 'transmitter active' rule. */
write_zsreg
(
channel
,
R15
,
up
->
curregs
[
R15
]);
}
}
...
...
@@ -680,7 +680,7 @@ static void ip22zilog_break_ctl(struct uart_port *port, int break_state)
if
(
new_reg
!=
up
->
curregs
[
R5
])
{
up
->
curregs
[
R5
]
=
new_reg
;
/* NOTE: Not subject to 'transmitter active' rule. */
/* NOTE: Not subject to 'transmitter active' rule. */
write_zsreg
(
channel
,
R5
,
up
->
curregs
[
R5
]);
}
...
...
drivers/serial/m32r_sio.c
浏览文件 @
17be03f0
...
...
@@ -80,7 +80,7 @@
#include <asm/serial.h>
/* Standard COM flags */
#define STD_COM_FLAGS (
ASYNC_BOOT_AUTOCONF | ASYNC
_SKIP_TEST)
#define STD_COM_FLAGS (
UPF_BOOT_AUTOCONF | UPF
_SKIP_TEST)
/*
* SERIAL_PORT_DFNS tells us about built-in ports that have no
...
...
drivers/serial/mux.c
浏览文件 @
17be03f0
...
...
@@ -462,7 +462,7 @@ static int __init mux_probe(struct parisc_device *dev)
port
->
mapbase
=
dev
->
hpa
.
start
+
MUX_OFFSET
+
(
i
*
MUX_LINE_OFFSET
);
port
->
membase
=
ioremap
(
port
->
mapbase
,
MUX_LINE_OFFSET
);
port
->
iotype
=
SERIAL_
IO_MEM
;
port
->
iotype
=
UP
IO_MEM
;
port
->
type
=
PORT_MUX
;
port
->
irq
=
NO_IRQ
;
port
->
uartclk
=
0
;
...
...
drivers/serial/pmac_zilog.c
浏览文件 @
17be03f0
...
...
@@ -1492,7 +1492,7 @@ static int __init pmz_init_port(struct uart_pmac_port *uap)
/*
* Init remaining bits of "port" structure
*/
uap
->
port
.
iotype
=
SERIAL_
IO_MEM
;
uap
->
port
.
iotype
=
UP
IO_MEM
;
uap
->
port
.
irq
=
np
->
intrs
[
0
].
line
;
uap
->
port
.
uartclk
=
ZS_CLOCK
;
uap
->
port
.
fifosize
=
1
;
...
...
drivers/serial/sa1100.c
浏览文件 @
17be03f0
...
...
@@ -628,7 +628,7 @@ static void __init sa1100_init_ports(void)
sa1100_ports
[
i
].
port
.
ops
=
&
sa1100_pops
;
sa1100_ports
[
i
].
port
.
fifosize
=
8
;
sa1100_ports
[
i
].
port
.
line
=
i
;
sa1100_ports
[
i
].
port
.
iotype
=
SERIAL_
IO_MEM
;
sa1100_ports
[
i
].
port
.
iotype
=
UP
IO_MEM
;
init_timer
(
&
sa1100_ports
[
i
].
timer
);
sa1100_ports
[
i
].
timer
.
function
=
sa1100_timeout
;
sa1100_ports
[
i
].
timer
.
data
=
(
unsigned
long
)
&
sa1100_ports
[
i
];
...
...
drivers/serial/serial_lh7a40x.c
浏览文件 @
17be03f0
...
...
@@ -501,7 +501,7 @@ static struct uart_port_lh7a40x lh7a40x_ports[DEV_NR] = {
.
port
=
{
.
membase
=
(
void
*
)
io_p2v
(
UART1_PHYS
),
.
mapbase
=
UART1_PHYS
,
.
iotype
=
SERIAL_
IO_MEM
,
.
iotype
=
UP
IO_MEM
,
.
irq
=
IRQ_UART1INTR
,
.
uartclk
=
14745600
/
2
,
.
fifosize
=
16
,
...
...
@@ -514,7 +514,7 @@ static struct uart_port_lh7a40x lh7a40x_ports[DEV_NR] = {
.
port
=
{
.
membase
=
(
void
*
)
io_p2v
(
UART2_PHYS
),
.
mapbase
=
UART2_PHYS
,
.
iotype
=
SERIAL_
IO_MEM
,
.
iotype
=
UP
IO_MEM
,
.
irq
=
IRQ_UART2INTR
,
.
uartclk
=
14745600
/
2
,
.
fifosize
=
16
,
...
...
@@ -527,7 +527,7 @@ static struct uart_port_lh7a40x lh7a40x_ports[DEV_NR] = {
.
port
=
{
.
membase
=
(
void
*
)
io_p2v
(
UART3_PHYS
),
.
mapbase
=
UART3_PHYS
,
.
iotype
=
SERIAL_
IO_MEM
,
.
iotype
=
UP
IO_MEM
,
.
irq
=
IRQ_UART3INTR
,
.
uartclk
=
14745600
/
2
,
.
fifosize
=
16
,
...
...
drivers/serial/sh-sci.c
浏览文件 @
17be03f0
...
...
@@ -1468,10 +1468,10 @@ static struct sci_port sci_ports[] = {
.
port
=
{
.
membase
=
(
void
*
)
0xff923000
,
.
mapbase
=
0xff923000
,
.
iotype
=
SERIAL_
IO_MEM
,
.
iotype
=
UP
IO_MEM
,
.
irq
=
61
,
.
ops
=
&
sci_uart_ops
,
.
flags
=
ASYNC
_BOOT_AUTOCONF
,
.
flags
=
UPF
_BOOT_AUTOCONF
,
.
line
=
0
,
},
.
type
=
PORT_SCIF
,
...
...
@@ -1482,10 +1482,10 @@ static struct sci_port sci_ports[] = {
.
port
=
{
.
membase
=
(
void
*
)
0xff924000
,
.
mapbase
=
0xff924000
,
.
iotype
=
SERIAL_
IO_MEM
,
.
iotype
=
UP
IO_MEM
,
.
irq
=
62
,
.
ops
=
&
sci_uart_ops
,
.
flags
=
ASYNC
_BOOT_AUTOCONF
,
.
flags
=
UPF
_BOOT_AUTOCONF
,
.
line
=
1
,
},
.
type
=
PORT_SCIF
,
...
...
@@ -1496,10 +1496,10 @@ static struct sci_port sci_ports[] = {
.
port
=
{
.
membase
=
(
void
*
)
0xff925000
,
.
mapbase
=
0xff925000
,
.
iotype
=
SERIAL_
IO_MEM
,
.
iotype
=
UP
IO_MEM
,
.
irq
=
63
,
.
ops
=
&
sci_uart_ops
,
.
flags
=
ASYNC
_BOOT_AUTOCONF
,
.
flags
=
UPF
_BOOT_AUTOCONF
,
.
line
=
2
,
},
.
type
=
PORT_SCIF
,
...
...
@@ -1511,10 +1511,10 @@ static struct sci_port sci_ports[] = {
.
port
=
{
.
membase
=
(
void
*
)
0xffe00000
,
.
mapbase
=
0xffe00000
,
.
iotype
=
SERIAL_
IO_MEM
,
.
iotype
=
UP
IO_MEM
,
.
irq
=
43
,
.
ops
=
&
sci_uart_ops
,
.
flags
=
ASYNC
_BOOT_AUTOCONF
,
.
flags
=
UPF
_BOOT_AUTOCONF
,
.
line
=
0
,
},
.
type
=
PORT_SCIF
,
...
...
@@ -1525,10 +1525,10 @@ static struct sci_port sci_ports[] = {
.
port
=
{
.
membase
=
(
void
*
)
0xffe10000
,
.
mapbase
=
0xffe10000
,
.
iotype
=
SERIAL_
IO_MEM
,
.
iotype
=
UP
IO_MEM
,
.
irq
=
79
,
.
ops
=
&
sci_uart_ops
,
.
flags
=
ASYNC
_BOOT_AUTOCONF
,
.
flags
=
UPF
_BOOT_AUTOCONF
,
.
line
=
1
,
},
.
type
=
PORT_SCIF
,
...
...
drivers/serial/sunsab.c
浏览文件 @
17be03f0
...
...
@@ -1036,7 +1036,7 @@ static void __init sab_attach_callback(struct linux_ebus_device *edev, void *arg
up
->
port
.
irq
=
edev
->
irqs
[
0
];
up
->
port
.
fifosize
=
SAB82532_XMIT_FIFO_SIZE
;
up
->
port
.
mapbase
=
(
unsigned
long
)
up
->
regs
;
up
->
port
.
iotype
=
SERIAL_
IO_MEM
;
up
->
port
.
iotype
=
UP
IO_MEM
;
writeb
(
SAB82532_IPC_IC_ACT_LOW
,
&
up
->
regs
->
w
.
ipc
);
...
...
drivers/serial/sunsu.c
浏览文件 @
17be03f0
...
...
@@ -109,11 +109,11 @@ static _INLINE_ unsigned int serial_in(struct uart_sunsu_port *up, int offset)
offset
<<=
up
->
port
.
regshift
;
switch
(
up
->
port
.
iotype
)
{
case
SERIAL_
IO_HUB6
:
case
UP
IO_HUB6
:
outb
(
up
->
port
.
hub6
-
1
+
offset
,
up
->
port
.
iobase
);
return
inb
(
up
->
port
.
iobase
+
1
);
case
SERIAL_
IO_MEM
:
case
UP
IO_MEM
:
return
readb
(
up
->
port
.
membase
+
offset
);
default:
...
...
@@ -139,12 +139,12 @@ serial_out(struct uart_sunsu_port *up, int offset, int value)
offset
<<=
up
->
port
.
regshift
;
switch
(
up
->
port
.
iotype
)
{
case
SERIAL_
IO_HUB6
:
case
UP
IO_HUB6
:
outb
(
up
->
port
.
hub6
-
1
+
offset
,
up
->
port
.
iobase
);
outb
(
value
,
up
->
port
.
iobase
+
1
);
break
;
case
SERIAL_
IO_MEM
:
case
UP
IO_MEM
:
writeb
(
value
,
up
->
port
.
membase
+
offset
);
break
;
...
...
@@ -1052,7 +1052,7 @@ static void sunsu_autoconfig(struct uart_sunsu_port *up)
return
;
up
->
type_probed
=
PORT_UNKNOWN
;
up
->
port
.
iotype
=
SERIAL_
IO_MEM
;
up
->
port
.
iotype
=
UP
IO_MEM
;
/*
* First we look for Ebus-bases su's
...
...
drivers/serial/sunzilog.c
浏览文件 @
17be03f0
...
...
@@ -1487,7 +1487,7 @@ static void __init sunzilog_prepare(void)
up
[(
chip
*
2
)
+
1
].
port
.
membase
=
(
void
__iomem
*
)
&
rp
->
channelB
;
/* Channel A */
up
[(
chip
*
2
)
+
0
].
port
.
iotype
=
SERIAL_
IO_MEM
;
up
[(
chip
*
2
)
+
0
].
port
.
iotype
=
UP
IO_MEM
;
up
[(
chip
*
2
)
+
0
].
port
.
irq
=
zilog_irq
;
up
[(
chip
*
2
)
+
0
].
port
.
uartclk
=
ZS_CLOCK
;
up
[(
chip
*
2
)
+
0
].
port
.
fifosize
=
1
;
...
...
@@ -1498,7 +1498,7 @@ static void __init sunzilog_prepare(void)
up
[(
chip
*
2
)
+
0
].
flags
|=
SUNZILOG_FLAG_IS_CHANNEL_A
;
/* Channel B */
up
[(
chip
*
2
)
+
1
].
port
.
iotype
=
SERIAL_
IO_MEM
;
up
[(
chip
*
2
)
+
1
].
port
.
iotype
=
UP
IO_MEM
;
up
[(
chip
*
2
)
+
1
].
port
.
irq
=
zilog_irq
;
up
[(
chip
*
2
)
+
1
].
port
.
uartclk
=
ZS_CLOCK
;
up
[(
chip
*
2
)
+
1
].
port
.
fifosize
=
1
;
...
...
drivers/serial/v850e_uart.c
浏览文件 @
17be03f0
...
...
@@ -496,7 +496,7 @@ static int __init v850e_uart_init (void)
port
->
ops
=
&
v850e_uart_ops
;
port
->
line
=
chan
;
port
->
iotype
=
SERIAL_
IO_MEM
;
port
->
iotype
=
UP
IO_MEM
;
port
->
flags
=
UPF_BOOT_AUTOCONF
;
/* We actually use multiple IRQs, but the serial
...
...
include/linux/pci_ids.h
浏览文件 @
17be03f0
...
...
@@ -1832,6 +1832,7 @@
#define PCI_VENDOR_ID_AFAVLAB 0x14db
#define PCI_DEVICE_ID_AFAVLAB_P028 0x2180
#define PCI_DEVICE_ID_AFAVLAB_P030 0x2182
#define PCI_SUBDEVICE_ID_AFAVLAB_P061 0x2150
#define PCI_VENDOR_ID_BROADCOM 0x14e4
#define PCI_DEVICE_ID_TIGON3_5752 0x1600
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录