Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Linux-御风守护者
linux
提交
da7ba956
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,发现更多精彩内容 >>
提交
da7ba956
编写于
1月 17, 2010
作者:
R
Russell King
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ARM: Integrator: fix Integrator/CP definitions, move to platform.h
Signed-off-by:
N
Russell King
<
rmk+kernel@arm.linux.org.uk
>
上级
861248d1
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
28 addition
and
28 deletion
+28
-28
arch/arm/mach-integrator/include/mach/platform.h
arch/arm/mach-integrator/include/mach/platform.h
+8
-6
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-integrator/integrator_ap.c
+2
-2
arch/arm/mach-integrator/integrator_cp.c
arch/arm/mach-integrator/integrator_cp.c
+18
-20
未找到文件。
arch/arm/mach-integrator/include/mach/platform.h
浏览文件 @
da7ba956
...
...
@@ -290,12 +290,14 @@
#define INTEGRATOR_DBG_LEDS (INTEGRATOR_DBG_BASE + INTEGRATOR_DBG_LEDS_OFFSET)
#define INTEGRATOR_DBG_SWITCH (INTEGRATOR_DBG_BASE + INTEGRATOR_DBG_SWITCH_OFFSET)
#if defined(CONFIG_ARCH_INTEGRATOR_AP)
#define INTEGRATOR_GPIO_BASE 0x1B000000
/* GPIO */
#elif defined(CONFIG_ARCH_INTEGRATOR_CP)
#define INTEGRATOR_GPIO_BASE 0xC9000000
/* GPIO */
#endif
#define INTEGRATOR_AP_GPIO_BASE 0x1B000000
/* GPIO */
#define INTEGRATOR_CP_MMC_BASE 0x1C000000
/* MMC */
#define INTEGRATOR_CP_AACI_BASE 0x1D000000
/* AACI */
#define INTEGRATOR_CP_ETH_BASE 0xC8000000
/* Ethernet */
#define INTEGRATOR_CP_GPIO_BASE 0xC9000000
/* GPIO */
#define INTEGRATOR_CP_SIC_BASE 0xCA000000
/* SIC */
#define INTEGRATOR_CP_CTL_BASE 0xCB000000
/* CP system control */
/* ------------------------------------------------------------------------
* KMI keyboard/mouse definitions
...
...
arch/arm/mach-integrator/integrator_ap.c
浏览文件 @
da7ba956
...
...
@@ -118,8 +118,8 @@ static struct map_desc ap_io_desc[] __initdata = {
.
length
=
SZ_4K
,
.
type
=
MT_DEVICE
},
{
.
virtual
=
IO_ADDRESS
(
INTEGRATOR_GPIO_BASE
),
.
pfn
=
__phys_to_pfn
(
INTEGRATOR_GPIO_BASE
),
.
virtual
=
IO_ADDRESS
(
INTEGRATOR_
AP_
GPIO_BASE
),
.
pfn
=
__phys_to_pfn
(
INTEGRATOR_
AP_
GPIO_BASE
),
.
length
=
SZ_4K
,
.
type
=
MT_DEVICE
},
{
...
...
arch/arm/mach-integrator/integrator_cp.c
浏览文件 @
da7ba956
...
...
@@ -42,9 +42,6 @@
#include "common.h"
#define INTCP_PA_MMC_BASE 0x1c000000
#define INTCP_PA_AACI_BASE 0x1d000000
#define INTCP_PA_FLASH_BASE 0x24000000
#define INTCP_FLASH_SIZE SZ_32M
...
...
@@ -52,12 +49,11 @@
#define INTCP_VA_CIC_BASE IO_ADDRESS(INTEGRATOR_HDR_BASE) + 0x40
#define INTCP_VA_PIC_BASE IO_ADDRESS(INTEGRATOR_IC_BASE)
#define INTCP_VA_SIC_BASE IO_ADDRESS(
0xca000000
)
#define INTCP_VA_SIC_BASE IO_ADDRESS(
INTEGRATOR_CP_SIC_BASE
)
#define INTCP_PA_ETH_BASE 0xc8000000
#define INTCP_ETH_SIZE 0x10
#define INTCP_VA_CTRL_BASE IO_ADDRESS(
0xcb000000
)
#define INTCP_VA_CTRL_BASE IO_ADDRESS(
INTEGRATOR_CP_CTL_BASE
)
#define INTCP_FLASHPROG 0x04
#define CINTEGRATOR_FLASHPROG_FLVPPEN (1 << 0)
#define CINTEGRATOR_FLASHPROG_FLWREN (1 << 1)
...
...
@@ -72,7 +68,9 @@
* f1600000 16000000 UART 0
* f1700000 17000000 UART 1
* f1a00000 1a000000 Debug LEDs
* f1b00000 1b000000 GPIO
* fc900000 c9000000 GPIO
* fca00000 ca000000 SIC
* fcb00000 cb000000 CP system control
*/
static
struct
map_desc
intcp_io_desc
[]
__initdata
=
{
...
...
@@ -117,18 +115,18 @@ static struct map_desc intcp_io_desc[] __initdata = {
.
length
=
SZ_4K
,
.
type
=
MT_DEVICE
},
{
.
virtual
=
IO_ADDRESS
(
INTEGRATOR_GPIO_BASE
),
.
pfn
=
__phys_to_pfn
(
INTEGRATOR_GPIO_BASE
),
.
virtual
=
IO_ADDRESS
(
INTEGRATOR_
CP_
GPIO_BASE
),
.
pfn
=
__phys_to_pfn
(
INTEGRATOR_
CP_
GPIO_BASE
),
.
length
=
SZ_4K
,
.
type
=
MT_DEVICE
},
{
.
virtual
=
IO_ADDRESS
(
0xca000000
),
.
pfn
=
__phys_to_pfn
(
0xca000000
),
.
virtual
=
IO_ADDRESS
(
INTEGRATOR_CP_SIC_BASE
),
.
pfn
=
__phys_to_pfn
(
INTEGRATOR_CP_SIC_BASE
),
.
length
=
SZ_4K
,
.
type
=
MT_DEVICE
},
{
.
virtual
=
IO_ADDRESS
(
0xcb000000
),
.
pfn
=
__phys_to_pfn
(
0xcb000000
),
.
virtual
=
IO_ADDRESS
(
INTEGRATOR_CP_CTL_BASE
),
.
pfn
=
__phys_to_pfn
(
INTEGRATOR_CP_CTL_BASE
),
.
length
=
SZ_4K
,
.
type
=
MT_DEVICE
}
...
...
@@ -364,8 +362,8 @@ static struct platform_device intcp_flash_device = {
static
struct
resource
smc91x_resources
[]
=
{
[
0
]
=
{
.
start
=
INT
CP_PA
_ETH_BASE
,
.
end
=
INT
CP_PA
_ETH_BASE
+
INTCP_ETH_SIZE
-
1
,
.
start
=
INT
EGRATOR_CP
_ETH_BASE
,
.
end
=
INT
EGRATOR_CP
_ETH_BASE
+
INTCP_ETH_SIZE
-
1
,
.
flags
=
IORESOURCE_MEM
,
},
[
1
]
=
{
...
...
@@ -396,7 +394,7 @@ static struct platform_device *intcp_devs[] __initdata = {
static
unsigned
int
mmc_status
(
struct
device
*
dev
)
{
unsigned
int
status
=
readl
(
IO_ADDRESS
(
0xca000000
)
+
4
);
writel
(
8
,
IO_ADDRESS
(
0xcb000000
)
+
8
);
writel
(
8
,
IO_ADDRESS
(
INTEGRATOR_CP_CTL_BASE
)
+
8
);
return
status
&
8
;
}
...
...
@@ -414,8 +412,8 @@ static struct amba_device mmc_device = {
.
platform_data
=
&
mmc_data
,
},
.
res
=
{
.
start
=
INT
CP_PA
_MMC_BASE
,
.
end
=
INT
CP_PA
_MMC_BASE
+
SZ_4K
-
1
,
.
start
=
INT
EGRATOR_CP
_MMC_BASE
,
.
end
=
INT
EGRATOR_CP
_MMC_BASE
+
SZ_4K
-
1
,
.
flags
=
IORESOURCE_MEM
,
},
.
irq
=
{
IRQ_CP_MMCIINT0
,
IRQ_CP_MMCIINT1
},
...
...
@@ -427,8 +425,8 @@ static struct amba_device aaci_device = {
.
init_name
=
"mb:1d"
,
},
.
res
=
{
.
start
=
INT
CP_PA
_AACI_BASE
,
.
end
=
INT
CP_PA
_AACI_BASE
+
SZ_4K
-
1
,
.
start
=
INT
EGRATOR_CP
_AACI_BASE
,
.
end
=
INT
EGRATOR_CP
_AACI_BASE
+
SZ_4K
-
1
,
.
flags
=
IORESOURCE_MEM
,
},
.
irq
=
{
IRQ_CP_AACIINT
,
NO_IRQ
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录