ARM: tegra: wdt: Replace legacy WDT with CPU WDTs
Kamal Kannan Balagopalan [Wed, 20 Jun 2012 00:35:19 +0000 (17:35 -0700)]
Tegra3 adds new CPU watchdog timers. Replace legacy WDT with
CPU WDTs in all Tegra3 platforms.

Bug 857748

Change-Id: I5bd30687003e6b2ebf09916fbd626d82f0bc0b76
Signed-off-by: Kamal Kannan Balagopalan <kbalagopalan@nvidia.com>
Reviewed-on: http://git-master/r/109907
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

arch/arm/mach-tegra/board-aruba.c
arch/arm/mach-tegra/board-cardhu.c
arch/arm/mach-tegra/board-enterprise.c
arch/arm/mach-tegra/board-kai.c
arch/arm/mach-tegra/board-p1852.c

index c27be09..3359003 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * arch/arm/mach-tegra/board-aruba.c
  *
- * Copyright (c) 2010-2011, NVIDIA Corporation.
+ * Copyright (c) 2010-2012, NVIDIA Corporation.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -450,7 +450,9 @@ static struct platform_device *aruba_devices[] __initdata = {
        &tegra_smmu_device,
 #endif
        &aruba_keys_device,
-       &tegra_wdt_device,
+       &tegra_wdt0_device,
+       &tegra_wdt1_device,
+       &tegra_wdt2_device,
 #if defined(CONFIG_SND_HDA_TEGRA)
        &tegra_hda_device,
 #endif
index 66fa0cb..bbfd8cb 100644 (file)
@@ -767,7 +767,9 @@ static struct platform_device *cardhu_devices[] __initdata = {
 #if defined(CONFIG_TEGRA_IOVMM_SMMU) ||  defined(CONFIG_TEGRA_IOMMU_SMMU)
        &tegra_smmu_device,
 #endif
-       &tegra_wdt_device,
+       &tegra_wdt0_device,
+       &tegra_wdt1_device,
+       &tegra_wdt2_device,
 #if defined(CONFIG_TEGRA_AVP)
        &tegra_avp_device,
 #endif
index c951258..a6f2425 100644 (file)
@@ -561,7 +561,9 @@ static struct platform_device *enterprise_devices[] __initdata = {
 #if defined(CONFIG_TEGRA_IOVMM_SMMU) || defined(CONFIG_TEGRA_IOMMU_SMMU)
        &tegra_smmu_device,
 #endif
-       &tegra_wdt_device,
+       &tegra_wdt0_device,
+       &tegra_wdt1_device,
+       &tegra_wdt2_device,
 #if defined(CONFIG_TEGRA_AVP)
        &tegra_avp_device,
 #endif
index 261eafe..9db90ad 100644 (file)
@@ -617,7 +617,9 @@ static struct platform_device *kai_devices[] __initdata = {
 #if defined(CONFIG_TEGRA_IOVMM_SMMU) || defined(CONFIG_TEGRA_IOMMU_SMMU)
        &tegra_smmu_device,
 #endif
-       &tegra_wdt_device,
+       &tegra_wdt0_device,
+       &tegra_wdt1_device,
+       &tegra_wdt2_device,
 #if defined(CONFIG_TEGRA_AVP)
        &tegra_avp_device,
 #endif
index 36767cd..e7b7fdd 100644 (file)
@@ -356,7 +356,9 @@ static struct platform_device *p1852_devices[] __initdata = {
        &tegra_avp_device,
 #endif
        &tegra_camera,
-       &tegra_wdt_device
+       &tegra_wdt0_device,
+       &tegra_wdt1_device,
+       &tegra_wdt2_device
 };