projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
global: Migrate CONFIG_SYS_FSL* symbols to the CFG_SYS namespace
[platform/kernel/u-boot.git]
/
arch
/
powerpc
/
cpu
/
mpc85xx
/
speed.c
diff --git
a/arch/powerpc/cpu/mpc85xx/speed.c
b/arch/powerpc/cpu/mpc85xx/speed.c
index
4b6f3d2
..
31d0481
100644
(file)
--- a/
arch/powerpc/cpu/mpc85xx/speed.c
+++ b/
arch/powerpc/cpu/mpc85xx/speed.c
@@
-20,24
+20,20
@@
DECLARE_GLOBAL_DATA_PTR;
DECLARE_GLOBAL_DATA_PTR;
-
-#ifndef CONFIG_SYS_FSL_NUM_CC_PLLS
-#define CONFIG_SYS_FSL_NUM_CC_PLLS 6
-#endif
/* --------------------------------------------------------------- */
void get_sys_info(sys_info_t *sys_info)
{
/* --------------------------------------------------------------- */
void get_sys_info(sys_info_t *sys_info)
{
- volatile ccsr_gur_t *gur = (void *)(C
ONFI
G_SYS_MPC85xx_GUTS_ADDR);
+ volatile ccsr_gur_t *gur = (void *)(C
F
G_SYS_MPC85xx_GUTS_ADDR);
#ifdef CONFIG_FSL_CORENET
#ifdef CONFIG_FSL_CORENET
- volatile ccsr_clk_t *clk = (void *)(C
ONFI
G_SYS_FSL_CORENET_CLK_ADDR);
+ volatile ccsr_clk_t *clk = (void *)(C
F
G_SYS_FSL_CORENET_CLK_ADDR);
unsigned int cpu;
#ifdef CONFIG_HETROGENOUS_CLUSTERS
unsigned int dsp_cpu;
uint rcw_tmp1, rcw_tmp2;
#endif
#ifdef CONFIG_SYS_FSL_QORIQ_CHASSIS2
unsigned int cpu;
#ifdef CONFIG_HETROGENOUS_CLUSTERS
unsigned int dsp_cpu;
uint rcw_tmp1, rcw_tmp2;
#endif
#ifdef CONFIG_SYS_FSL_QORIQ_CHASSIS2
- int cc_group[12] = C
ONFI
G_SYS_FSL_CLUSTER_CLOCKS;
+ int cc_group[12] = C
F
G_SYS_FSL_CLUSTER_CLOCKS;
#endif
__maybe_unused u32 svr;
#endif
__maybe_unused u32 svr;
@@
-579,7
+575,7
@@
int get_clocks(void)
{
sys_info_t sys_info;
#ifdef CONFIG_ARCH_MPC8544
{
sys_info_t sys_info;
#ifdef CONFIG_ARCH_MPC8544
- volatile ccsr_gur_t *gur = (void *) C
ONFI
G_SYS_MPC85xx_GUTS_ADDR;
+ volatile ccsr_gur_t *gur = (void *) C
F
G_SYS_MPC85xx_GUTS_ADDR;
#endif
get_sys_info (&sys_info);
gd->cpu_clk = sys_info.freq_processor[0];
#endif
get_sys_info (&sys_info);
gd->cpu_clk = sys_info.freq_processor[0];