Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
ab3bd08a
C
clone-Linux
项目概览
gsplhtlxg
/
clone-Linux
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
clone-Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ab3bd08a
编写于
10月 30, 2008
作者:
R
Russell King
提交者:
Russell King
10月 30, 2008
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'for-rmk-rc' of
git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6
上级
9c656850
2eca047b
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
29 addition
and
7 deletion
+29
-7
arch/arm/mach-mx3/mx31ads.c
arch/arm/mach-mx3/mx31ads.c
+2
-0
arch/arm/mach-mx3/pcm037.c
arch/arm/mach-mx3/pcm037.c
+2
-2
arch/arm/plat-mxc/gpio.c
arch/arm/plat-mxc/gpio.c
+1
-1
arch/arm/plat-mxc/include/mach/io.h
arch/arm/plat-mxc/include/mach/io.h
+20
-0
drivers/serial/Kconfig
drivers/serial/Kconfig
+2
-2
drivers/serial/netx-serial.c
drivers/serial/netx-serial.c
+2
-2
未找到文件。
arch/arm/mach-mx3/mx31ads.c
浏览文件 @
ab3bd08a
...
...
@@ -35,6 +35,8 @@
#include <mach/imx-uart.h>
#include <mach/iomux-mx3.h>
#include "devices.h"
/*!
* @file mx31ads.c
*
...
...
arch/arm/mach-mx3/pcm037.c
浏览文件 @
ab3bd08a
...
...
@@ -91,12 +91,12 @@ static struct map_desc pcm037_io_desc[] __initdata = {
.
virtual
=
AIPS1_BASE_ADDR_VIRT
,
.
pfn
=
__phys_to_pfn
(
AIPS1_BASE_ADDR
),
.
length
=
AIPS1_SIZE
,
.
type
=
MT_DEVICE
.
type
=
MT_DEVICE
_NONSHARED
},
{
.
virtual
=
AIPS2_BASE_ADDR_VIRT
,
.
pfn
=
__phys_to_pfn
(
AIPS2_BASE_ADDR
),
.
length
=
AIPS2_SIZE
,
.
type
=
MT_DEVICE
.
type
=
MT_DEVICE
_NONSHARED
},
};
...
...
arch/arm/plat-mxc/gpio.c
浏览文件 @
ab3bd08a
...
...
@@ -188,7 +188,7 @@ static int mxc_gpio_get(struct gpio_chip *chip, unsigned offset)
struct
mxc_gpio_port
*
port
=
container_of
(
chip
,
struct
mxc_gpio_port
,
chip
);
return
(
__raw_readl
(
port
->
base
+
GPIO_
D
R
)
>>
offset
)
&
1
;
return
(
__raw_readl
(
port
->
base
+
GPIO_
PS
R
)
>>
offset
)
&
1
;
}
static
int
mxc_gpio_direction_input
(
struct
gpio_chip
*
chip
,
unsigned
offset
)
...
...
arch/arm/plat-mxc/include/mach/io.h
浏览文件 @
ab3bd08a
...
...
@@ -14,6 +14,26 @@
/* Allow IO space to be anywhere in the memory */
#define IO_SPACE_LIMIT 0xffffffff
#ifdef CONFIG_ARCH_MX3
#define __arch_ioremap __mx3_ioremap
#define __arch_iounmap __iounmap
static
inline
void
__iomem
*
__mx3_ioremap
(
unsigned
long
phys_addr
,
size_t
size
,
unsigned
int
mtype
)
{
if
(
mtype
==
MT_DEVICE
)
{
/* Access all peripherals below 0x80000000 as nonshared device
* but leave l2cc alone.
*/
if
((
phys_addr
<
0x80000000
)
&&
((
phys_addr
<
L2CC_BASE_ADDR
)
||
(
phys_addr
>=
L2CC_BASE_ADDR
+
L2CC_SIZE
)))
mtype
=
MT_DEVICE_NONSHARED
;
}
return
__arm_ioremap
(
phys_addr
,
size
,
mtype
);
}
#endif
/* io address mapping macro */
#define __io(a) ((void __iomem *)(a))
...
...
drivers/serial/Kconfig
浏览文件 @
ab3bd08a
...
...
@@ -1276,7 +1276,7 @@ config SERIAL_SGI_IOC3
say Y or M. Otherwise, say N.
config SERIAL_NETX
bool
"NetX serial port support"
tristate
"NetX serial port support"
depends on ARM && ARCH_NETX
select SERIAL_CORE
help
...
...
@@ -1288,7 +1288,7 @@ config SERIAL_NETX
config SERIAL_NETX_CONSOLE
bool "Console on NetX serial port"
depends on SERIAL_NETX
depends on SERIAL_NETX
=y
select SERIAL_CORE_CONSOLE
help
If you have enabled the serial port on the Hilscher NetX SoC
...
...
drivers/serial/netx-serial.c
浏览文件 @
ab3bd08a
...
...
@@ -42,8 +42,6 @@
#define SERIAL_NX_MAJOR 204
#define MINOR_START 170
#ifdef CONFIG_SERIAL_NETX_CONSOLE
enum
uart_regs
{
UART_DR
=
0x00
,
UART_SR
=
0x04
,
...
...
@@ -528,6 +526,8 @@ static struct netx_port netx_ports[] = {
}
};
#ifdef CONFIG_SERIAL_NETX_CONSOLE
static
void
netx_console_putchar
(
struct
uart_port
*
port
,
int
ch
)
{
while
(
readl
(
port
->
membase
+
UART_FR
)
&
FR_BUSY
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录