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

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

 /*
  * arch/arm/mach-tegra/board-seaboard.c
  *
  * Copyright (c) 2010, NVIDIA Corporation.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
@@ skipping 22 matching lines @@
 #include <linux/delay.h>
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
 
 #include <mach/iomap.h>
 #include <mach/irqs.h>
 #include <mach/pinmux.h>
 #include <mach/iomap.h>
 #include <mach/io.h>
 #include <mach/gpio.h>
-#include <mach/clk.h>
 #include <mach/kbc.h>
 #include <mach/suspend.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
 #include "board.h"
 #include "board-seaboard.h"
 #include "clock.h"
 #include "devices.h"
@@ skipping 364 matching lines @@
         .core_timer = 0x7e7e,
         .core_off_timer = 0x7f,
         .separate_req = true,
         .corereq_high = false,
         .sysclkreq_high = true,
         .suspend_mode = TEGRA_SUSPEND_LP1,
 };
 
 static void __init tegra_seaboard_init(void)
 {
-        struct clk *clk;
-
-        tegra_common_init();
+        tegra_common_init(seaboard_clk_init_table);
         tegra_init_suspend(&seaboard_suspend);
-
-        tegra_clk_init_from_table(seaboard_clk_init_table);
         seaboard_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(seaboard_devices, ARRAY_SIZE(seaboard_devices));
-
         seaboard_panel_init();
         seaboard_sdhci_init();
         seaboard_i2c_init();
         seaboard_regulator_init();
         seaboard_kbc_init();
-
         seaboard_wlan_init();
 
         tegra_gpio_enable(TEGRA_GPIO_LIDSWITCH);
         tegra_gpio_enable(TEGRA_GPIO_POWERKEY);
 }
 
 MACHINE_START(TEGRA_SEABOARD, "seaboard")
         .boot_params    = 0x00000100,
         .phys_io        = IO_APB_PHYS,
         .io_pg_offst    = ((IO_APB_VIRT) >> 18) & 0xfffc,
         .init_irq       = tegra_init_irq,
         .init_machine   = tegra_seaboard_init,
         .map_io         = tegra_map_common_io,
         .timer          = &tegra_timer,
 MACHINE_END