summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTetsuyuki Kobayashi <koba@kmckk.co.jp>2012-07-25 18:24:20 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-10-03 02:04:24 +0200
commit170cc96f6c0e7357f8516b61d44341c53866d208 (patch)
tree6851c085dbb1ce519c735e177d9e1f3094b38c4b
parent67d4d26a0bf2b73d19c32baa54049309a2671225 (diff)
downloadtalos-obmc-uboot-170cc96f6c0e7357f8516b61d44341c53866d208.tar.gz
talos-obmc-uboot-170cc96f6c0e7357f8516b61d44341c53866d208.zip
arm: rmobile: kzm9g: fix CPU info
CPU info register was read wrongly by mistake. And function rmobile_get_cpu_rev() was not called properly. Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
-rw-r--r--arch/arm/cpu/armv7/rmobile/cpu_info-sh73a0.c6
-rw-r--r--arch/arm/cpu/armv7/rmobile/cpu_info.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/cpu/armv7/rmobile/cpu_info-sh73a0.c b/arch/arm/cpu/armv7/rmobile/cpu_info-sh73a0.c
index 3086dd80fa..13ad7424c0 100644
--- a/arch/arm/cpu/armv7/rmobile/cpu_info-sh73a0.c
+++ b/arch/arm/cpu/armv7/rmobile/cpu_info-sh73a0.c
@@ -29,19 +29,19 @@ u32 rmobile_get_cpu_type(void)
u32 type;
struct sh73a0_hpb *hpb = (struct sh73a0_hpb *)HPB_BASE;
- id = readl(hpb->cccr);
+ id = readl(&hpb->cccr);
type = (id >> 8) & 0xFF;
return type;
}
-u32 get_cpu_rev(void)
+u32 rmobile_get_cpu_rev(void)
{
u32 id;
u32 rev;
struct sh73a0_hpb *hpb = (struct sh73a0_hpb *)HPB_BASE;
- id = readl(hpb->cccr);
+ id = readl(&hpb->cccr);
rev = (id >> 4) & 0xF;
return rev;
diff --git a/arch/arm/cpu/armv7/rmobile/cpu_info.c b/arch/arm/cpu/armv7/rmobile/cpu_info.c
index 214895859a..957a4fc9df 100644
--- a/arch/arm/cpu/armv7/rmobile/cpu_info.c
+++ b/arch/arm/cpu/armv7/rmobile/cpu_info.c
@@ -62,7 +62,7 @@ int print_cpuinfo(void)
break;
default:
printf("CPU: Renesas Electronics CPU rev %d\n",
- get_cpu_rev());
+ rmobile_get_cpu_rev());
break;
}
return 0;
OpenPOWER on IntegriCloud