diff options
| author | vdumpa <vdumpa@nvidia.com> | 2011-02-16 00:01:24 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:42:22 -0800 |
| commit | a700efe36c0198ebc96982876ce0469b56fe8c3d (patch) | |
| tree | 3136019dd6a10960afb0b1391190d679fb1f068b /arch/arm/mach-tegra/devices.c | |
| parent | 1cf262f9c5a3cedde51124b52a06dd7ecd836930 (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>
Original-Change-Id: Ic8c9907998a2ab1777ea2b00f1acceb6d66c10e5
Rebase-Id: Rc7878358e81b0c5cda6acf5bb30b759e26f674a7
Diffstat (limited to 'arch/arm/mach-tegra/devices.c')
| -rw-r--r-- | arch/arm/mach-tegra/devices.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-tegra/devices.c b/arch/arm/mach-tegra/devices.c index 3d493e8af780..49cef0a8468e 100644 --- a/arch/arm/mach-tegra/devices.c +++ b/arch/arm/mach-tegra/devices.c @@ -968,18 +968,18 @@ struct platform_device tegra_smmu_device = { static struct resource tegra_wdt_resources[] = { [0] = { - .start = TEGRA_CLK_RESET_BASE, - .end = TEGRA_CLK_RESET_BASE + 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, }, }; |