From 6b6b67faaac931aad2e7a386811c54dec33f7b27 Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Thu, 29 Apr 2010 10:03:18 +0200 Subject: [PATCH] --- yaml --- r: 198467 b: refs/heads/master c: 6d38c1cf520e9e1d544242e2ae471677d7a78463 h: refs/heads/master i: 198465: 4465f42adad254882b2fb885aadae35386c5412a 198463: b818db824d0fa2f08bdf97bc9dc9edc93b154a3c v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mx2/devices.c | 9 ++------- trunk/arch/arm/mach-mx3/devices.c | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 3d6cd5fb914e..b5a508d357ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a31f2eff3b8fcf009db35f89eb222ed7835b6b9 +refs/heads/master: 6d38c1cf520e9e1d544242e2ae471677d7a78463 diff --git a/trunk/arch/arm/mach-mx2/devices.c b/trunk/arch/arm/mach-mx2/devices.c index b91e412f7b3e..a9377cec662a 100644 --- a/trunk/arch/arm/mach-mx2/devices.c +++ b/trunk/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/trunk/arch/arm/mach-mx3/devices.c b/trunk/arch/arm/mach-mx3/devices.c index 1ffed283d6cd..81a1dbacbe46 100644 --- a/trunk/arch/arm/mach-mx3/devices.c +++ b/trunk/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,