Fixes and updates for the next merge window. This includes - PCI fixs for XLR/XLS - I2C, Flash and USB platform drivers for XLR/XLS - XLP SMP code update and clean up - XLP TLB size fix - XLP USB and PCI changes. Let me know if there are any comments. Thanks, JC. Ganesan Ramalingam (4): MIPS: Netlogic: MSI enable fix for XLS MIPS: Netlogic: Platform NAND/NOR flash support MIPS: Netlogic: XLP PCIe controller support. MIPS: Netlogic: USB support for XLP Jayachandran C (8): MIPS: Netlogic: Fix PCIX irq on XLR chips MIPS: Netlogic: Remove unused pcibios_fixups MIPS: Netlogic: Fix TLB size of boot CPU. MIPS: Netlogic: Update comments in smpboot.S MIPS: Netlogic: SMP wakeup code update MIPS: Netlogic: Remove NETLOGIC_ prefix MIPS: Netlogic: Platform changes for XLS USB MIPS: Netlogic: Platform changes for XLR/XLS I2C arch/mips/Kconfig | 3 +- arch/mips/configs/nlm_xlr_defconfig | 4 + .../mips/include/asm/netlogic/xlp-hal/cpucontrol.h | 4 +- arch/mips/include/asm/netlogic/xlp-hal/iomap.h | 5 +- arch/mips/include/asm/netlogic/xlp-hal/pcibus.h | 76 ++++++ arch/mips/include/asm/netlogic/xlp-hal/pic.h | 4 + arch/mips/include/asm/netlogic/xlp-hal/usb.h | 64 +++++ arch/mips/include/asm/netlogic/xlp-hal/xlp.h | 14 +- arch/mips/include/asm/netlogic/xlr/bridge.h | 104 +++++++++ arch/mips/include/asm/netlogic/xlr/flash.h | 55 +++++ arch/mips/include/asm/netlogic/xlr/gpio.h | 59 ++--- arch/mips/netlogic/common/smpboot.S | 159 ++++++++----- arch/mips/netlogic/xlp/Makefile | 1 + arch/mips/netlogic/xlp/nlm_hal.c | 40 ++++ arch/mips/netlogic/xlp/platform.c | 2 +- arch/mips/netlogic/xlp/setup.c | 8 +- arch/mips/netlogic/xlp/usb-init.c | 124 ++++++++++ arch/mips/netlogic/xlr/Makefile | 2 +- arch/mips/netlogic/xlr/platform-flash.c | 220 +++++++++++++++++ arch/mips/netlogic/xlr/platform.c | 140 +++++++++++ arch/mips/netlogic/xlr/setup.c | 2 +- arch/mips/pci/Makefile | 1 + arch/mips/pci/pci-xlp.c | 247 ++++++++++++++++++++ arch/mips/pci/pci-xlr.c | 36 ++- 24 files changed, 1270 insertions(+), 104 deletions(-) create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/pcibus.h create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/usb.h create mode 100644 arch/mips/include/asm/netlogic/xlr/bridge.h create mode 100644 arch/mips/include/asm/netlogic/xlr/flash.h create mode 100644 arch/mips/netlogic/xlp/usb-init.c create mode 100644 arch/mips/netlogic/xlr/platform-flash.c create mode 100644 arch/mips/pci/pci-xlp.c -- 1.7.9.5
