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

arch/arm/mach-tegra/board-harmony.c

 /*
  * arch/arm/mach-tegra/board-harmony.c
  *
  * Copyright (C) 2010 Google, Inc.
  *
  * 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,
@@ skipping 16 matching lines @@
 #include <linux/delay.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 #include <asm/setup.h>
 
 #include <mach/iomap.h>
 #include <mach/irqs.h>
 #include <mach/nand.h>
-#include <mach/clk.h>
 
 #include "clock.h"
 #include "board.h"
 #include "board-harmony.h"
-#include "clock.h"
 #include "devices.h"
 
 /* NVidia bootloader tags */
 #define ATAG_NVIDIA             0x41000801
 
 #define ATAG_NVIDIA_RM                  0x1
 #define ATAG_NVIDIA_DISPLAY             0x2
 #define ATAG_NVIDIA_FRAMEBUFFER         0x3
 #define ATAG_NVIDIA_CHIPSHMOO           0x4
 #define ATAG_NVIDIA_CHIPSHMOOPHYS       0x5
@@ skipping 154 matching lines @@
         { "epp",        "pll_m",        266400000,      true},
         { "vi",         "pll_m",        49333333,       true},
         { "emc",        "pll_m",        666000000,      true},
         { "pll_c",      "clk_m",        600000000,      true},
         { "pll_c_out1", "pll_c",        240000000,      true},
         { NULL,         NULL,           0,              0},
 };
 
 static void __init tegra_harmony_init(void)
 {
-        struct clk *clk;
-
-        tegra_common_init();
-
-        tegra_clk_init_from_table(harmony_clk_init_table);
-
+        tegra_common_init(harmony_clk_init_table);
         harmony_pinmux_init();
-
-        /* HACK: reset 3d clock */
-        writel(0x101, IO_ADDRESS(TEGRA_PMC_BASE) + 0x30);
-        clk = clk_get_sys("3d", NULL);
-        tegra_periph_reset_assert(clk);
-        writel(0x101, IO_ADDRESS(TEGRA_PMC_BASE) + 0x30);
-        clk_enable(clk);
-        udelay(10);
-        writel(1 << 1, IO_ADDRESS(TEGRA_PMC_BASE) + 0x34);
-        tegra_periph_reset_deassert(clk);
-        clk_put(clk);
-
         platform_add_devices(harmony_devices, ARRAY_SIZE(harmony_devices));
-
         harmony_panel_init();
         harmony_sdhci_init();
 }
 
 MACHINE_START(HARMONY, "harmony")
         .boot_params  = 0x00000100,
         .phys_io        = IO_APB_PHYS,
         .io_pg_offst    = ((IO_APB_VIRT) >> 18) & 0xfffc,
         .fixup          = tegra_harmony_fixup,
         .init_irq       = tegra_init_irq,
         .init_machine   = tegra_harmony_init,
         .map_io         = tegra_map_common_io,
         .timer          = &tegra_timer,
 MACHINE_END
 
 MACHINE_START(TEGRA_LEGACY, "tegra_legacy")
         .boot_params  = 0x00000100,
         .phys_io        = IO_APB_PHYS,
         .io_pg_offst    = ((IO_APB_VIRT) >> 18) & 0xfffc,
         .fixup          = tegra_harmony_fixup,
         .init_irq       = tegra_init_irq,
         .init_machine   = tegra_harmony_init,
         .map_io         = tegra_map_common_io,
         .timer          = &tegra_timer,
 MACHINE_END