Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3170)

Unified Diff: arch/arm/mach-tegra/board-seaboard.c

Issue 4120008: CHROMIUM: ARM: Tegra: Clean up 3D clock init WAR. (Closed) Base URL: http://git.chromium.org/git/kernel-next.git
Patch Set: Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « arch/arm/mach-tegra/board-harmony.c ('k') | arch/arm/mach-tegra/board-ventana.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: arch/arm/mach-tegra/board-seaboard.c
diff --git a/arch/arm/mach-tegra/board-seaboard.c b/arch/arm/mach-tegra/board-seaboard.c
index b188cd1e646df5ace05517c113cf322593e80466..76af33867faaf7e3561d5272e19c9fd9a6bbb2f9 100644
--- a/arch/arm/mach-tegra/board-seaboard.c
+++ b/arch/arm/mach-tegra/board-seaboard.c
@@ -40,7 +40,6 @@
#include <mach/iomap.h>
#include <mach/io.h>
#include <mach/gpio.h>
-#include <mach/clk.h>
#include <mach/kbc.h>
#include <mach/suspend.h>
@@ -425,33 +424,15 @@ static struct tegra_suspend_platform_data seaboard_suspend = {
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);
« no previous file with comments | « arch/arm/mach-tegra/board-harmony.c ('k') | arch/arm/mach-tegra/board-ventana.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698