diff options
author | Jason Cooper <jason@lakedaemon.net> | 2012-03-14 20:33:26 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2012-03-16 00:28:41 -0400 |
commit | a855a7ced4f572dcd1038db06b532df3ba9f227c (patch) | |
tree | 5da4b1a501c0fd1e21567a32a27ffa3ae978e8e1 /arch/arm/plat-orion | |
parent | 7399532065a68cce8b0ea18aace7ded45bfb205f (diff) |
ARM: orion: wdt: use resource vice direct access
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-orion')
-rw-r--r-- | arch/arm/plat-orion/common.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c index 089899a7db72..74daf5ed1432 100644 --- a/arch/arm/plat-orion/common.c +++ b/arch/arm/plat-orion/common.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <plat/orion_wdt.h> | 21 | #include <plat/orion_wdt.h> |
22 | #include <plat/mv_xor.h> | 22 | #include <plat/mv_xor.h> |
23 | #include <plat/ehci-orion.h> | 23 | #include <plat/ehci-orion.h> |
24 | #include <mach/bridge-regs.h> | ||
24 | 25 | ||
25 | /* Fill in the resources structure and link it into the platform | 26 | /* Fill in the resources structure and link it into the platform |
26 | device structure. There is always a memory region, and nearly | 27 | device structure. There is always a memory region, and nearly |
@@ -568,13 +569,17 @@ void __init orion_spi_1_init(unsigned long mapbase, | |||
568 | ****************************************************************************/ | 569 | ****************************************************************************/ |
569 | static struct orion_wdt_platform_data orion_wdt_data; | 570 | static struct orion_wdt_platform_data orion_wdt_data; |
570 | 571 | ||
572 | static struct resource orion_wdt_resource = | ||
573 | DEFINE_RES_MEM(TIMER_VIRT_BASE, 0x28); | ||
574 | |||
571 | static struct platform_device orion_wdt_device = { | 575 | static struct platform_device orion_wdt_device = { |
572 | .name = "orion_wdt", | 576 | .name = "orion_wdt", |
573 | .id = -1, | 577 | .id = -1, |
574 | .dev = { | 578 | .dev = { |
575 | .platform_data = &orion_wdt_data, | 579 | .platform_data = &orion_wdt_data, |
576 | }, | 580 | }, |
577 | .num_resources = 0, | 581 | .resource = &orion_wdt_resource, |
582 | .num_resources = 1, | ||
578 | }; | 583 | }; |
579 | 584 | ||
580 | void __init orion_wdt_init(unsigned long tclk) | 585 | void __init orion_wdt_init(unsigned long tclk) |