diff options
author | Kevin Hilman <khilman@deeprootsystems.com> | 2009-06-03 15:24:50 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@deeprootsystems.com> | 2009-08-26 03:56:57 -0400 |
commit | 5fcd294df26e6160f32ea551ef074630b4df728d (patch) | |
tree | 7df26b27b05174eb2a47cfa53891f5b286c5e0e5 /arch/arm | |
parent | 1d3bba61f69f447f11aa88e82c5840319962d4cd (diff) |
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')
-rw-r--r-- | arch/arm/mach-davinci/devices.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-davinci/dm355.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-davinci/dm644x.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-davinci/dm646x.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/common.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-davinci/time.c | 6 |
6 files changed, 5 insertions, 12 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) | |||
216 | 216 | ||
217 | static struct resource wdt_resources[] = { | 217 | static struct resource wdt_resources[] = { |
218 | { | 218 | { |
219 | .start = DAVINCI_WDOG_BASE, | ||
220 | .end = DAVINCI_WDOG_BASE + SZ_1K - 1, | ||
219 | .flags = IORESOURCE_MEM, | 221 | .flags = IORESOURCE_MEM, |
220 | }, | 222 | }, |
221 | }; | 223 | }; |
@@ -229,11 +231,6 @@ struct platform_device davinci_wdt_device = { | |||
229 | 231 | ||
230 | static void davinci_init_wdt(void) | 232 | static void davinci_init_wdt(void) |
231 | { | 233 | { |
232 | struct davinci_soc_info *soc_info = &davinci_soc_info; | ||
233 | |||
234 | wdt_resources[0].start = (resource_size_t)soc_info->wdt_base; | ||
235 | wdt_resources[0].end = (resource_size_t)soc_info->wdt_base + SZ_1K - 1; | ||
236 | |||
237 | platform_device_register(&davinci_wdt_device); | 234 | platform_device_register(&davinci_wdt_device); |
238 | } | 235 | } |
239 | 236 | ||
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index 373f0c4003a5..48f33e420517 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c | |||
@@ -727,7 +727,6 @@ static struct davinci_soc_info davinci_soc_info_dm355 = { | |||
727 | .intc_irq_prios = dm355_default_priorities, | 727 | .intc_irq_prios = dm355_default_priorities, |
728 | .intc_irq_num = DAVINCI_N_AINTC_IRQ, | 728 | .intc_irq_num = DAVINCI_N_AINTC_IRQ, |
729 | .timer_info = &dm355_timer_info, | 729 | .timer_info = &dm355_timer_info, |
730 | .wdt_base = IO_ADDRESS(DAVINCI_WDOG_BASE), | ||
731 | .gpio_base = IO_ADDRESS(DAVINCI_GPIO_BASE), | 730 | .gpio_base = IO_ADDRESS(DAVINCI_GPIO_BASE), |
732 | .gpio_num = 104, | 731 | .gpio_num = 104, |
733 | .gpio_irq = IRQ_DM355_GPIOBNK0, | 732 | .gpio_irq = IRQ_DM355_GPIOBNK0, |
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index 7d51263caf1e..d20e447a8b4f 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c | |||
@@ -660,7 +660,6 @@ static struct davinci_soc_info davinci_soc_info_dm644x = { | |||
660 | .intc_irq_prios = dm644x_default_priorities, | 660 | .intc_irq_prios = dm644x_default_priorities, |
661 | .intc_irq_num = DAVINCI_N_AINTC_IRQ, | 661 | .intc_irq_num = DAVINCI_N_AINTC_IRQ, |
662 | .timer_info = &dm644x_timer_info, | 662 | .timer_info = &dm644x_timer_info, |
663 | .wdt_base = IO_ADDRESS(DAVINCI_WDOG_BASE), | ||
664 | .gpio_base = IO_ADDRESS(DAVINCI_GPIO_BASE), | 663 | .gpio_base = IO_ADDRESS(DAVINCI_GPIO_BASE), |
665 | .gpio_num = 71, | 664 | .gpio_num = 71, |
666 | .gpio_irq = IRQ_GPIOBNK0, | 665 | .gpio_irq = IRQ_GPIOBNK0, |
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index 1391513b7381..2c76a4d47bfb 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c | |||
@@ -691,7 +691,6 @@ static struct davinci_soc_info davinci_soc_info_dm646x = { | |||
691 | .intc_irq_prios = dm646x_default_priorities, | 691 | .intc_irq_prios = dm646x_default_priorities, |
692 | .intc_irq_num = DAVINCI_N_AINTC_IRQ, | 692 | .intc_irq_num = DAVINCI_N_AINTC_IRQ, |
693 | .timer_info = &dm646x_timer_info, | 693 | .timer_info = &dm646x_timer_info, |
694 | .wdt_base = IO_ADDRESS(DAVINCI_WDOG_BASE), | ||
695 | .gpio_base = IO_ADDRESS(DAVINCI_GPIO_BASE), | 694 | .gpio_base = IO_ADDRESS(DAVINCI_GPIO_BASE), |
696 | .gpio_num = 43, /* Only 33 usable */ | 695 | .gpio_num = 43, /* Only 33 usable */ |
697 | .gpio_irq = IRQ_DM646X_GPIOBNK0, | 696 | .gpio_irq = IRQ_DM646X_GPIOBNK0, |
diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h index a1f03b606d8f..b21393b24d65 100644 --- a/arch/arm/mach-davinci/include/mach/common.h +++ b/arch/arm/mach-davinci/include/mach/common.h | |||
@@ -60,7 +60,6 @@ struct davinci_soc_info { | |||
60 | u8 *intc_irq_prios; | 60 | u8 *intc_irq_prios; |
61 | unsigned long intc_irq_num; | 61 | unsigned long intc_irq_num; |
62 | struct davinci_timer_info *timer_info; | 62 | struct davinci_timer_info *timer_info; |
63 | void __iomem *wdt_base; | ||
64 | void __iomem *gpio_base; | 63 | void __iomem *gpio_base; |
65 | unsigned gpio_num; | 64 | unsigned gpio_num; |
66 | unsigned gpio_irq; | 65 | unsigned gpio_irq; |
diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c index ca85d1871762..0d1b6d407b46 100644 --- a/arch/arm/mach-davinci/time.c +++ b/arch/arm/mach-davinci/time.c | |||
@@ -406,11 +406,11 @@ struct sys_timer davinci_timer = { | |||
406 | void davinci_watchdog_reset(void) | 406 | void davinci_watchdog_reset(void) |
407 | { | 407 | { |
408 | u32 tgcr, wdtcr; | 408 | u32 tgcr, wdtcr; |
409 | struct davinci_soc_info *soc_info = &davinci_soc_info; | 409 | struct platform_device *pdev = &davinci_wdt_device; |
410 | void __iomem *base = soc_info->wdt_base; | 410 | void __iomem *base = IO_ADDRESS(pdev->resource[0].start); |
411 | struct clk *wd_clk; | 411 | struct clk *wd_clk; |
412 | 412 | ||
413 | wd_clk = clk_get(&davinci_wdt_device.dev, NULL); | 413 | wd_clk = clk_get(&pdev->dev, NULL); |
414 | if (WARN_ON(IS_ERR(wd_clk))) | 414 | if (WARN_ON(IS_ERR(wd_clk))) |
415 | return; | 415 | return; |
416 | clk_enable(wd_clk); | 416 | clk_enable(wd_clk); |