diff options
| author | Bitan Biswas <bbiswas@nvidia.com> | 2012-01-24 13:22:23 +0530 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-07-16 17:14:36 -0700 |
| commit | f4cd0d4448d65a42b65c338f85a3ab8064923c61 (patch) | |
| tree | 3e15183fd8e06d053d6a8fd2823cb6aada58a6be /arch | |
| parent | c5246863929e52eca234722e229e3607e41e055c (diff) | |
Revert "arm: tegra: power: disable all sd dpd"
This reverts commit 8924926cdb77c6ab270867d4caef7a8cdacd11f2.
Bug 924452
Bug 929628
Signed-off-by: Bitan Biswas <bbiswas@nvidia.com>
(cherry picked from commit 142b34993404c853579864f7b7b4f320fb92a715)
Change-Id: I9d49703799e32d410beba18938e94e4b641eea6f
(cherry picked from commit 8de60b7a832bfbbf09e75def756379dbb2d14c3e)
Reviewed-on: http://git-master/r/113387
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Wen Yi <wyi@nvidia.com>
Tested-by: Wen Yi <wyi@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/pm-t3.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/pm-t3.c b/arch/arm/mach-tegra/pm-t3.c index a83174224498..89041c41c389 100644 --- a/arch/arm/mach-tegra/pm-t3.c +++ b/arch/arm/mach-tegra/pm-t3.c @@ -3,7 +3,7 @@ * * Tegra3 SOC-specific power and cluster management * - * Copyright (c) 2009-2012, NVIDIA Corporation. + * Copyright (c) 2009-2012, NVIDIA CORPORATION. All rights reserved. * * 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,10 @@ void tegra_lp0_cpu_mode(bool enter) #define PMC_DPD_SAMPLE 0x20 struct tegra_io_dpd tegra_list_io_dpd[] = { -/* Empty DPD list - sd dpd entries removed */ + /* sd dpd bits in dpd2 register */ + IO_DPD_INFO("sdhci-tegra.0", 1, 1), /* SDMMC1 */ + IO_DPD_INFO("sdhci-tegra.2", 1, 2), /* SDMMC3 */ + IO_DPD_INFO("sdhci-tegra.3", 1, 3), /* SDMMC4 */ }; struct tegra_io_dpd *tegra_io_dpd_get(struct device *dev) @@ -481,8 +484,10 @@ void tegra_io_dpd_enable(struct tegra_io_dpd *hnd) unsigned int dpd_status; unsigned int dpd_enable_lsb; - if ((!hnd)) + if ((!hnd)) { + pr_warn("SD IO DPD handle NULL in %s\n", __func__); return; + } spin_lock(&tegra_io_dpd_lock); dpd_enable_lsb = (hnd->io_dpd_reg_index) ? APBDEV_DPD2_ENABLE_LSB : APBDEV_DPD_ENABLE_LSB; @@ -510,8 +515,10 @@ void tegra_io_dpd_disable(struct tegra_io_dpd *hnd) unsigned int dpd_status; unsigned int dpd_enable_lsb; - if ((!hnd)) + if ((!hnd)) { + pr_warn("SD IO DPD handle NULL in %s\n", __func__); return; + } spin_lock(&tegra_io_dpd_lock); dpd_enable_lsb = (hnd->io_dpd_reg_index) ? APBDEV_DPD2_ENABLE_LSB : APBDEV_DPD_ENABLE_LSB; |