summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@nvidia.com>2011-02-15 17:40:42 -0800
committerVarun Colbert <vcolbert@nvidia.com>2011-02-17 17:37:35 -0800
commitee977cb00984349a540a5300c8d7f357db48f98e (patch)
treea1068346c907ce7dbaa0f7c707ac3f37c312a3c0
parentdcc9fce304ac5a6da2bedc14f5375e1dfc92edb5 (diff)
merge: tegra: DVFS: fix 1.2V core volt for USB
Original commit: 69f118a448d4b8f1309d9acb3b78448444962a94 ARM: tegra: DVFS: set 1.2V core voltage for USB to work was lost during a merge, because the table format changed on our side. Relevant merge that missed this: 8197cb15eaf0640d13c816926f65972ca6cbba84 Change-Id: I1701281f04a658697e4e8f011b18a5c9169cc879 Reviewed-on: http://git-master/r/19668 Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com> Tested-by: Daniel Willemsen <dwillemsen@nvidia.com> Reviewed-by: Nitin Kumbhar <nkumbhar@nvidia.com> Tested-by: Nitin Kumbhar <nkumbhar@nvidia.com> Reviewed-by: Cho-Che Cheng <jacheng@nvidia.com> Reviewed-by: Prajakta Gudadhe <pgudadhe@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/tegra2_dvfs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/tegra2_dvfs.c b/arch/arm/mach-tegra/tegra2_dvfs.c
index 61218af5b97f..34a62192346a 100644
--- a/arch/arm/mach-tegra/tegra2_dvfs.c
+++ b/arch/arm/mach-tegra/tegra2_dvfs.c
@@ -189,9 +189,9 @@ static struct dvfs dvfs_init[] = {
CORE_DVFS("nor", -1, 1, KHZ, 0, 92000, 92000, 92000, 92000, 92000, 92000),
CORE_DVFS("ide", -1, 1, KHZ, 0, 0, 100000, 100000, 100000, 100000, 100000),
CORE_DVFS("mipi", -1, 1, KHZ, 0, 40000, 40000, 40000, 40000, 60000, 60000),
- CORE_DVFS("usbd", -1, 1, KHZ, 0, 0, 480000, 480000, 480000, 480000, 480000),
- CORE_DVFS("usb2", -1, 1, KHZ, 0, 0, 480000, 480000, 480000, 480000, 480000),
- CORE_DVFS("usb3", -1, 1, KHZ, 0, 0, 480000, 480000, 480000, 480000, 480000),
+ CORE_DVFS("usbd", -1, 1, KHZ, 0, 0, 0, 480000, 480000, 480000, 480000),
+ CORE_DVFS("usb2", -1, 1, KHZ, 0, 0, 0, 480000, 480000, 480000, 480000),
+ CORE_DVFS("usb3", -1, 1, KHZ, 0, 0, 0, 480000, 480000, 480000, 480000),
CORE_DVFS("pcie", -1, 1, KHZ, 0, 0, 0, 250000, 250000, 250000, 250000),
CORE_DVFS("dsi", -1, 1, KHZ, 100000, 100000, 100000, 500000, 500000, 500000, 500000),
CORE_DVFS("tvo", -1, 1, KHZ, 0, 0, 0, 250000, 250000, 250000, 250000),