Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
742269e2
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,发现更多精彩内容 >>
提交
742269e2
编写于
11月 15, 2010
作者:
U
Uwe Kleine-König
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ARM: mx3: dynamically allocate imx2-wdt devices
Signed-off-by:
N
Uwe Kleine-König
<
u.kleine-koenig@pengutronix.de
>
上级
2d58de28
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
26 addition
and
42 deletion
+26
-42
arch/arm/mach-mx3/Kconfig
arch/arm/mach-mx3/Kconfig
+4
-0
arch/arm/mach-mx3/devices-imx31.h
arch/arm/mach-mx3/devices-imx31.h
+4
-0
arch/arm/mach-mx3/devices-imx35.h
arch/arm/mach-mx3/devices-imx35.h
+4
-0
arch/arm/mach-mx3/devices.c
arch/arm/mach-mx3/devices.c
+0
-33
arch/arm/mach-mx3/devices.h
arch/arm/mach-mx3/devices.h
+0
-1
arch/arm/mach-mx3/mach-cpuimx35.c
arch/arm/mach-mx3/mach-cpuimx35.c
+1
-5
arch/arm/mach-mx3/mach-pcm037.c
arch/arm/mach-mx3/mach-pcm037.c
+1
-1
arch/arm/mach-mx3/mach-pcm043.c
arch/arm/mach-mx3/mach-pcm043.c
+1
-1
arch/arm/mach-mx3/mx31lite-db.c
arch/arm/mach-mx3/mx31lite-db.c
+1
-1
arch/arm/plat-mxc/devices/platform-imx2-wdt.c
arch/arm/plat-mxc/devices/platform-imx2-wdt.c
+10
-0
未找到文件。
arch/arm/mach-mx3/Kconfig
浏览文件 @
742269e2
...
...
@@ -51,6 +51,7 @@ config MACH_PCM037
bool "Support Phytec pcm037 (i.MX31) platforms"
select SOC_IMX31
select IMX_HAVE_PLATFORM_FSL_USB2_UDC
select IMX_HAVE_PLATFORM_IMX2_WDT
select IMX_HAVE_PLATFORM_IMX_I2C
select IMX_HAVE_PLATFORM_IMX_UART
select IMX_HAVE_PLATFORM_MXC_EHCI
...
...
@@ -75,6 +76,7 @@ config MACH_MX31LITE
bool "Support MX31 LITEKIT (LogicPD)"
select SOC_IMX31
select MXC_ULPI if USB_ULPI
select IMX_HAVE_PLATFORM_IMX2_WDT
select IMX_HAVE_PLATFORM_IMX_UART
select IMX_HAVE_PLATFORM_MXC_EHCI
select IMX_HAVE_PLATFORM_MXC_MMC
...
...
@@ -143,6 +145,7 @@ config MACH_PCM043
bool "Support Phytec pcm043 (i.MX35) platforms"
select SOC_IMX35
select IMX_HAVE_PLATFORM_FSL_USB2_UDC
select IMX_HAVE_PLATFORM_IMX2_WDT
select IMX_HAVE_PLATFORM_IMX_I2C
select IMX_HAVE_PLATFORM_IMX_SSI
select IMX_HAVE_PLATFORM_IMX_UART
...
...
@@ -193,6 +196,7 @@ config MACH_EUKREA_CPUIMX35
bool "Support Eukrea CPUIMX35 Platform"
select SOC_IMX35
select IMX_HAVE_PLATFORM_FSL_USB2_UDC
select IMX_HAVE_PLATFORM_IMX2_WDT
select IMX_HAVE_PLATFORM_IMX_UART
select IMX_HAVE_PLATFORM_IMX_I2C
select IMX_HAVE_PLATFORM_MXC_EHCI
...
...
arch/arm/mach-mx3/devices-imx31.h
浏览文件 @
742269e2
...
...
@@ -13,6 +13,10 @@ extern const struct imx_fsl_usb2_udc_data imx31_fsl_usb2_udc_data __initconst;
#define imx31_add_fsl_usb2_udc(pdata) \
imx_add_fsl_usb2_udc(&imx31_fsl_usb2_udc_data, pdata)
extern
const
struct
imx_imx2_wdt_data
imx31_imx2_wdt_data
__initconst
;
#define imx31_add_imx2_wdt(pdata) \
imx_add_imx2_wdt(&imx31_imx2_wdt_data)
extern
const
struct
imx_imx_i2c_data
imx31_imx_i2c_data
[]
__initconst
;
#define imx31_add_imx_i2c(id, pdata) \
imx_add_imx_i2c(&imx31_imx_i2c_data[id], pdata)
...
...
arch/arm/mach-mx3/devices-imx35.h
浏览文件 @
742269e2
...
...
@@ -23,6 +23,10 @@ extern const struct imx_flexcan_data imx35_flexcan_data[] __initconst;
#define imx35_add_flexcan0(pdata) imx35_add_flexcan(0, pdata)
#define imx35_add_flexcan1(pdata) imx35_add_flexcan(1, pdata)
extern
const
struct
imx_imx2_wdt_data
imx35_imx2_wdt_data
__initconst
;
#define imx35_add_imx2_wdt(pdata) \
imx_add_imx2_wdt(&imx35_imx2_wdt_data)
extern
const
struct
imx_imx_i2c_data
imx35_imx_i2c_data
[]
__initconst
;
#define imx35_add_imx_i2c(id, pdata) \
imx_add_imx_i2c(&imx35_imx_i2c_data[id], pdata)
...
...
arch/arm/mach-mx3/devices.c
浏览文件 @
742269e2
...
...
@@ -95,19 +95,6 @@ struct platform_device mx3_camera = {
},
};
static
struct
resource
imx_wdt_resources
[]
=
{
{
.
flags
=
IORESOURCE_MEM
,
},
};
struct
platform_device
imx_wdt_device0
=
{
.
name
=
"imx2-wdt"
,
.
id
=
0
,
.
num_resources
=
ARRAY_SIZE
(
imx_wdt_resources
),
.
resource
=
imx_wdt_resources
,
};
static
struct
resource
imx_rtc_resources
[]
=
{
{
.
start
=
MX31_RTC_BASE_ADDR
,
...
...
@@ -145,23 +132,3 @@ struct platform_device imx_kpp_device = {
.
num_resources
=
ARRAY_SIZE
(
imx_kpp_resources
),
.
resource
=
imx_kpp_resources
,
};
static
int
__init
mx3_devices_init
(
void
)
{
#if defined(CONFIG_ARCH_MX31)
if
(
cpu_is_mx31
())
{
imx_wdt_resources
[
0
].
start
=
MX31_WDOG_BASE_ADDR
;
imx_wdt_resources
[
0
].
end
=
MX31_WDOG_BASE_ADDR
+
0x3fff
;
}
#endif
#if defined(CONFIG_ARCH_MX35)
if
(
cpu_is_mx35
())
{
imx_wdt_resources
[
0
].
start
=
MX35_WDOG_BASE_ADDR
;
imx_wdt_resources
[
0
].
end
=
MX35_WDOG_BASE_ADDR
+
0x3fff
;
}
#endif
return
0
;
}
subsys_initcall
(
mx3_devices_init
);
arch/arm/mach-mx3/devices.h
浏览文件 @
742269e2
extern
struct
platform_device
mx3_ipu
;
extern
struct
platform_device
mx3_fb
;
extern
struct
platform_device
mx3_camera
;
extern
struct
platform_device
imx_wdt_device0
;
extern
struct
platform_device
imx_rtc_device0
;
extern
struct
platform_device
imx_kpp_device
;
arch/arm/mach-mx3/mach-cpuimx35.c
浏览文件 @
742269e2
...
...
@@ -72,10 +72,6 @@ static struct i2c_board_info eukrea_cpuimx35_i2c_devices[] = {
},
};
static
struct
platform_device
*
devices
[]
__initdata
=
{
&
imx_wdt_device0
,
};
static
struct
pad_desc
eukrea_cpuimx35_pads
[]
=
{
/* UART1 */
MX35_PAD_CTS1__UART1_CTS
,
...
...
@@ -156,7 +152,7 @@ static void __init mxc_board_init(void)
ARRAY_SIZE
(
eukrea_cpuimx35_pads
));
imx35_add_fec
(
NULL
);
platform_add_devices
(
devices
,
ARRAY_SIZE
(
devices
)
);
imx35_add_imx2_wdt
(
NULL
);
imx35_add_imx_uart0
(
&
uart_pdata
);
imx35_add_mxc_nand
(
&
eukrea_cpuimx35_nand_board_info
);
...
...
arch/arm/mach-mx3/mach-pcm037.c
浏览文件 @
742269e2
...
...
@@ -440,7 +440,6 @@ static int __init pcm037_camera_alloc_dma(const size_t buf_size)
static
struct
platform_device
*
devices
[]
__initdata
=
{
&
pcm037_flash
,
&
pcm037_sram_device
,
&
imx_wdt_device0
,
&
pcm037_mt9t031
,
&
pcm037_mt9v022
,
};
...
...
@@ -606,6 +605,7 @@ static void __init mxc_board_init(void)
platform_add_devices
(
devices
,
ARRAY_SIZE
(
devices
));
imx31_add_imx2_wdt
(
NULL
);
imx31_add_imx_uart0
(
&
uart_pdata
);
/* XXX: should't this have .flags = 0 (i.e. no RTSCTS) on PCM037_EET? */
imx31_add_imx_uart1
(
&
uart_pdata
);
...
...
arch/arm/mach-mx3/mach-pcm043.c
浏览文件 @
742269e2
...
...
@@ -138,7 +138,6 @@ static struct i2c_board_info pcm043_i2c_devices[] = {
static
struct
platform_device
*
devices
[]
__initdata
=
{
&
pcm043_flash
,
&
imx_wdt_device0
,
};
static
struct
pad_desc
pcm043_pads
[]
=
{
...
...
@@ -362,6 +361,7 @@ static void __init mxc_board_init(void)
imx35_add_fec
(
NULL
);
platform_add_devices
(
devices
,
ARRAY_SIZE
(
devices
));
imx35_add_imx2_wdt
(
NULL
);
imx35_add_imx_uart0
(
&
uart_pdata
);
imx35_add_mxc_nand
(
&
pcm037_nand_board_info
);
...
...
arch/arm/mach-mx3/mx31lite-db.c
浏览文件 @
742269e2
...
...
@@ -199,6 +199,6 @@ void __init mx31lite_db_init(void)
imx31_add_mxc_mmc
(
0
,
&
mmc_pdata
);
imx31_add_spi_imx0
(
&
spi0_pdata
);
platform_device_register
(
&
litekit_led_device
);
mxc_register_device
(
&
imx_wdt_device0
,
NULL
);
imx31_add_imx2_wdt
(
NULL
);
mxc_register_device
(
&
imx_rtc_device0
,
NULL
);
}
arch/arm/plat-mxc/devices/platform-imx2-wdt.c
浏览文件 @
742269e2
...
...
@@ -31,6 +31,16 @@ const struct imx_imx2_wdt_data imx27_imx2_wdt_data __initconst =
imx_imx2_wdt_data_entry_single
(
MX27
,
SZ_4K
);
#endif
/* ifdef CONFIG_SOC_IMX27 */
#ifdef CONFIG_SOC_IMX31
const
struct
imx_imx2_wdt_data
imx31_imx2_wdt_data
__initconst
=
imx_imx2_wdt_data_entry_single
(
MX31
,
SZ_16K
);
#endif
/* ifdef CONFIG_SOC_IMX31 */
#ifdef CONFIG_SOC_IMX35
const
struct
imx_imx2_wdt_data
imx35_imx2_wdt_data
__initconst
=
imx_imx2_wdt_data_entry_single
(
MX35
,
SZ_16K
);
#endif
/* ifdef CONFIG_SOC_IMX35 */
struct
platform_device
*
__init
imx_add_imx2_wdt
(
const
struct
imx_imx2_wdt_data
*
data
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录