diff options
-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 b91e412f7b3e..a9377cec662a 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); | |||
109 | DEFINE_IMX_GPT_DEVICE(5, MX27_GPT6_BASE_ADDR, MX27_INT_GPT6); | 109 | DEFINE_IMX_GPT_DEVICE(5, MX27_GPT6_BASE_ADDR, MX27_INT_GPT6); |
110 | #endif | 110 | #endif |
111 | 111 | ||
112 | /* | 112 | /* Watchdog: i.MX1 has seperate driver, i.MX21 and i.MX27 are equal */ |
113 | * Watchdog: | ||
114 | * - i.MX1 | ||
115 | * - i.MX21 | ||
116 | * - i.MX27 | ||
117 | */ | ||
118 | static struct resource mxc_wdt_resources[] = { | 113 | static struct resource mxc_wdt_resources[] = { |
119 | { | 114 | { |
120 | .start = MX2x_WDOG_BASE_ADDR, | 115 | .start = MX2x_WDOG_BASE_ADDR, |
@@ -124,7 +119,7 @@ static struct resource mxc_wdt_resources[] = { | |||
124 | }; | 119 | }; |
125 | 120 | ||
126 | struct platform_device mxc_wdt = { | 121 | struct platform_device mxc_wdt = { |
127 | .name = "mxc_wdt", | 122 | .name = "imx2-wdt", |
128 | .id = 0, | 123 | .id = 0, |
129 | .num_resources = ARRAY_SIZE(mxc_wdt_resources), | 124 | .num_resources = ARRAY_SIZE(mxc_wdt_resources), |
130 | .resource = mxc_wdt_resources, | 125 | .resource = mxc_wdt_resources, |
diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c index 1ffed283d6cd..81a1dbacbe46 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[] = { | |||
582 | }; | 582 | }; |
583 | 583 | ||
584 | struct platform_device imx_wdt_device0 = { | 584 | struct platform_device imx_wdt_device0 = { |
585 | .name = "imx-wdt", | 585 | .name = "imx2-wdt", |
586 | .id = 0, | 586 | .id = 0, |
587 | .num_resources = ARRAY_SIZE(imx_wdt_resources), | 587 | .num_resources = ARRAY_SIZE(imx_wdt_resources), |
588 | .resource = imx_wdt_resources, | 588 | .resource = imx_wdt_resources, |