Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[u-boot] / arch / arm / cpu / armv7 / rmobile / cpu_info.c

diff --git a/arch/arm/cpu/armv7/rmobile/cpu_info.c b/arch/arm/cpu/armv7/rmobile/cpu_info.c
index 789c2c3145bba9c8a2b1df58982194ff6dc5c4ff..83d5282e3e71e2f51c23f4fbf98024ac0f658028 100644 (file)
--- a/arch/arm/cpu/armv7/rmobile/cpu_info.c
+++ b/arch/arm/cpu/armv7/rmobile/cpu_info.c
@@ -2,27 +2,10 @@
  * (C) Copyright 2012 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
  * (C) Copyright 2012 Renesas Solutions Corp.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/rmobile.h>
 
 #ifdef CONFIG_ARCH_CPU_INIT
 int arch_cpu_init(void)
@@ -40,35 +23,57 @@ void enable_caches(void)
 #endif
 
 #ifdef CONFIG_DISPLAY_CPUINFO
-static u32 get_cpu_type(void)
+static u32 __rmobile_get_cpu_type(void)
 {
-       u32 id;
-       u32 type;
-
-       id = readl(CCCR);
-       type = (id >> 8) & 0xFF;
-
-       return type;
+       return 0x0;
 }
+u32 rmobile_get_cpu_type(void)
+               __attribute__((weak, alias("__rmobile_get_cpu_type")));
 
-static u32 get_cpu_rev(void)
+static u32 __rmobile_get_cpu_rev_integer(void)
 {
-       u32 id;
-       u32 rev;
-
-       id = readl(CCCR);
-       rev = (id >> 4) & 0xF;
+       return 0;
+}
+u32 rmobile_get_cpu_rev_integer(void)
+               __attribute__((weak, alias("__rmobile_get_cpu_rev_integer")));
 
-       return rev;
+static u32 __rmobile_get_cpu_rev_fraction(void)
+{
+       return 0;
 }
+u32 rmobile_get_cpu_rev_fraction(void)
+               __attribute__((weak, alias("__rmobile_get_cpu_rev_fraction")));
 
 int print_cpuinfo(void)
 {
-       switch (get_cpu_type()) {
+       switch (rmobile_get_cpu_type()) {
+       case 0x37:
+               printf("CPU: Renesas Electronics SH73A0 rev %d.%d\n",
+                      rmobile_get_cpu_rev_integer(),
+                      rmobile_get_cpu_rev_fraction());
+               break;
+       case 0x40:
+               printf("CPU: Renesas Electronics R8A7740 rev %d.%d\n",
+                      rmobile_get_cpu_rev_integer(),
+                      rmobile_get_cpu_rev_fraction());
+               break;
+
+       case 0x45:
+               printf("CPU: Renesas Electronics R8A7790 rev %d\n",
+                      rmobile_get_cpu_rev_integer());
+               break;
+
+       case 0x47:
+               printf("CPU: Renesas Electronics R8A7791 rev %d\n",
+                       rmobile_get_cpu_rev_integer());
+               break;
+
        default:
-               printf("CPU: Renesas Electronics CPU rev %d\n", get_cpu_rev());
+               printf("CPU: Renesas Electronics CPU rev %d.%d\n",
+                      rmobile_get_cpu_rev_integer(),
+                      rmobile_get_cpu_rev_fraction());
                break;
        }
        return 0;
 }
-#endif
+#endif /* CONFIG_DISPLAY_CPUINFO */