phone-side
/
uboot-mt623x
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

This commit is contained in:
Wolfgang Denk 2009-09-17 23:28:31 +02:00
parent 0413cfecea e67af44d01
commit 3dc5e00454
2 changed files with 22 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
cpu/ppc4xx/speed.c
View File

@ -165,29 +165,12 @@ void get_sys_info (PPC4xx_SYS_INFO * sysInfo)
} }
} }
sysInfo->freqOPB = sysInfo->freqPLB / sysInfo->pllOpbDiv;
sysInfo->freqEBC = sysInfo->freqPLB / sysInfo->pllExtBusDiv; sysInfo->freqEBC = sysInfo->freqPLB / sysInfo->pllExtBusDiv;
sysInfo->freqUART = sysInfo->freqProcessor; sysInfo->freqUART = sysInfo->freqProcessor;
} }
/********************************************
* get_OPB_freq
* return OPB bus freq in Hz
*********************************************/
ulong get_OPB_freq (void)
{
ulong val = 0;
PPC4xx_SYS_INFO sys_info;
get_sys_info (&sys_info);
val = sys_info.freqPLB / sys_info.pllOpbDiv;
return val;
}
/******************************************** /********************************************
* get_PCI_freq * get_PCI_freq
* return PCI bus freq in Hz * return PCI bus freq in Hz
@ -752,14 +735,6 @@ unsigned long determine_pci_clock_per(void)
} }
#endif #endif
ulong get_OPB_freq (void)
{
sys_info_t sys_info;
get_sys_info (&sys_info);
return sys_info.freqOPB;
}
#elif defined(CONFIG_XILINX_405) #elif defined(CONFIG_XILINX_405)
extern void get_sys_info (sys_info_t * sysInfo); extern void get_sys_info (sys_info_t * sysInfo);
extern ulong get_PCI_freq (void); extern ulong get_PCI_freq (void);
@ -874,23 +849,6 @@ void get_sys_info (PPC4xx_SYS_INFO * sysInfo)
} }
/********************************************
* get_OPB_freq
* return OPB bus freq in Hz
*********************************************/
ulong get_OPB_freq (void)
{
ulong val = 0;
PPC4xx_SYS_INFO sys_info;
get_sys_info (&sys_info);
val = sys_info.freqPLB / sys_info.pllOpbDiv;
return val;
}
/******************************************** /********************************************
* get_PCI_freq * get_PCI_freq
* return PCI bus freq in Hz * return PCI bus freq in Hz
@ -914,6 +872,7 @@ void get_sys_info (PPC4xx_SYS_INFO * sysInfo)
unsigned long sysClkPeriodPs = ONE_BILLION / (CONFIG_SYS_CLK_FREQ/1000); unsigned long sysClkPeriodPs = ONE_BILLION / (CONFIG_SYS_CLK_FREQ/1000);
unsigned long primad_cpudv; unsigned long primad_cpudv;
unsigned long m; unsigned long m;
unsigned long plloutb;
/* /*
* Read PLL Mode registers * Read PLL Mode registers
@ -996,26 +955,16 @@ void get_sys_info (PPC4xx_SYS_INFO * sysInfo)
sysInfo->freqPLB = (CONFIG_SYS_CLK_FREQ * m) / sysInfo->freqPLB = (CONFIG_SYS_CLK_FREQ * m) /
sysInfo->pllFwdDiv / sysInfo->pllPlbDiv; sysInfo->pllFwdDiv / sysInfo->pllPlbDiv;
sysInfo->freqOPB = (CONFIG_SYS_CLK_FREQ * sysInfo->pllFbkDiv) /
sysInfo->pllOpbDiv;
sysInfo->freqEBC = (CONFIG_SYS_CLK_FREQ * sysInfo->pllFbkDiv) / sysInfo->freqEBC = (CONFIG_SYS_CLK_FREQ * sysInfo->pllFbkDiv) /
sysInfo->pllExtBusDiv; sysInfo->pllExtBusDiv;
sysInfo->freqUART = sysInfo->freqVCOHz; plloutb = ((CONFIG_SYS_CLK_FREQ * ((cpr_pllc & PLLC_SRC_MASK) ?
} sysInfo->pllFwdDivB : sysInfo->pllFwdDiv) * sysInfo->pllFbkDiv) /
sysInfo->pllFwdDivB);
/******************************************** sysInfo->freqUART = plloutb;
* get_OPB_freq
* return OPB bus freq in Hz
*********************************************/
ulong get_OPB_freq (void)
{
ulong val = 0;
PPC4xx_SYS_INFO sys_info;
get_sys_info (&sys_info);
val = (CONFIG_SYS_CLK_FREQ * sys_info.pllFbkDiv) / sys_info.pllOpbDiv;
return val;
} }
#elif defined(CONFIG_405EX) #elif defined(CONFIG_405EX)
@ -1164,22 +1113,6 @@ void get_sys_info (sys_info_t * sysInfo)
sysInfo->freqUART = sysInfo->freqPLB; sysInfo->freqUART = sysInfo->freqPLB;
} }
/********************************************
* get_OPB_freq
* return OPB bus freq in Hz
*********************************************/
ulong get_OPB_freq (void)
{
ulong val = 0;
PPC4xx_SYS_INFO sys_info;
get_sys_info (&sys_info);
val = sys_info.freqPLB / sys_info.pllOpbDiv;
return val;
}
#endif #endif
int get_clocks (void) int get_clocks (void)
@ -1231,3 +1164,14 @@ ulong get_bus_freq (ulong dummy)
return val; return val;
} }
#if !defined(CONFIG_IOP480)
ulong get_OPB_freq (void)
{
PPC4xx_SYS_INFO sys_info;
get_sys_info (&sys_info);
return sys_info.freqOPB;
}
#endif

3
include/configs/acadia.h
View File

@ -225,7 +225,8 @@
*/ */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
CONFIG_AMCC_DEF_ENV \ CONFIG_AMCC_DEF_ENV \
CONFIG_AMCC_DEF_ENV_PPC \ CONFIG_AMCC_DEF_ENV_POWERPC \
CONFIG_AMCC_DEF_ENV_PPC_OLD \
CONFIG_AMCC_DEF_ENV_NOR_UPD \ CONFIG_AMCC_DEF_ENV_NOR_UPD \
CONFIG_AMCC_DEF_ENV_NAND_UPD \ CONFIG_AMCC_DEF_ENV_NAND_UPD \
"kernel_addr=fff10000\0" \ "kernel_addr=fff10000\0" \