From 2f2a4ea1d2e8b11d39e18da9081a0a5ac516c387 Mon Sep 17 00:00:00 2001 From: Kamal Kannan Balagopalan Date: Fri, 22 Jun 2012 23:19:28 -0700 Subject: 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 Reviewed-on: http://git-master/r/109908 Reviewed-by: Varun Colbert Tested-by: Varun Colbert --- arch/arm/mach-tegra/devices.c | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 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 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, -- cgit v1.2.3