summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/devices.c
diff options
context:
space:
mode:
authorvdumpa <vdumpa@nvidia.com>2011-02-16 00:01:24 -0800
committerDan Willemsen <dwillemsen@nvidia.com>2011-04-26 15:52:08 -0700
commitd72539835f9b942ffd87156c0528106b8b5c6e57 (patch)
tree2a25189f926a7c05acb7f5597dbac6d399e97846 /arch/arm/mach-tegra/devices.c
parent59ee140e5bded65b281bf0fafb9f2a6d849fb3e3 (diff)
tegra:watchdog: Use new watchdog controller.
Use new watch dog controller for CONFIG_ARCH_TEGRA_3x_SOC. Bug 790458 Original-Change-Id: I43975a2794f44f612a5f16674cd674aeebe4e6be Reviewed-on: http://git-master/r/19715 Reviewed-by: Krishna Reddy <vdumpa@nvidia.com> Tested-by: Krishna Reddy <vdumpa@nvidia.com> Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com> Change-Id: Ic8c9907998a2ab1777ea2b00f1acceb6d66c10e5
Diffstat (limited to 'arch/arm/mach-tegra/devices.c')
-rw-r--r--arch/arm/mach-tegra/devices.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/devices.c b/arch/arm/mach-tegra/devices.c
index 0b3148f511bd..6d1aef8e926b 100644
--- a/arch/arm/mach-tegra/devices.c
+++ b/arch/arm/mach-tegra/devices.c
@@ -802,21 +802,20 @@ struct platform_device pmu_device = {
.resource = pmu_resources,
};
-#define CLK_RESET_RST_SOURCE 0x0
static struct resource tegra_wdt_resources[] = {
[0] = {
- .start = TEGRA_CLK_RESET_BASE + CLK_RESET_RST_SOURCE,
- .end = TEGRA_CLK_RESET_BASE + CLK_RESET_RST_SOURCE + 4 - 1,
+ .start = TEGRA_WDT0_BASE,
+ .end = TEGRA_WDT0_BASE + TEGRA_WDT0_SIZE - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
- .start = TEGRA_TMR1_BASE,
- .end = TEGRA_TMR1_BASE + TEGRA_TMR1_SIZE - 1,
+ .start = TEGRA_TMR6_BASE,
+ .end = TEGRA_TMR6_BASE + TEGRA_TMR6_SIZE - 1,
.flags = IORESOURCE_MEM,
},
[2] = {
- .start = INT_TMR1,
- .end = INT_TMR1,
+ .start = INT_WDT_CPU,
+ .end = INT_WDT_CPU,
.flags = IORESOURCE_IRQ,
},
};