Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS updates from Ralf Baechle: "MIPS updates: - All the things that didn't make 3.10. - Removes the Windriver PPMC platform. Nobody will miss it. - Remove a workaround from kernel/irq/irqdomain.c which was there exclusivly for MIPS. Patch by Grant Likely. - More small improvments for the SEAD 3 platform - Improvments on the BMIPS / SMP support for the BCM63xx series. - Various cleanups of dead leftovers. - Platform support for the Cavium Octeon-based EdgeRouter Lite. Two large KVM patchsets didn't make it for this pull request because their respective authors are vacationing" * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (124 commits) MIPS: Kconfig: Add missing MODULES dependency to VPE_LOADER MIPS: BCM63xx: CLK: Add dummy clk_{set,round}_rate() functions MIPS: SEAD3: Disable L2 cache on SEAD-3. MIPS: BCM63xx: Enable second core SMP on BCM6328 if available MIPS: BCM63xx: Add SMP support to prom.c MIPS: define write{b,w,l,q}_relaxed MIPS: Expose missing pci_io{map,unmap} declarations MIPS: Malta: Update GCMP detection. Revert "MIPS: make CAC_ADDR and UNCAC_ADDR account for PHYS_OFFSET" MIPS: APSP: Remove <asm/kspd.h> SSB: Kconfig: Amend SSB_EMBEDDED dependencies MIPS: microMIPS: Fix improper definition of ISA exception bit. MIPS: Don't try to decode microMIPS branch instructions where they cannot exist. MIPS: Declare emulate_load_store_microMIPS as a static function. MIPS: Fix typos and cleanup comment MIPS: Cleanup indentation and whitespace MIPS: BMIPS: support booting from physical CPU other than 0 MIPS: Only set cpu_has_mmips if SYS_SUPPORTS_MICROMIPS MIPS: GIC: Fix gic_set_affinity infinite loop MIPS: Don't save/restore OCTEON wide multiplier state on syscalls. ...
No related branches found
No related tags found
Showing
- arch/mips/Kbuild.platforms 0 additions, 1 deletionarch/mips/Kbuild.platforms
- arch/mips/Kconfig 28 additions, 48 deletionsarch/mips/Kconfig
- arch/mips/Makefile 4 additions, 0 deletionsarch/mips/Makefile
- arch/mips/ath79/mach-ap136.c 1 addition, 1 deletionarch/mips/ath79/mach-ap136.c
- arch/mips/bcm63xx/Kconfig 4 additions, 5 deletionsarch/mips/bcm63xx/Kconfig
- arch/mips/bcm63xx/boards/board_bcm963xx.c 51 additions, 2 deletionsarch/mips/bcm63xx/boards/board_bcm963xx.c
- arch/mips/bcm63xx/clk.c 21 additions, 9 deletionsarch/mips/bcm63xx/clk.c
- arch/mips/bcm63xx/cpu.c 25 additions, 3 deletionsarch/mips/bcm63xx/cpu.c
- arch/mips/bcm63xx/dev-flash.c 1 addition, 0 deletionsarch/mips/bcm63xx/dev-flash.c
- arch/mips/bcm63xx/dev-spi.c 4 additions, 2 deletionsarch/mips/bcm63xx/dev-spi.c
- arch/mips/bcm63xx/dev-uart.c 2 additions, 1 deletionarch/mips/bcm63xx/dev-uart.c
- arch/mips/bcm63xx/irq.c 23 additions, 0 deletionsarch/mips/bcm63xx/irq.c
- arch/mips/bcm63xx/nvram.c 10 additions, 0 deletionsarch/mips/bcm63xx/nvram.c
- arch/mips/bcm63xx/prom.c 48 additions, 1 deletionarch/mips/bcm63xx/prom.c
- arch/mips/bcm63xx/reset.c 28 additions, 1 deletionarch/mips/bcm63xx/reset.c
- arch/mips/bcm63xx/setup.c 3 additions, 0 deletionsarch/mips/bcm63xx/setup.c
- arch/mips/boot/compressed/Makefile 2 additions, 0 deletionsarch/mips/boot/compressed/Makefile
- arch/mips/boot/compressed/uart-16550.c 19 additions, 3 deletionsarch/mips/boot/compressed/uart-16550.c
- arch/mips/cavium-octeon/Kconfig 5 additions, 12 deletionsarch/mips/cavium-octeon/Kconfig
- arch/mips/cavium-octeon/Makefile 3 additions, 2 deletionsarch/mips/cavium-octeon/Makefile
Loading
Please register or sign in to comment