Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-13 14:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

arm/mach-mx2/3: Fix watchdog-devices to match the current driver

Browse Source 
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>
This commit is contained in:
Wolfram Sang 2010-04-29 10:03:18 +02:00 committed by Sascha Hauer
parent 4a31f2eff3
commit 6d38c1cf52
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/mach-mx2/devices.c
View File

@ -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); DEFINE_IMX_GPT_DEVICE(5, MX27_GPT6_BASE_ADDR, MX27_INT_GPT6);
#endif #endif
/* /* Watchdog: i.MX1 has seperate driver, i.MX21 and i.MX27 are equal */
* Watchdog:
* - i.MX1
* - i.MX21
* - i.MX27
*/
static struct resource mxc_wdt_resources[] = { static struct resource mxc_wdt_resources[] = {
{ {
.start = MX2x_WDOG_BASE_ADDR, .start = MX2x_WDOG_BASE_ADDR,
@ -124,7 +119,7 @@ static struct resource mxc_wdt_resources[] = {
}; };
struct platform_device mxc_wdt = { struct platform_device mxc_wdt = {
.name = "mxc_wdt", .name = "imx2-wdt",
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(mxc_wdt_resources), .num_resources = ARRAY_SIZE(mxc_wdt_resources),
.resource = mxc_wdt_resources, .resource = mxc_wdt_resources,

2
arch/arm/mach-mx3/devices.c
View File

@ -582,7 +582,7 @@ static struct resource imx_wdt_resources[] = {
}; };
struct platform_device imx_wdt_device0 = { struct platform_device imx_wdt_device0 = {
.name = "imx-wdt", .name = "imx2-wdt",
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(imx_wdt_resources), .num_resources = ARRAY_SIZE(imx_wdt_resources),
.resource = imx_wdt_resources, .resource = imx_wdt_resources,