diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-06-12 22:13:55 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-06-12 22:13:55 +0200 |
| commit | d5662ba09bb165d970d3cd2e2c25fe0a1a120328 (patch) | |
| tree | 866ba71189e7995ec91f216f94f57612707c2f86 | |
| parent | 090a9fba60fb60d58ef9fc29d7b0c93f08ce2c9e (diff) | |
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.
| -rw-r--r-- | arch/arm/mach-tegra/tegra2_clocks.c | 3 |
1 files changed, 3 insertions, 0 deletions
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; } |