aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/bcm63xx
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-03-21 10:03:15 -0400
committerRalf Baechle <ralf@linux-mips.org>2013-05-07 19:19:03 -0400
commit6605428c506bea269ca6c4aed85e97fbee2cbe7b (patch)
treea125004400897cc415443c2691565a1d5a7b17ef /arch/mips/bcm63xx
parent8a398d757dd0f56c8ac621104b198ff66eef7a7a (diff)
MIPS: BCM63XX: fix revision ID width
The REVID is only 8 bit wide. Signed-off-by: Jonas Gorski <jogo@openwrt.org> Patchwork: http://patchwork.linux-mips.org/patch/5007/ Acked-by: John Crispin <blogic@openwrt.org>
Diffstat (limited to 'arch/mips/bcm63xx')
-rw-r--r--arch/mips/bcm63xx/cpu.c4
-rw-r--r--arch/mips/bcm63xx/setup.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/bcm63xx/cpu.c b/arch/mips/bcm63xx/cpu.c
index a7afb289b15a..ae16626d4001 100644
--- a/arch/mips/bcm63xx/cpu.c
+++ b/arch/mips/bcm63xx/cpu.c
@@ -25,7 +25,7 @@ const int *bcm63xx_irqs;
25EXPORT_SYMBOL(bcm63xx_irqs); 25EXPORT_SYMBOL(bcm63xx_irqs);
26 26
27static u16 bcm63xx_cpu_id; 27static u16 bcm63xx_cpu_id;
28static u16 bcm63xx_cpu_rev; 28static u8 bcm63xx_cpu_rev;
29static unsigned int bcm63xx_cpu_freq; 29static unsigned int bcm63xx_cpu_freq;
30static unsigned int bcm63xx_memory_size; 30static unsigned int bcm63xx_memory_size;
31 31
@@ -87,7 +87,7 @@ u16 __bcm63xx_get_cpu_id(void)
87 87
88EXPORT_SYMBOL(__bcm63xx_get_cpu_id); 88EXPORT_SYMBOL(__bcm63xx_get_cpu_id);
89 89
90u16 bcm63xx_get_cpu_rev(void) 90u8 bcm63xx_get_cpu_rev(void)
91{ 91{
92 return bcm63xx_cpu_rev; 92 return bcm63xx_cpu_rev;
93} 93}
diff --git a/arch/mips/bcm63xx/setup.c b/arch/mips/bcm63xx/setup.c
index 35e18e98beb9..911fd7df49e5 100644
--- a/arch/mips/bcm63xx/setup.c
+++ b/arch/mips/bcm63xx/setup.c
@@ -126,7 +126,7 @@ static void __bcm63xx_machine_reboot(char *p)
126const char *get_system_type(void) 126const char *get_system_type(void)
127{ 127{
128 static char buf[128]; 128 static char buf[128];
129 snprintf(buf, sizeof(buf), "bcm63xx/%s (0x%04x/0x%04X)", 129 snprintf(buf, sizeof(buf), "bcm63xx/%s (0x%04x/0x%02X)",
130 board_get_name(), 130 board_get_name(),
131 bcm63xx_get_cpu_id(), bcm63xx_get_cpu_rev()); 131 bcm63xx_get_cpu_id(), bcm63xx_get_cpu_rev());
132 return buf; 132 return buf;