diff options
| -rw-r--r-- | src/arch/ppc/include/clock.h | 4 | ||||
| -rw-r--r-- | src/arch/ppc/lib/timer.c | 2 | ||||
| -rw-r--r-- | src/cpu/ppc/ppc4xx/clock.c | 4 | ||||
| -rw-r--r-- | src/cpu/ppc/ppc4xx/sdram.c | 2 | ||||
| -rw-r--r-- | src/cpu/ppc/ppc7xx/clock.c | 2 | ||||
| -rw-r--r-- | src/mainboard/motorola/sandpoint/clock.c | 2 | ||||
| -rw-r--r-- | src/northbridge/motorola/mpc107/mpc107.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/src/arch/ppc/include/clock.h b/src/arch/ppc/include/clock.h index 3fe882a1fd..60bde4e0c0 100644 --- a/src/arch/ppc/include/clock.h +++ b/src/arch/ppc/include/clock.h @@ -4,6 +4,6 @@ /* * Various clock routines. */ -extern unsigned long get_clock_speed(void); -extern unsigned long get_bus_freq(void); +extern unsigned long get_timer_freq(void); +extern unsigned long get_pci_bus_freq(void); #endif /* _CLOCK_H */ diff --git a/src/arch/ppc/lib/timer.c b/src/arch/ppc/lib/timer.c index 8b485b8d51..6889d4b2e8 100644 --- a/src/arch/ppc/lib/timer.c +++ b/src/arch/ppc/lib/timer.c @@ -7,7 +7,7 @@ unsigned long get_hz(void) { - return get_clock_speed(); + return get_timer_freq(); } unsigned long ticks_since_boot(void) diff --git a/src/cpu/ppc/ppc4xx/clock.c b/src/cpu/ppc/ppc4xx/clock.c index a7ec52fff9..260544aebe 100644 --- a/src/cpu/ppc/ppc4xx/clock.c +++ b/src/cpu/ppc/ppc4xx/clock.c @@ -164,7 +164,7 @@ void get_sys_info (struct ppc4xx_sys_info * sysInfo) } } -unsigned long get_clock_speed(void) +unsigned long get_timer_freq(void) { struct ppc4xx_sys_info sys_info; @@ -172,7 +172,7 @@ unsigned long get_clock_speed(void) return sys_info.freqProcessor; } -unsigned long get_bus_freq(void) +unsigned long get_pci_bus_freq(void) { struct ppc4xx_sys_info sys_info; diff --git a/src/cpu/ppc/ppc4xx/sdram.c b/src/cpu/ppc/ppc4xx/sdram.c index 6d7ed1a08b..73cdcc364b 100644 --- a/src/cpu/ppc/ppc4xx/sdram.c +++ b/src/cpu/ppc/ppc4xx/sdram.c @@ -72,7 +72,7 @@ void sdram_init(void) /* * Determine SDRAM speed */ - speed = get_bus_freq(); /* parameter not used on ppc4xx */ + speed = get_pci_bus_freq(); /* parameter not used on ppc4xx */ /* * Support for 100MHz and 133MHz SDRAM diff --git a/src/cpu/ppc/ppc7xx/clock.c b/src/cpu/ppc/ppc7xx/clock.c index b14f7c6f57..bb600c6d5b 100644 --- a/src/cpu/ppc/ppc7xx/clock.c +++ b/src/cpu/ppc/ppc7xx/clock.c @@ -20,7 +20,7 @@ static int PLL_multiplier[] = { }; unsigned long -get_clock_speed(void) +get_timer_freq(void) { unsigned long clock = CONFIG_SYS_CLK_FREQ * 1000000; return clock * PLL_multiplier[ppc_gethid1() >> 28] / 10; diff --git a/src/mainboard/motorola/sandpoint/clock.c b/src/mainboard/motorola/sandpoint/clock.c index 8effa8c511..91c387ee03 100644 --- a/src/mainboard/motorola/sandpoint/clock.c +++ b/src/mainboard/motorola/sandpoint/clock.c @@ -3,7 +3,7 @@ #include <ppc.h> -unsigned long get_clock_speed(void) +unsigned long get_timer_freq(void) { return 100000000 / 4; } diff --git a/src/northbridge/motorola/mpc107/mpc107.c b/src/northbridge/motorola/mpc107/mpc107.c index 316affaa2d..00c38e5a0d 100644 --- a/src/northbridge/motorola/mpc107/mpc107.c +++ b/src/northbridge/motorola/mpc107/mpc107.c @@ -317,7 +317,7 @@ mpc107_config_memory(int no_banks, sdram_bank_info * bank, int for_real) int i, j; char ignore[8]; /* Convert bus clock to cycle time in 100ns units */ - unsigned cycle_time = 10 * (2500000000U / get_clock_speed()); + unsigned cycle_time = 10 * (2500000000U / get_timer_freq()); /* Approximate */ unsigned access_time = cycle_time - 300; unsigned cas_latency = 0; |