CHROMIUM: ARM: Tegra: Clean up 3D clock init WAR.

arch/arm/mach-tegra/common.c

 /*
  * arch/arm/mach-tegra/common.c
  *
  * Copyright (C) 2010 Google, Inc.
  *
  * Author:
  *      Colin Cross <ccross@android.com>
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
  * may be copied, distributed, and modified under those terms.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  */
 
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
 
 #include <asm/hardware/cache-l2x0.h>
 
 #include <mach/iomap.h>
+#include <mach/clk.h>
 #include <mach/dma.h>
+#include <mach/powergate.h>
 #include <mach/system.h>
 
 #include "board.h"
 #include "clock.h"
 #include "fuse.h"
 
 void (*tegra_reset)(char mode, const char *cmd);
 
 static __initdata struct tegra_clk_init_table common_clk_init_table[] = {
         /* name         parent          rate            enabled */
@@ skipping 20 matching lines @@
         void __iomem *p = IO_ADDRESS(TEGRA_ARM_PERIF_BASE) + 0x3000;
 
         writel(0x331, p + L2X0_TAG_LATENCY_CTRL);
         writel(0x441, p + L2X0_DATA_LATENCY_CTRL);
 
         l2x0_init(p, 0x6C080001, 0x8200c3fe);
 #endif
 
 }
 
-void __init tegra_common_init(void)
+void __init tegra_common_init(struct tegra_clk_init_table *board_clk_init_table)
 {
+        struct clk *clk;
+
         tegra_init_fuse();
         tegra_init_clock();
         tegra_clk_init_from_table(common_clk_init_table);
+        tegra_clk_init_from_table(board_clk_init_table);
+
+        /* HACK: reset 3d clock */
+        clk = clk_get_sys("3d", NULL);
+        tegra_powergate_power_off(TEGRA_POWERGATE_3D);
+        tegra_periph_reset_assert(clk);
+        tegra_powergate_power_on(TEGRA_POWERGATE_3D);
+        clk_enable(clk);
+        udelay(10);
+        tegra_powergate_remove_clamping(TEGRA_POWERGATE_3D);
+        tegra_periph_reset_deassert(clk);
+        clk_put(clk);
+
         tegra_init_cache();
 #ifdef CONFIG_TEGRA_SYSTEM_DMA
         tegra_dma_init();
 #endif
 }