ARM: tegra: wdt: Remove legacy WDT device support
Kamal Kannan Balagopalan [Sat, 23 Jun 2012 06:19:28 +0000 (23:19 -0700)]
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>

arch/arm/mach-tegra/devices.c
arch/arm/mach-tegra/devices.h

index 25a4d71..cdebce9 100644 (file)
@@ -1709,25 +1709,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,
@@ -1802,13 +1791,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,
index fd06f23..48b885e 100644 (file)
@@ -127,8 +127,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;