diff options
author | Andrew Lunn <andrew@lunn.ch> | 2011-05-15 07:32:47 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2011-05-16 15:10:03 -0400 |
commit | 5e00d3783dd362a34c9816bb582103c9833e4643 (patch) | |
tree | fae2485cc6ab26c1f1138b473488111e4b7f5af1 /arch/arm/plat-orion | |
parent | 980f9f601ad456dc5a699bf526b6bd894957bad3 (diff) |
ARM: orion: Consolidate the platform data setup for the watchdog.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Diffstat (limited to 'arch/arm/plat-orion')
-rw-r--r-- | arch/arm/plat-orion/common.c | 21 | ||||
-rw-r--r-- | arch/arm/plat-orion/include/plat/common.h | 2 |
2 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c index 2afe79d1a273..65022094747a 100644 --- a/arch/arm/plat-orion/common.c +++ b/arch/arm/plat-orion/common.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/mv643xx_i2c.h> | 18 | #include <linux/mv643xx_i2c.h> |
19 | #include <net/dsa.h> | 19 | #include <net/dsa.h> |
20 | #include <linux/spi/orion_spi.h> | 20 | #include <linux/spi/orion_spi.h> |
21 | #include <plat/orion_wdt.h> | ||
21 | 22 | ||
22 | /* Fill in the resources structure and link it into the platform | 23 | /* Fill in the resources structure and link it into the platform |
23 | device structure. There is always a memory region, and nearly | 24 | device structure. There is always a memory region, and nearly |
@@ -564,3 +565,23 @@ void __init orion_spi_1_init(unsigned long mapbase, | |||
564 | mapbase, SZ_512 - 1, NO_IRQ); | 565 | mapbase, SZ_512 - 1, NO_IRQ); |
565 | platform_device_register(&orion_spi_1); | 566 | platform_device_register(&orion_spi_1); |
566 | } | 567 | } |
568 | |||
569 | /***************************************************************************** | ||
570 | * Watchdog | ||
571 | ****************************************************************************/ | ||
572 | static struct orion_wdt_platform_data orion_wdt_data; | ||
573 | |||
574 | static struct platform_device orion_wdt_device = { | ||
575 | .name = "orion_wdt", | ||
576 | .id = -1, | ||
577 | .dev = { | ||
578 | .platform_data = &orion_wdt_data, | ||
579 | }, | ||
580 | .num_resources = 0, | ||
581 | }; | ||
582 | |||
583 | void __init orion_wdt_init(unsigned long tclk) | ||
584 | { | ||
585 | orion_wdt_data.tclk = tclk; | ||
586 | platform_device_register(&orion_wdt_device); | ||
587 | } | ||
diff --git a/arch/arm/plat-orion/include/plat/common.h b/arch/arm/plat-orion/include/plat/common.h index e72c1466d6ce..38ae4bfd22a4 100644 --- a/arch/arm/plat-orion/include/plat/common.h +++ b/arch/arm/plat-orion/include/plat/common.h | |||
@@ -79,4 +79,6 @@ void __init orion_spi_init(unsigned long mapbase, | |||
79 | 79 | ||
80 | void __init orion_spi_1_init(unsigned long mapbase, | 80 | void __init orion_spi_1_init(unsigned long mapbase, |
81 | unsigned long tclk); | 81 | unsigned long tclk); |
82 | |||
83 | void __init orion_wdt_init(unsigned long tclk); | ||
82 | #endif | 84 | #endif |