diff options
| author | Gaurav Sarode <gsarode@nvidia.com> | 2011-08-29 14:35:40 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:48:41 -0800 |
| commit | 52191889db113c3d07713e6fed4e97b0c2cd867b (patch) | |
| tree | 40b4d43c47739250317337a8186cddfe225da229 /arch/arm/mach-tegra/tegra2_dvfs.c | |
| parent | 33577412f859133a8d8a08ae013659412bedc3dc (diff) | |
Revert "HACK: disable DVFS - tegra otg was calling clk_enable in atomic context"
This reverts commit a97ac421395cfb5998a53ccdc07c9a5f9c6777cd.
Fix bug 864254
Change-Id: I61b97e033413f7d61c06da83d9b6f971df9019cc
Reviewed-on: http://git-master/r/49685
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
Tested-by: Dan Willemsen <dwillemsen@nvidia.com>
Rebase-Id: Raf5717982cd8768f948f446bfaa48265bfd723f6
Diffstat (limited to 'arch/arm/mach-tegra/tegra2_dvfs.c')
| -rw-r--r-- | arch/arm/mach-tegra/tegra2_dvfs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/tegra2_dvfs.c b/arch/arm/mach-tegra/tegra2_dvfs.c index 624f384a0b1e..7ab1f733add7 100644 --- a/arch/arm/mach-tegra/tegra2_dvfs.c +++ b/arch/arm/mach-tegra/tegra2_dvfs.c @@ -155,7 +155,6 @@ static struct dvfs_rail *tegra2_dvfs_rails[] = { } static struct dvfs dvfs_init[] = { -#if 0 /* Cpu voltages (mV): 750, 775, 800, 825, 850, 875, 900, 925, 950, 975, 1000, 1025, 1050, 1100, 1125 */ CPU_DVFS("cpu", 0, 0, MHZ, 314, 314, 314, 456, 456, 456, 608, 608, 608, 760, 817, 817, 912, 1000), CPU_DVFS("cpu", 0, 1, MHZ, 314, 314, 314, 456, 456, 456, 618, 618, 618, 770, 827, 827, 922, 1000), @@ -242,7 +241,6 @@ static struct dvfs dvfs_init[] = { CORE_DVFS("vde", 3, 1, KHZ, 171000, 218500, 300000, 300000, 300000, 300000, 300000), /* What is this? */ CORE_DVFS("NVRM_DEVID_CLK_SRC", -1, 1, MHZ, 480, 600, 800, 1067, 1067, 1067, 1067), -#endif }; int tegra_dvfs_disable_core_set(const char *arg, const struct kernel_param *kp) |