diff options
| author | Bharat Nihalani <bnihalani@nvidia.com> | 2013-10-04 18:00:36 +0530 |
|---|---|---|
| committer | Bharat Nihalani <bnihalani@nvidia.com> | 2013-10-04 09:28:03 -0700 |
| commit | 34c378e8f4ec996e8b02f7862cf4fb76999b5c31 (patch) | |
| tree | 0be5f2a384e6faf3af76a56221c43f6dd64791f8 /arch/arm/mach-tegra/powergate.c | |
| parent | 62321b9b219745f4054652e0673e80a5e041fba5 (diff) | |
Revert "arm: tegra: make sure that the PG request is accepted by PMC"
This reverts commit 7028bfdcaee06241d1691400ccb73afe0a2c659e since it
causes issues with power-gating GPU.
Bug 1382374
Change-Id: I0a67a4c11e99f85164f2dfb1a0065597bbc2a2b2
Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-on: http://git-master/r/281770
Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'arch/arm/mach-tegra/powergate.c')
| -rw-r--r-- | arch/arm/mach-tegra/powergate.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/arch/arm/mach-tegra/powergate.c b/arch/arm/mach-tegra/powergate.c index 69fe1c705e23..1b88a8f20a54 100644 --- a/arch/arm/mach-tegra/powergate.c +++ b/arch/arm/mach-tegra/powergate.c @@ -58,7 +58,6 @@ int tegra_powergate_set(int id, bool new_state) bool status; unsigned long flags; spinlock_t *lock; - u32 reg; /* 10us timeout for toggle operation if it takes affect*/ int toggle_timeout = 10; @@ -89,38 +88,7 @@ int tegra_powergate_set(int id, bool new_state) return 0; } -#if !defined(CONFIG_ARCH_TEGRA_3x_SOC) - /* Wait if PMC is already processing some other power gating request */ - do { - udelay(1); - reg = pmc_read(PWRGATE_TOGGLE); - contention_timeout--; - } while ((contention_timeout > 0) && (status & PWRGATE_TOGGLE_START)); - - if (contention_timeout > 0) - pr_err(" Timed out waiting for PMC to submit \ - new power gate request \n"); - contention_timeout = 100; -#endif - - /* Submit power gate request */ pmc_write(PWRGATE_TOGGLE_START | id, PWRGATE_TOGGLE); - -#if !defined(CONFIG_ARCH_TEGRA_3x_SOC) - /* Wait while PMC accepts the request */ - do { - udelay(1); - reg = pmc_read(PWRGATE_TOGGLE); - contention_timeout--; - } while ((contention_timeout > 0) && (status & PWRGATE_TOGGLE_START)); - - if (contention_timeout > 0) - pr_err(" Timed out waiting for PMC to accept \ - new power gate request \n"); - contention_timeout = 100; -#endif - - /* Check power gate status */ do { do { udelay(1); |