Fixes and updates for the Netlogic XLP code, this should apply cleanly on top of the current linux-next tree. Patch 1 (Netlogic: Fix indentation of smpboot.S) and patch 3 (Netlogic: merge of.c into setup.c) are fixups to the merge fallout in linux-next. Regards, JC. Ganesan Ramalingam (1): MIPS: Netlogic: DTS file for XLP boards Jayachandran C (9): MIPS: Netlogic: Fix indentation of smpboot.S MIPS: Netlogic: Fix low-level flush on core wakeup MIPS: Netlogic: merge of.c into setup.c MIPS: Netlogic: remove cpu_has_dc_aliases define for XLP MIPS: PCI: Fix for byte swap for Netlogic XLP MIPS: Netlogic: early console fix MIPS: Netlogic: Move serial ports to device tree MIPS: Netlogic: Add support for built in DTB MIPS: Netlogic: XLP defconfig update Madhusudan Bhat (1): MIPS: oprofile: Support for XLR/XLS processors Zi Shen Lim (1): MIPS: perf: Add XLP support for hardware perf. arch/mips/Kconfig | 3 +- arch/mips/configs/nlm_xlp_defconfig | 133 +++++++++++++------- .../asm/mach-netlogic/cpu-feature-overrides.h | 1 - arch/mips/kernel/perf_event_mipsxx.c | 124 ++++++++++++++++++ arch/mips/netlogic/Kconfig | 15 +++ arch/mips/netlogic/Makefile | 1 + arch/mips/netlogic/common/earlycons.c | 2 +- arch/mips/netlogic/common/smpboot.S | 22 ++-- arch/mips/netlogic/dts/Makefile | 4 + arch/mips/netlogic/dts/xlp_evp.dts | 124 ++++++++++++++++++ arch/mips/netlogic/xlp/Makefile | 3 +- arch/mips/netlogic/xlp/of.c | 34 ----- arch/mips/netlogic/xlp/platform.c | 108 ---------------- arch/mips/netlogic/xlp/setup.c | 32 ++++- arch/mips/oprofile/Makefile | 1 + arch/mips/oprofile/common.c | 1 + arch/mips/oprofile/op_model_mipsxx.c | 28 +++++ arch/mips/pci/pci-xlp.c | 5 +- 18 files changed, 437 insertions(+), 204 deletions(-) create mode 100644 arch/mips/netlogic/dts/Makefile create mode 100644 arch/mips/netlogic/dts/xlp_evp.dts delete mode 100644 arch/mips/netlogic/xlp/of.c delete mode 100644 arch/mips/netlogic/xlp/platform.c -- 1.7.9.5
