diff options
| author | Kamal Kannan Balagopalan <kbalagopalan@nvidia.com> | 2012-06-19 17:35:19 -0700 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2012-07-09 15:17:19 -0700 |
| commit | 0c70326a883f49677d57125a6cc3e669f1bf1268 (patch) | |
| tree | 9141db7456213f3721090dcce1f0f308dc251372 /arch/arm | |
| parent | 3644803bd9f0697b4df8a0bb59b01eeb85c02034 (diff) | |
ARM: tegra: wdt: Replace legacy WDT with CPU WDTs
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-tegra/board-aruba.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-enterprise.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-kai.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-p1852.c | 4 |
5 files changed, 16 insertions, 6 deletions
diff --git a/arch/arm/mach-tegra/board-aruba.c b/arch/arm/mach-tegra/board-aruba.c index 152f34720489..05e938a0c5c9 100644 --- a/arch/arm/mach-tegra/board-aruba.c +++ b/arch/arm/mach-tegra/board-aruba.c @@ -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 @@ -446,7 +446,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 diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c index 9d17460614b2..32b59bdf0119 100644 --- a/arch/arm/mach-tegra/board-cardhu.c +++ b/arch/arm/mach-tegra/board-cardhu.c @@ -761,7 +761,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 diff --git a/arch/arm/mach-tegra/board-enterprise.c b/arch/arm/mach-tegra/board-enterprise.c index c44eda00e59e..9281066c60dc 100644 --- a/arch/arm/mach-tegra/board-enterprise.c +++ b/arch/arm/mach-tegra/board-enterprise.c @@ -553,7 +553,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 diff --git a/arch/arm/mach-tegra/board-kai.c b/arch/arm/mach-tegra/board-kai.c index d15276a30606..98caedc1c085 100644 --- a/arch/arm/mach-tegra/board-kai.c +++ b/arch/arm/mach-tegra/board-kai.c @@ -614,7 +614,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 diff --git a/arch/arm/mach-tegra/board-p1852.c b/arch/arm/mach-tegra/board-p1852.c index a8ea75340997..9cd641fd8c8a 100644 --- a/arch/arm/mach-tegra/board-p1852.c +++ b/arch/arm/mach-tegra/board-p1852.c @@ -355,7 +355,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 }; |