V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

armv8/fsl_lsch2: Correct the cores frequency initialization 

The register CLKCNCSR controls the frequency of all cores in the same
cluster.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
This commit is contained in:
Hou Zhiqiang 2016-06-12 14:42:04 +08:00 committed by York Sun
parent b66a5c03a0
commit f3acaf438d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c
View File

@ -11,6 +11,7 @@
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#include <asm/arch/soc.h> #include <asm/arch/soc.h>
#include <fsl_ifc.h> #include <fsl_ifc.h>
#include "cpu.h"
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -47,7 +48,7 @@ void get_sys_info(struct sys_info *sys_info)
[5] = 2, /* CC2 PPL / 2 */ [5] = 2, /* CC2 PPL / 2 */
}; };
uint i; uint i, cluster;
uint freq_c_pll[CONFIG_SYS_FSL_NUM_CC_PLLS]; uint freq_c_pll[CONFIG_SYS_FSL_NUM_CC_PLLS];
uint ratio[CONFIG_SYS_FSL_NUM_CC_PLLS]; uint ratio[CONFIG_SYS_FSL_NUM_CC_PLLS];
unsigned long sysclk = CONFIG_SYS_CLK_FREQ; unsigned long sysclk = CONFIG_SYS_CLK_FREQ;
@ -80,8 +81,9 @@ void get_sys_info(struct sys_info *sys_info)
freq_c_pll[i] = sys_info->freq_systembus * ratio[i]; freq_c_pll[i] = sys_info->freq_systembus * ratio[i];
} }
for (cpu = 0; cpu < CONFIG_MAX_CPUS; cpu++) { for_each_cpu(i, cpu, cpu_numcores(), cpu_mask()) {
u32 c_pll_sel = (in_be32(&clk->clkcsr[cpu].clkcncsr) >> 27) cluster = fsl_qoriq_core_to_cluster(cpu);
u32 c_pll_sel = (in_be32(&clk->clkcsr[cluster].clkcncsr) >> 27)
& 0xf; & 0xf;
u32 cplx_pll = core_cplx_pll[c_pll_sel]; u32 cplx_pll = core_cplx_pll[c_pll_sel];