From d72539835f9b942ffd87156c0528106b8b5c6e57 Mon Sep 17 00:00:00 2001 From: vdumpa Date: Wed, 16 Feb 2011 00:01:24 -0800 Subject: 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 Tested-by: Krishna Reddy Reviewed-by: Yu-Huan Hsu Change-Id: Ic8c9907998a2ab1777ea2b00f1acceb6d66c10e5 --- arch/arm/mach-tegra/devices.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'arch/arm/mach-tegra/devices.c') 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, }, }; -- cgit v1.2.3