leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MX31: change return value of get_cpu_rev

Browse Source 
Drop warnings in get_cpu_rev and changes the return value
(a u32 instead of char * is returned) of the function
to be coherent with other processors.

Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Detlev Zundel <dzu@denx.de>
CC: Fabio Estevam <fabio.estevam@freescale.com>
This commit is contained in:
Stefano Babic 2011-04-29 08:56:27 +02:00 committed by Albert ARIBAUD
parent d109b11e54
commit 2f22045be5
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
arch/arm/cpu/arm1136/mx31/generic.c
View File

@ -107,18 +107,18 @@ void mx31_set_pad(enum iomux_pins pin, u32 config)
} }
struct mx3_cpu_type mx31_cpu_type[] = { struct mx3_cpu_type mx31_cpu_type[] = {
{ .srev = 0x00, .v = "1.0" }, { .srev = 0x00, .v = 0x10 },
{ .srev = 0x10, .v = "1.1" }, { .srev = 0x10, .v = 0x11 },
{ .srev = 0x11, .v = "1.1" }, { .srev = 0x11, .v = 0x11 },
{ .srev = 0x12, .v = "1.15" }, { .srev = 0x12, .v = 0x1F },
{ .srev = 0x13, .v = "1.15" }, { .srev = 0x13, .v = 0x1F },
{ .srev = 0x14, .v = "1.2" }, { .srev = 0x14, .v = 0x12 },
{ .srev = 0x15, .v = "1.2" }, { .srev = 0x15, .v = 0x12 },
{ .srev = 0x28, .v = "2.0" }, { .srev = 0x28, .v = 0x20 },
{ .srev = 0x29, .v = "2.0" }, { .srev = 0x29, .v = 0x20 },
}; };
char *get_cpu_rev(void) u32 get_cpu_rev(void)
{ {
u32 i, srev; u32 i, srev;
@ -129,7 +129,8 @@ char *get_cpu_rev(void)
for (i = 0; i < ARRAY_SIZE(mx31_cpu_type); i++) for (i = 0; i < ARRAY_SIZE(mx31_cpu_type); i++)
if (srev == mx31_cpu_type[i].srev) if (srev == mx31_cpu_type[i].srev)
return mx31_cpu_type[i].v; return mx31_cpu_type[i].v;
return "unknown";
return srev | 0x8000;
} }
char *get_reset_cause(void) char *get_reset_cause(void)
@ -161,8 +162,12 @@ char *get_reset_cause(void)
#if defined(CONFIG_DISPLAY_CPUINFO) #if defined(CONFIG_DISPLAY_CPUINFO)
int print_cpuinfo (void) int print_cpuinfo (void)
{ {
printf("CPU: Freescale i.MX31 rev %s at %d MHz.", u32 srev = get_cpu_rev();
get_cpu_rev(), mx31_get_mcu_main_clk() / 1000000);
printf("CPU: Freescale i.MX31 rev %d.%d%s at %d MHz.",
(srev & 0xF0) >> 4, (srev & 0x0F),
((srev & 0x8000) ? " unknown" : ""),
mx31_get_mcu_main_clk() / 1000000);
printf("Reset cause: %s\n", get_reset_cause()); printf("Reset cause: %s\n", get_reset_cause());
return 0; return 0;
} }

2
arch/arm/include/asm/arch-mx31/imx-regs.h
View File

@ -105,7 +105,7 @@ struct iim_regs {
struct mx3_cpu_type { struct mx3_cpu_type {
u8 srev; u8 srev;
char *v; u32 v;
}; };
#define IOMUX_PADNUM_MASK 0x1ff #define IOMUX_PADNUM_MASK 0x1ff