From: Ralf Baechle Date: Mon, 28 Nov 2011 19:53:06 +0000 (+0000) Subject: Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium... X-Git-Tag: next-20111129~74^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1fc140c2367e941a314a309ee5702ff144bdf64a;p=karo-tx-linux.git Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next --- 1fc140c2367e941a314a309ee5702ff144bdf64a diff --cc arch/mips/ath79/setup.c index 1cf60e1d9dd3,159b42f106b0,61bf3397251a,159b42f106b0,159b42f106b0,159b42f106b0,159b42f106b0,159b42f106b0,159b42f106b0,159b42f106b0,159b42f106b0..80a7d4023d7f --- a/arch/mips/ath79/setup.c +++ b/arch/mips/ath79/setup.c @@@@@@@@@@@@ -134,9 -134,9 -146,11 -134,9 -134,9 -134,9 -134,9 -134,9 -134,9 -134,9 -134,9 +146,11 @@@@@@@@@@@@ static void __init ath79_detect_sys_typ break; default: ---------- panic("ath79: unknown SoC, id:0x%08x\n", id); ++++++++++ panic("ath79: unknown SoC, id:0x%08x", id); } ++ ++++++++ ath79_soc_rev = rev; ++ ++++++++ sprintf(ath79_sys_type, "Atheros AR%s rev %u", chip, rev); pr_info("SoC: %s\n", ath79_sys_type); } diff --cc arch/mips/include/asm/cpu.h index 79e4a0dad0d9,2f7f41873f24,2f7f41873f24,2f7f41873f24,2f7f41873f24,2f7f41873f24,2f7f41873f24,2f7f41873f24,2f7f41873f24,2f7f41873f24,a71c25b62580..f9fa2a479dd0 --- a/arch/mips/include/asm/cpu.h +++ b/arch/mips/include/asm/cpu.h @@@@@@@@@@@@ -169,8 -169,7 -169,7 -169,7 -169,7 -169,7 -169,7 -169,7 -169,7 -169,7 -169,10 +169,11 @@@@@@@@@@@@ #define PRID_IMP_NETLOGIC_XLS412B 0x4c00 #define PRID_IMP_NETLOGIC_XLS408B 0x4e00 #define PRID_IMP_NETLOGIC_XLS404B 0x4f00 ++++++++++#define PRID_IMP_NETLOGIC_AU13XX 0x8000 +++++++++ ++++++++++ #define PRID_IMP_NETLOGIC_XLP8XX 0x1000 ++++++++++ #define PRID_IMP_NETLOGIC_XLP3XX 0x1100 + /* * Definitions for 7:0 on legacy processors */