aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2010-04-29 10:03:19 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2010-05-17 11:47:03 +0200
commit3170ba546f8d4d2c35809f311c67311f896199f5 (patch)
tree17dfe73d325933c6a00cf8d27ee4472f43f1bdc1 /arch/arm
parent6d38c1cf520e9e1d544242e2ae471677d7a78463 (diff)
downloadkernel_samsung_smdk4412-3170ba546f8d4d2c35809f311c67311f896199f5.zip
kernel_samsung_smdk4412-3170ba546f8d4d2c35809f311c67311f896199f5.tar.gz
kernel_samsung_smdk4412-3170ba546f8d4d2c35809f311c67311f896199f5.tar.bz2
arm/mach-mx3: add watchdog device to Phytec-boards
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Cc: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-mx3/mach-pcm037.c1
-rw-r--r--arch/arm/mach-mx3/mach-pcm043.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/mach-pcm037.c b/arch/arm/mach-mx3/mach-pcm037.c
index 2df1ec5..5024284 100644
--- a/arch/arm/mach-mx3/mach-pcm037.c
+++ b/arch/arm/mach-mx3/mach-pcm037.c
@@ -449,6 +449,7 @@ 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,
};
diff --git a/arch/arm/mach-mx3/mach-pcm043.c b/arch/arm/mach-mx3/mach-pcm043.c
index 1bf1ec2..78d9185 100644
--- a/arch/arm/mach-mx3/mach-pcm043.c
+++ b/arch/arm/mach-mx3/mach-pcm043.c
@@ -150,6 +150,7 @@ static struct i2c_board_info pcm043_i2c_devices[] = {
static struct platform_device *devices[] __initdata = {
&pcm043_flash,
&mxc_fec_device,
+ &imx_wdt_device0,
};
static struct pad_desc pcm043_pads[] = {