AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

OMAP1: clock_data: use runtime cpu / machine checks

Browse Source 
Otherwise multi-omap1 configurations may set wrong clock speed.

Created and tested against l-o master on Amstrad Delta.

Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
This commit is contained in:
Janusz Krzysztofik 2010-12-21 21:08:15 -07:00 committed by Paul Walmsley
parent 1124d2f918
commit 65ae65c905
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/arm/mach-omap1/clock_data.c
View File

@ -823,12 +823,10 @@ int __init omap1_clk_init(void)
crystal_type = info->system_clock_type; crystal_type = info->system_clock_type;
} }
#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850) if (cpu_is_omap7xx())
ck_ref.rate = 13000000; ck_ref.rate = 13000000;
#elif defined(CONFIG_ARCH_OMAP16XX) if (cpu_is_omap16xx() && crystal_type == 2)
if (crystal_type == 2)
ck_ref.rate = 19200000; ck_ref.rate = 19200000;
#endif
pr_info("Clocks: ARM_SYSST: 0x%04x DPLL_CTL: 0x%04x ARM_CKCTL: " pr_info("Clocks: ARM_SYSST: 0x%04x DPLL_CTL: 0x%04x ARM_CKCTL: "
"0x%04x\n", omap_readw(ARM_SYSST), omap_readw(DPLL_CTL), "0x%04x\n", omap_readw(ARM_SYSST), omap_readw(DPLL_CTL),
@ -883,10 +881,11 @@ int __init omap1_clk_init(void)
ck_dpll1.rate / 1000000, (ck_dpll1.rate / 100000) % 10, ck_dpll1.rate / 1000000, (ck_dpll1.rate / 100000) % 10,
arm_ck.rate / 1000000, (arm_ck.rate / 100000) % 10); arm_ck.rate / 1000000, (arm_ck.rate / 100000) % 10);
#if defined(CONFIG_MACH_OMAP_PERSEUS2) || defined(CONFIG_MACH_OMAP_FSAMPLE) if (machine_is_omap_perseus2() || machine_is_omap_fsample()) {
/* Select slicer output as OMAP input clock */ /* Select slicer output as OMAP input clock */
omap_writew(omap_readw(OMAP7XX_PCC_UPLD_CTRL) & ~0x1, OMAP7XX_PCC_UPLD_CTRL); omap_writew(omap_readw(OMAP7XX_PCC_UPLD_CTRL) & ~0x1,
#endif OMAP7XX_PCC_UPLD_CTRL);
}
/* Amstrad Delta wants BCLK high when inactive */ /* Amstrad Delta wants BCLK high when inactive */
if (machine_is_ams_delta()) if (machine_is_ams_delta())