diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2010-04-29 10:03:18 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-05-17 11:47:03 +0200 |
| commit | 6d38c1cf520e9e1d544242e2ae471677d7a78463 (patch) | |
| tree | 18a9966ee7ec4aab31c1cf687ba712ff8322d035 | |
| parent | 4a31f2eff3b8fcf009db35f89eb222ed7835b6b9 (diff) | |
| download | linux-3.10-6d38c1cf520e9e1d544242e2ae471677d7a78463.tar.gz linux-3.10-6d38c1cf520e9e1d544242e2ae471677d7a78463.tar.bz2 linux-3.10-6d38c1cf520e9e1d544242e2ae471677d7a78463.zip | |
arm/mach-mx2/3: Fix watchdog-devices to match the current driver
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>
| -rw-r--r-- | arch/arm/mach-mx2/devices.c | 9 | ||||
| -rw-r--r-- | arch/arm/mach-mx3/devices.c | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/arch/arm/mach-mx2/devices.c b/arch/arm/mach-mx2/devices.c index b91e412f7b3..a9377cec662 100644 --- a/arch/arm/mach-mx2/devices.c +++ b/arch/arm/mach-mx2/devices.c @@ -109,12 +109,7 @@ DEFINE_IMX_GPT_DEVICE(4, MX27_GPT5_BASE_ADDR, MX27_INT_GPT5); DEFINE_IMX_GPT_DEVICE(5, MX27_GPT6_BASE_ADDR, MX27_INT_GPT6); #endif -/* - * Watchdog: - * - i.MX1 - * - i.MX21 - * - i.MX27 - */ +/* Watchdog: i.MX1 has seperate driver, i.MX21 and i.MX27 are equal */ static struct resource mxc_wdt_resources[] = { { .start = MX2x_WDOG_BASE_ADDR, @@ -124,7 +119,7 @@ static struct resource mxc_wdt_resources[] = { }; struct platform_device mxc_wdt = { - .name = "mxc_wdt", + .name = "imx2-wdt", .id = 0, .num_resources = ARRAY_SIZE(mxc_wdt_resources), .resource = mxc_wdt_resources, diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c index 1ffed283d6c..81a1dbacbe4 100644 --- a/arch/arm/mach-mx3/devices.c +++ b/arch/arm/mach-mx3/devices.c @@ -582,7 +582,7 @@ static struct resource imx_wdt_resources[] = { }; struct platform_device imx_wdt_device0 = { - .name = "imx-wdt", + .name = "imx2-wdt", .id = 0, .num_resources = ARRAY_SIZE(imx_wdt_resources), .resource = imx_wdt_resources, |