summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAlex Frid <afrid@nvidia.com>2010-06-23 22:36:44 -0700
committerGary King <gking@nvidia.com>2010-06-24 11:22:51 -0700
commit9de542c0f371bb69a115dbdca2e5bf22993f91ff (patch)
tree9697b518d90f83d1597e1adb0d656078af5e36e7 /arch
parentddc91484aaead10c4dfef1bdda5bd40b33d3da89 (diff)
[ARM/tegra] RM: Extended HDMI clock source selection.
Added oscillator as HDMI clock source. This configuration is possible in VGA mode, and must be supported to keep HDMI in sync with Display. Change-Id: I57aaa9126876ad9a35acad02bab3e4979d8e1f6a Reviewed-on: http://git-master/r/3120 Tested-by: Aleksandr Frid <afrid@nvidia.com> Reviewed-by: Arthur Spence <aspence@nvidia.com> Reviewed-by: Gary King <gking@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/nvrm/core/ap15/ap15rm_clock_config.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/nvrm/core/ap15/ap15rm_clock_config.c b/arch/arm/mach-tegra/nvrm/core/ap15/ap15rm_clock_config.c
index 96ae3488025e..e6723ea7c321 100644
--- a/arch/arm/mach-tegra/nvrm/core/ap15/ap15rm_clock_config.c
+++ b/arch/arm/mach-tegra/nvrm/core/ap15/ap15rm_clock_config.c
@@ -1245,11 +1245,15 @@ NvRmPrivAp15IsModuleClockException(
case NvRmModuleID_Hdmi:
/*
* Complete HDMI configuration; choose among possible sources:
- * PLLP, PLLD, PLLC in the same order as for display (PLLD or
- * PLLC should be already configured properly for display)
+ * Osc, PLLP, PLLD, PLLC in the same order as for display (PLLD
+ * or PLLC should be already configured properly for display)
*/
if (flags & NvRmClockConfig_MipiSync)
SourceId = NvRmClockSource_PllD0;
+ else if (NvRmIsFreqRangeReachable(
+ NvRmPrivGetClockSourceFreq(NvRmClockSource_ClkM),
+ MinFreq, MaxFreq, NVRM_DISPLAY_DIVIDER_MAX))
+ SourceId = NvRmClockSource_ClkM;
else if (NvRmIsFreqRangeReachable(NVRM_PLLP_FIXED_FREQ_KHZ,
MinFreq, MaxFreq, NVRM_DISPLAY_DIVIDER_MAX))
SourceId = NvRmClockSource_PllP0;