From d5662ba09bb165d970d3cd2e2c25fe0a1a120328 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Fri, 12 Jun 2015 22:13:55 +0200 Subject: colibri_t20: hack: prevent rare boot lock-up A customer reported rare boot lock-ups every odd 500 software reboot cycle. This patch removes the display clock initialisation from the early clock initialisation as the boot loader anyway already initialised the same. --- arch/arm/mach-tegra/tegra2_clocks.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch') diff --git a/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c index 58d2dcddbfaa..e3a4dc9872e0 100644 --- a/arch/arm/mach-tegra/tegra2_clocks.c +++ b/arch/arm/mach-tegra/tegra2_clocks.c @@ -3075,11 +3075,14 @@ static int __init tegra_soc_preinit_clocks(void) clk_setbits(HOST1X_CLK_REG, HOST1X_CLK_SRC, GCLK_SRC_MASK); clk_clrbit(RST_DEVICES_L, CLK_RSTENB_L_HOST1X_BIT); +#ifndef CONFIG_MACH_COLIBRI_T20 +/* Hack to prevent rare boot lock-ups every odd 500 software reboot cycle */ /* DISP1_CLK_SRC: DCLK_SRC_PLLP_OUT0 */ clk_setbit(RST_DEVICES_L, CLK_RSTENB_L_DISP1_BIT); clk_setbit(CLK_OUT_ENB_L, CLK_RSTENB_L_DISP1_BIT); clk_setbits(DISP1_CLK_REG, DISP1_CLK_SRC, GCLK_SRC_MASK); clk_clrbit(RST_DEVICES_L, CLK_RSTENB_L_DISP1_BIT); +#endif /* !CONFIG_MACH_COLIBRI_T20 */ return 0; } -- cgit v1.2.3