diff options
author | Kamal Kannan Balagopalan <kbalagopalan@nvidia.com> | 2012-06-22 23:19:28 -0700 |
---|---|---|
committer | Varun Colbert <vcolbert@nvidia.com> | 2012-07-09 15:26:15 -0700 |
commit | 2f2a4ea1d2e8b11d39e18da9081a0a5ac516c387 (patch) | |
tree | 1333dbfd8f4b64b4858245f92d0c4d95df4ba81c /arch | |
parent | 0c70326a883f49677d57125a6cc3e669f1bf1268 (diff) |
ARM: tegra: wdt: Remove legacy WDT device support
Tegra3 adds new CPU watchdog timers. Remove the obsolete legacy
WDT support for Tegra3
Bug 857748
Change-Id: I82478e1b43f22f39c1b8e6e66ae5299ffd079d1b
Signed-off-by: Kamal Kannan Balagopalan <kbalagopalan@nvidia.com>
Reviewed-on: http://git-master/r/109908
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-tegra/devices.c | 32 | ||||
-rw-r--r-- | arch/arm/mach-tegra/devices.h | 3 |
2 files changed, 9 insertions, 26 deletions
diff --git a/arch/arm/mach-tegra/devices.c b/arch/arm/mach-tegra/devices.c index 8fdf0e4457e1..fb97f94b939f 100644 --- a/arch/arm/mach-tegra/devices.c +++ b/arch/arm/mach-tegra/devices.c @@ -1373,25 +1373,14 @@ static struct resource tegra_wdt_resources[] = { .flags = IORESOURCE_IRQ, }, }; -#else -static struct resource tegra_wdt_resources[] = { - [0] = { - .start = TEGRA_WDT0_BASE, - .end = TEGRA_WDT0_BASE + TEGRA_WDT0_SIZE - 1, - .flags = IORESOURCE_MEM, - }, - [1] = { - .start = TEGRA_TMR10_BASE, - .end = TEGRA_TMR10_BASE + TEGRA_TMR10_SIZE - 1, - .flags = IORESOURCE_MEM, - }, - [2] = { - .start = INT_WDT_CPU, - .end = INT_WDT_CPU, - .flags = IORESOURCE_IRQ, - }, -}; +struct platform_device tegra_wdt_device = { + .name = "tegra_wdt", + .id = -1, + .num_resources = ARRAY_SIZE(tegra_wdt_resources), + .resource = tegra_wdt_resources, +}; +#else static struct resource tegra_wdt0_resources[] = { [0] = { .start = TEGRA_WDT0_BASE, @@ -1466,13 +1455,6 @@ struct platform_device tegra_wdt2_device = { }; #endif -struct platform_device tegra_wdt_device = { - .name = "tegra_wdt", - .id = -1, - .num_resources = ARRAY_SIZE(tegra_wdt_resources), - .resource = tegra_wdt_resources, -}; - static struct resource tegra_pwfm0_resource = { .start = TEGRA_PWFM0_BASE, .end = TEGRA_PWFM0_BASE + TEGRA_PWFM0_SIZE - 1, diff --git a/arch/arm/mach-tegra/devices.h b/arch/arm/mach-tegra/devices.h index 790f801e7f0b..830f2cf7accc 100644 --- a/arch/arm/mach-tegra/devices.h +++ b/arch/arm/mach-tegra/devices.h @@ -97,8 +97,9 @@ extern struct platform_device tegra_gart_device; #else extern struct platform_device tegra_smmu_device; #endif +#if defined(CONFIG_ARCH_TEGRA_2x_SOC) extern struct platform_device tegra_wdt_device; -#if !defined(CONFIG_ARCH_TEGRA_2x_SOC) +#else extern struct platform_device tegra_wdt0_device; extern struct platform_device tegra_wdt1_device; extern struct platform_device tegra_wdt2_device; |