diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2013-05-19 18:32:13 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2013-05-19 18:32:13 +0000 |
| commit | 0a62b7c1484ee963726ffab11a86da4b2fe35a46 (patch) | |
| tree | 6b553a9636a4b125e04e7ef6942d889c0dcbdd6c /target/linux/brcm63xx/patches-3.9/023-MIPS-BCM63XX-fix-revision-ID-width.patch | |
| parent | 1f4e5f77a0d5bc3cce01c501409ccfdce08b0382 (diff) | |
| download | upstream-0a62b7c1484ee963726ffab11a86da4b2fe35a46.tar.gz upstream-0a62b7c1484ee963726ffab11a86da4b2fe35a46.tar.bz2 upstream-0a62b7c1484ee963726ffab11a86da4b2fe35a46.zip | |
bcm63xx: add 3.9 support
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 36660
Diffstat (limited to 'target/linux/brcm63xx/patches-3.9/023-MIPS-BCM63XX-fix-revision-ID-width.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.9/023-MIPS-BCM63XX-fix-revision-ID-width.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.9/023-MIPS-BCM63XX-fix-revision-ID-width.patch b/target/linux/brcm63xx/patches-3.9/023-MIPS-BCM63XX-fix-revision-ID-width.patch new file mode 100644 index 0000000000..0ee88e113c --- /dev/null +++ b/target/linux/brcm63xx/patches-3.9/023-MIPS-BCM63XX-fix-revision-ID-width.patch @@ -0,0 +1,68 @@ +From 609c69339a24bd034f5359dad14087276ce5a83f Mon Sep 17 00:00:00 2001 +From: Jonas Gorski <jogo@openwrt.org> +Date: Sun, 15 Jan 2012 14:41:22 +0100 +Subject: [PATCH 2/7] MIPS: BCM63XX: fix revision ID width + +The REVID is only 8 bit wide. + +Signed-off-by: Jonas Gorski <jogo@openwrt.org> +--- + arch/mips/bcm63xx/cpu.c | 4 ++-- + arch/mips/bcm63xx/setup.c | 2 +- + arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 2 +- + arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +--- a/arch/mips/bcm63xx/cpu.c ++++ b/arch/mips/bcm63xx/cpu.c +@@ -25,7 +25,7 @@ const int *bcm63xx_irqs; + EXPORT_SYMBOL(bcm63xx_irqs); + + static u16 bcm63xx_cpu_id; +-static u16 bcm63xx_cpu_rev; ++static u8 bcm63xx_cpu_rev; + static unsigned int bcm63xx_cpu_freq; + static unsigned int bcm63xx_memory_size; + +@@ -87,7 +87,7 @@ u16 __bcm63xx_get_cpu_id(void) + + EXPORT_SYMBOL(__bcm63xx_get_cpu_id); + +-u16 bcm63xx_get_cpu_rev(void) ++u8 bcm63xx_get_cpu_rev(void) + { + return bcm63xx_cpu_rev; + } +--- a/arch/mips/bcm63xx/setup.c ++++ b/arch/mips/bcm63xx/setup.c +@@ -126,7 +126,7 @@ static void __bcm63xx_machine_reboot(cha + const char *get_system_type(void) + { + static char buf[128]; +- snprintf(buf, sizeof(buf), "bcm63xx/%s (0x%04x/0x%04X)", ++ snprintf(buf, sizeof(buf), "bcm63xx/%s (0x%04x/0x%02X)", + board_get_name(), + bcm63xx_get_cpu_id(), bcm63xx_get_cpu_rev()); + return buf; +--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h ++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h +@@ -18,7 +18,7 @@ + + void __init bcm63xx_cpu_init(void); + u16 __bcm63xx_get_cpu_id(void); +-u16 bcm63xx_get_cpu_rev(void); ++u8 bcm63xx_get_cpu_rev(void); + unsigned int bcm63xx_get_cpu_freq(void); + + #ifdef CONFIG_BCM63XX_CPU_6328 +--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h ++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +@@ -10,7 +10,7 @@ + #define REV_CHIPID_SHIFT 16 + #define REV_CHIPID_MASK (0xffff << REV_CHIPID_SHIFT) + #define REV_REVID_SHIFT 0 +-#define REV_REVID_MASK (0xffff << REV_REVID_SHIFT) ++#define REV_REVID_MASK (0xff << REV_REVID_SHIFT) + + /* Clock Control register */ + #define PERF_CKCTL_REG 0x4 |