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>
Rebase-Id: R57c4b7185132cad1d17b9bdd9f5722b12e2a839f

diff --git a/arch/arm/mach-tegra/devices.c b/arch/arm/mach-tegra/devices.c
index 83944dd001e1133e4015e5d94c43a39b8f9c8938..5a990f31fe3c045756442b04f8f1cde3afce2de8 100644 (file)
--- a/arch/arm/mach-tegra/devices.c
+++ b/arch/arm/mach-tegra/devices.c
@@ -1708,25 +1708,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,
@@ -1801,13 +1790,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_pwfm_resource = {
        .start  = TEGRA_PWFM_BASE,
        .end    = TEGRA_PWFM_BASE + TEGRA_PWFM_SIZE - 1,

diff --git a/arch/arm/mach-tegra/devices.h b/arch/arm/mach-tegra/devices.h
index 65db6633eeb3a82867a75c6675ecdd0aab0c0d43..e81174ccc4bb0265c57129b298c1c562305164f8 100644 (file)
--- a/arch/arm/mach-tegra/devices.h
+++ b/arch/arm/mach-tegra/devices.h
@@ -126,8 +126,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;