summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/devices.c
diff options
context:
space:
mode:
authorKevin Hilman <khilman@deeprootsystems.com>2009-06-03 12:24:50 -0700
committerKevin Hilman <khilman@deeprootsystems.com>2009-08-26 10:56:57 +0300
commit5fcd294df26e6160f32ea551ef074630b4df728d (patch)
tree7df26b27b05174eb2a47cfa53891f5b286c5e0e5 /arch/arm/mach-davinci/devices.c
parent1d3bba61f69f447f11aa88e82c5840319962d4cd (diff)
downloadtalos-op-linux-5fcd294df26e6160f32ea551ef074630b4df728d.tar.gz
talos-op-linux-5fcd294df26e6160f32ea551ef074630b4df728d.zip
davinci: remove watchdog from soc_info
watchdog info is not needed in soc_info, platform_device can be used directly in core code. Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-davinci/devices.c')
-rw-r--r--arch/arm/mach-davinci/devices.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c
index 7a2f8ae89be2..385e8332fc2f 100644
--- a/arch/arm/mach-davinci/devices.c
+++ b/arch/arm/mach-davinci/devices.c
@@ -216,6 +216,8 @@ void __init davinci_setup_mmc(int module, struct davinci_mmc_config *config)
static struct resource wdt_resources[] = {
{
+ .start = DAVINCI_WDOG_BASE,
+ .end = DAVINCI_WDOG_BASE + SZ_1K - 1,
.flags = IORESOURCE_MEM,
},
};
@@ -229,11 +231,6 @@ struct platform_device davinci_wdt_device = {
static void davinci_init_wdt(void)
{
- struct davinci_soc_info *soc_info = &davinci_soc_info;
-
- wdt_resources[0].start = (resource_size_t)soc_info->wdt_base;
- wdt_resources[0].end = (resource_size_t)soc_info->wdt_base + SZ_1K - 1;
-
platform_device_register(&davinci_wdt_device);
}
OpenPOWER on IntegriCloud