From 170cc96f6c0e7357f8516b61d44341c53866d208 Mon Sep 17 00:00:00 2001
From: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
Date: Wed, 25 Jul 2012 18:24:20 +0000
Subject: [PATCH] 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>
---
arch/arm/cpu/armv7/rmobile/cpu_info-sh73a0.c | 6 +++---
arch/arm/cpu/armv7/rmobile/cpu_info.c | 2 +-
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;
--
2.39.5