diff options
| author | Alex Frid <afrid@nvidia.com> | 2011-01-26 18:45:21 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:44:57 -0800 |
| commit | a1d1d6c44e4201e49f70c369dc48c7d71a02d2f8 (patch) | |
| tree | d8a3dfae2fe40d4c7e7d15d9680440c2f3644c98 /drivers/video/tegra/host/nvhost_acm.c | |
| parent | aa68acb7ac4c61dc65b733bd698b215da4a19ebe (diff) | |
ARM: tegra: nvhost: Add the 2nd 3D clock control
Original-Change-Id: Icfc816638b6010b46b2e587827322ef41a7e08d6
Reviewed-on: http://git-master/r/17141
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
Tested-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Original-Change-Id: I7b792509dd5c99f86bb4a85ba5b092a80022ed78
Rebase-Id: Rd45d9892a5343664f77ffef3f541682e86e54b5d
Diffstat (limited to 'drivers/video/tegra/host/nvhost_acm.c')
| -rw-r--r-- | drivers/video/tegra/host/nvhost_acm.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/video/tegra/host/nvhost_acm.c b/drivers/video/tegra/host/nvhost_acm.c index 51fef8e8240e..ee59900ed13c 100644 --- a/drivers/video/tegra/host/nvhost_acm.c +++ b/drivers/video/tegra/host/nvhost_acm.c @@ -100,10 +100,17 @@ static const char *get_module_clk_id(const char *module, int index) { if (index == 1 && strcmp(module, "gr2d") == 0) return "epp"; +#ifdef CONFIG_ARCH_TEGRA_3x_SOC + /* FIXME: Use proper gr3d2 index. */ + else if (index == 1 && strcmp(module, "gr3d") == 0) + return "gr3d2"; +#endif else if (index == 2 && strcmp(module, "gr2d") == 0) return "emc"; +#ifndef CONFIG_ARCH_TEGRA_3x_SOC else if (index == 1 && strcmp(module, "gr3d") == 0) return "emc"; +#endif else if (index == 1 && strcmp(module, "mpe") == 0) return "emc"; else if (index == 0) |