X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=target%2Flinux%2Fadm5120-2.6%2Ffiles%2Farch%2Fmips%2Fadm5120%2Fadm5120_info.c;h=9e39730a4fe56747ef5c9a654eb897ba3ae88ccb;hp=85e0df622b7b4cf07dbc95ed697962be8c5cc09b;hb=814435f757d8f3d9b7da3f7cfe612767f6325cbf;hpb=d2bc7f6f5e00ce3ed6c32f80a4fd0125a482cf12

diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/adm5120_info.c b/target/linux/adm5120-2.6/files/arch/mips/adm5120/adm5120_info.c
index 85e0df622b..9e39730a4f 100644
--- a/target/linux/adm5120-2.6/files/arch/mips/adm5120/adm5120_info.c
+++ b/target/linux/adm5120-2.6/files/arch/mips/adm5120/adm5120_info.c
@@ -1,7 +1,9 @@
 /*
+ * $Id$
+ *
  * Copyright (C) 2007 OpenWrt.org
- * Copyright (C) Gabor Juhos
- * 
+ * Copyright (C) 2007 Gabor Juhos <juhosg@freemail.hu>
+ *
  * 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
@@ -17,12 +19,13 @@
 #include <asm/addrspace.h>
 
 #include <adm5120_info.h>
+#include <adm5120_defs.h>
+#include <adm5120_switch.h>
 #include <myloader.h>
 
 /* boot loaders specific definitions */
 #define CFE_EPTSEAL	0x43464531 /* CFE1 is the magic number to recognize CFE from other bootloaders */
 
-
 struct adm5120_info adm5120_info = {
 	.cpu_speed		= CPU_SPEED_175,
 	.cpu_package		= CPU_PACKAGE_PQFP,
@@ -34,9 +37,46 @@ static char *boot_loader_names[BOOT_LOADER_LAST+1] = {
 	[BOOT_LOADER_UNKNOWN]	= "Unknown",
 	[BOOT_LOADER_CFE]	= "CFE",
 	[BOOT_LOADER_UBOOT]	= "U-Boot",
-	[BOOT_LOADER_MYLOADER]	= "MyLoader"
+	[BOOT_LOADER_MYLOADER]	= "MyLoader",
+	[BOOT_LOADER_ROUTERBOOT]= "RouterBOOT"
 };
 
+/*
+ * CPU settings detection
+ */
+#define CODE_GET_PC(c)		((c) & CODE_PC_MASK)
+#define CODE_GET_REV(c)		(((c) >> CODE_REV_SHIFT) & CODE_REV_MASK)
+#define CODE_GET_PK(c)		(((c) >> CODE_PK_SHIFT) & CODE_PK_MASK)
+#define CODE_GET_CLKS(c)	(((c) >> CODE_CLKS_SHIFT) & CODE_CLKS_MASK)
+#define CODE_GET_NAB(c)		(((c) & CODE_NAB) != 0)
+
+static void __init detect_cpu_info(void)
+{
+	uint32_t *reg;
+	uint32_t code;
+	uint32_t clks;
+
+	reg = (uint32_t *)KSEG1ADDR(ADM5120_SWITCH_BASE+SWITCH_REG_CODE);
+	code = *reg;
+
+	clks = CODE_GET_CLKS(code);
+
+	adm5120_info.product_code = CODE_GET_PC(code);
+	adm5120_info.revision = CODE_GET_REV(code);
+
+	adm5120_info.cpu_speed = CPU_SPEED_175;
+	if (clks & 1)
+		adm5120_info.cpu_speed += 25000000;
+	if (clks & 2)
+		adm5120_info.cpu_speed += 50000000;
+
+	adm5120_info.cpu_package = (CODE_GET_PK(code) == CODE_PK_BGA) ?
+		CPU_PACKAGE_BGA : CPU_PACKAGE_PQFP;
+
+	adm5120_info.nand_boot = CODE_GET_NAB(code);
+
+}
+
 /*
  * Boot loader detection routines
  */
@@ -55,12 +95,12 @@ static int __init detect_cfe(void)
 		/* We are not booted from CFE */
 		return 0;
 	}
-	
+
 	/* cfe_a1_val must be 0, because only one CPU present in the ADM5120 SoC */
 	if (cfe_a1_val != 0) {
 		return 0;
 	}
-	
+
 	/* The cfe_handle, and the cfe_entry must be kernel mode addresses */
 	if ((cfe_handle < KSEG0) || (cfe_entry < KSEG0)) {
 		return 0;
@@ -86,7 +126,7 @@ static int __init detect_myloader(void)
 	parts = (struct mylo_partition_table *)(MYLO_MIPS_PARTITIONS);
 
 	/* Check for some magic numbers */
-	if ((sysp->magic != MYLO_MAGIC_SYS_PARAMS) || 
+	if ((sysp->magic != MYLO_MAGIC_SYS_PARAMS) ||
 	   (boardp->magic != MYLO_MAGIC_BOARD_PARAMS) ||
 	   (parts->magic != MYLO_MAGIC_PARTITIONS))
 		return 0;
@@ -94,28 +134,54 @@ static int __init detect_myloader(void)
 	return 1;
 }
 
+static int __init detect_routerboot(void)
+{
+	/* FIXME: not yet implemented */
+	return 0;
+}
+
 static int __init detect_bootloader(void)
 {
 	if (detect_cfe())
 		return BOOT_LOADER_CFE;
-	
-	if (detect_uboot()) 
+
+	if (detect_uboot())
 		return BOOT_LOADER_UBOOT;
-	
+
 	if (detect_myloader())
 		return BOOT_LOADER_MYLOADER;
-	
+
+	if (detect_routerboot())
+		return BOOT_LOADER_ROUTERBOOT;
+
 	return BOOT_LOADER_UNKNOWN;
 }
 
+/*
+ * Board detection
+ */
+static void __init detect_board_type(void)
+{
+	/* FIXME: not yet implemented */
+}
+
 void __init adm5120_info_show(void)
 {
-	printk("adm5120: boot loader is %s\n", boot_loader_names[adm5120_info.boot_loader]);
+	printk("ADM%04X%s revision %d, running at %ldMHz\n",
+		adm5120_info.product_code,
+		(adm5120_info.cpu_package == CPU_PACKAGE_BGA) ? "" : "P",
+		adm5120_info.revision,
+		(adm5120_info.cpu_speed / 1000000)
+		);
+	printk("Boot loader is: %s\n", boot_loader_names[adm5120_info.boot_loader]);
+	printk("Booted from   : %s flash\n", adm5120_info.nand_boot ? "NAND" : "NOR");
 }
 
 void __init adm5120_info_init(void)
 {
+	detect_cpu_info();
 	adm5120_info.boot_loader = detect_bootloader();
-	
+	detect_board_type();
+
 	adm5120_info_show();
 }