Skip to content

Commit

Permalink
Blackfin arch: Fix bug - change cpufreq doesn't take effect on bf537 now
Browse files Browse the repository at this point in the history
CCLK is variable: get current CCLK in show_cpuinfo

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
  • Loading branch information
Michael Hennerich authored and Bryan Wu committed Nov 18, 2008
1 parent 8eb3e3b commit a5f0717
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions arch/blackfin/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -1032,7 +1032,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
char *cpu, *mmu, *fpu, *vendor, *cache;
uint32_t revid;

u_long sclk = 0;
u_long sclk, cclk;
u_int icache_size = BFIN_ICACHESIZE / 1024, dcache_size = 0, dsup_banks = 0;
struct blackfin_cpudata *cpudata = &per_cpu(cpu_data, *(unsigned int *)v);

Expand All @@ -1042,6 +1042,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
revid = bfin_revid();

sclk = get_sclk();
cclk = get_cclk();

switch (bfin_read_CHIPID() & CHIPID_MANUFACTURE) {
case 0xca:
Expand All @@ -1063,7 +1064,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)

seq_printf(m, "model name\t: ADSP-%s %lu(MHz CCLK) %lu(MHz SCLK) (%s)\n"
"stepping\t: %d\n",
cpu, cpudata->cclk/1000000, sclk/1000000,
cpu, cclk/1000000, sclk/1000000,
#ifdef CONFIG_MPU
"mpu on",
#else
Expand All @@ -1072,7 +1073,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
revid);

seq_printf(m, "cpu MHz\t\t: %lu.%03lu/%lu.%03lu\n",
cpudata->cclk/1000000, cpudata->cclk%1000000,
cclk/1000000, cclk%1000000,
sclk/1000000, sclk%1000000);
seq_printf(m, "bogomips\t: %lu.%02lu\n"
"Calibration\t: %lu loops\n",
Expand Down

0 comments on commit a5f0717

Please sign in to comment.