diff options
| author | Xin Xie <xxie@nvidia.com> | 2013-02-19 11:21:37 -0800 |
|---|---|---|
| committer | Riham Haidar <rhaidar@nvidia.com> | 2013-03-08 14:16:23 -0800 |
| commit | 95a6756b11c7f6a69093c46ccb25bc760b8a4d63 (patch) | |
| tree | 968c1d03069ce3dc20e6d915678ea4f482cc6e84 /drivers/watchdog | |
| parent | bf93ff4541448e7560d866f00d129906d8aefceb (diff) | |
watchdog: tegra: add tegra11x support
bug 1239979
Change-Id: I4ca7e4682bf2b27254024f9e8236c7e8868b4e73
Signed-off-by: Xin Xie <xxie@nvidia.com>
Reviewed-on: http://git-master/r/202740
(cherry picked from commit ddeeb47d676652dacfba7edf79fb423e48513a31)
Reviewed-on: http://git-master/r/205284
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/tegra_wdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/tegra_wdt.c b/drivers/watchdog/tegra_wdt.c index 2db82517c13d..b82a52cc629f 100644 --- a/drivers/watchdog/tegra_wdt.c +++ b/drivers/watchdog/tegra_wdt.c @@ -3,7 +3,7 @@ * * watchdog driver for NVIDIA tegra internal watchdog * - * Copyright (c) 2012, NVIDIA Corporation. + * Copyright (c) 2012-2013, NVIDIA Corporation. All rights reserved. * * based on drivers/watchdog/softdog.c and drivers/watchdog/omap_wdt.c * @@ -118,7 +118,7 @@ static irqreturn_t tegra_wdt_interrupt(int irq, void *dev_id) writel(TIMER_PCR_INTR, wdt->wdt_timer + TIMER_PCR); return IRQ_HANDLED; } -#elif defined(CONFIG_ARCH_TEGRA_3x_SOC) +#elif defined(CONFIG_ARCH_TEGRA_3x_SOC) || defined(CONFIG_ARCH_TEGRA_11x_SOC) #define TIMER_PTV 0 #define TIMER_EN (1 << 31) |