diff options
| author | vdumpa <vdumpa@nvidia.com> | 2011-02-23 16:10:27 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:42:22 -0800 |
| commit | 3a9b968191f5f1b67790b7d59e58f7682e477dd1 (patch) | |
| tree | a6a1a9f4cba4e8330eee33db357cba6510c647da /arch/arm/mach-tegra/devices.c | |
| parent | a700efe36c0198ebc96982876ce0469b56fe8c3d (diff) | |
tegra:watchdog: Change timer src to timer10 for watchdog.
Fix wdt resource definition issue either.
Bug 790458
Original-Change-Id: I7c80d6c243c42a0e632603dfcc255b70995358b2
Reviewed-on: http://git-master/r/20646
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: I9897fb6614d75508bd0ffd6e866acf27a24a0cb5
Rebase-Id: Re3da893171091a337f9e6536641bb2374036b013
Diffstat (limited to 'arch/arm/mach-tegra/devices.c')
| -rw-r--r-- | arch/arm/mach-tegra/devices.c | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/devices.c b/arch/arm/mach-tegra/devices.c index 49cef0a8468e..0c1ee86a141e 100644 --- a/arch/arm/mach-tegra/devices.c +++ b/arch/arm/mach-tegra/devices.c @@ -966,6 +966,26 @@ struct platform_device tegra_smmu_device = { }; #endif +#if defined(CONFIG_ARCH_TEGRA_2x_SOC) +#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, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = TEGRA_TMR1_BASE, + .end = TEGRA_TMR1_BASE + TEGRA_TMR1_SIZE - 1, + .flags = IORESOURCE_MEM, + }, + [2] = { + .start = INT_TMR1, + .end = INT_TMR1, + .flags = IORESOURCE_IRQ, + }, +}; +#elif defined(CONFIG_ARCH_TEGRA_3x_SOC) static struct resource tegra_wdt_resources[] = { [0] = { .start = TEGRA_WDT0_BASE, @@ -973,8 +993,8 @@ static struct resource tegra_wdt_resources[] = { .flags = IORESOURCE_MEM, }, [1] = { - .start = TEGRA_TMR6_BASE, - .end = TEGRA_TMR6_BASE + TEGRA_TMR6_SIZE - 1, + .start = TEGRA_TMR10_BASE, + .end = TEGRA_TMR10_BASE + TEGRA_TMR10_SIZE - 1, .flags = IORESOURCE_MEM, }, [2] = { @@ -983,6 +1003,7 @@ static struct resource tegra_wdt_resources[] = { .flags = IORESOURCE_IRQ, }, }; +#endif struct platform_device tegra_wdt_device = { .name = "tegra_wdt", |