aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx2
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2010-04-29 10:03:20 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2010-05-17 11:47:03 +0200
commitf13899da00e1b815211cf246c7d2704db3c18e37 (patch)
tree412ec17724ac6a2d4b0737596faddf19238bb53e /arch/arm/mach-mx2
parent3170ba546f8d4d2c35809f311c67311f896199f5 (diff)
downloadkernel_samsung_smdk4412-f13899da00e1b815211cf246c7d2704db3c18e37.zip
kernel_samsung_smdk4412-f13899da00e1b815211cf246c7d2704db3c18e37.tar.gz
kernel_samsung_smdk4412-f13899da00e1b815211cf246c7d2704db3c18e37.tar.bz2
arm/mach-mx2: 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/mach-mx2')
-rw-r--r--arch/arm/mach-mx2/mach-pca100.c1
-rw-r--r--arch/arm/mach-mx2/mach-pcm038.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mx2/mach-pca100.c b/arch/arm/mach-mx2/mach-pca100.c
index 778fff2..a87422e 100644
--- a/arch/arm/mach-mx2/mach-pca100.c
+++ b/arch/arm/mach-mx2/mach-pca100.c
@@ -145,6 +145,7 @@ static struct mxc_nand_platform_data pca100_nand_board_info = {
static struct platform_device *platform_devices[] __initdata = {
&mxc_w1_master_device,
&mxc_fec_device,
+ &mxc_wdt,
};
static struct imxi2c_platform_data pca100_i2c_1_data = {
diff --git a/arch/arm/mach-mx2/mach-pcm038.c b/arch/arm/mach-mx2/mach-pcm038.c
index 035fbe0..36c8943 100644
--- a/arch/arm/mach-mx2/mach-pcm038.c
+++ b/arch/arm/mach-mx2/mach-pcm038.c
@@ -182,6 +182,7 @@ static struct platform_device *platform_devices[] __initdata = {
&mxc_w1_master_device,
&mxc_fec_device,
&pcm038_sram_mtd_device,
+ &mxc_wdt,
};
/* On pcm038 there's a sram attached to CS1, we enable the chipselect here and