ARM: tegra: nvhost: Add the 2nd 3D clock control
Alex Frid [Thu, 27 Jan 2011 02:45:21 +0000 (18:45 -0800)]
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

drivers/video/tegra/host/nvhost_acm.c

index 51fef8e..ee59900 100644 (file)
@@ -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)