1
0
Fork 0
alistair23-linux/arch/mips/lasat
Linus Torvalds bfaf245022 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS updates from Ralf Baechle:
 "This is the main pull request for MIPS for Linux 4.1.  Most
  noteworthy:

   - Add more Octeon-optimized crypto functions
   - Octeon crypto preemption and locking fixes
   - Little endian support for Octeon
   - Use correct CSR to soft reset Octeons
   - Support LEDs on the Octeon-based DSR-1000N
   - Fix PCI interrupt mapping for the Octeon-based DSR-1000N
   - Mark prom_free_prom_memory() as __init for a number of systems
   - Support for Imagination's Pistachio SOC.  This includes arch and
     CLK bits.  I'd like to merge pinctrl bits later
   - Improve parallelism of csum_partial for certain pipelines
   - Organize DTB files in subdirs like other architectures
   - Implement read_sched_clock for all MIPS platforms other than
     Octeon
   - Massive series of 38 fixes and cleanups for the FPU emulator /
     kernel
   - Further FPU remulator work to support new features.  This sits on a
     separate branch which also has been pulled into the 4.1 KVM branch
   - Clean up and fixes for the SEAD3 eval board; remove unused file
   - Various updates for Netlogic platforms
   - A number of small updates for Loongson 3 platforms
   - Increase the memory limit for ATH79 platforms to 256MB
   - A fair number of fixes and updates for BCM47xx platforms
   - Finish the implementation of XPA support
   - MIPS FDC support.  No, not floppy controller but Fast Debug Channel :)
   - Detect the R16000 used in SGI legacy platforms
   - Fix Kconfig dependencies for the SSB bus support"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (265 commits)
  MIPS: Makefile: Fix MIPS ASE detection code
  MIPS: asm: elf: Set O32 default FPU flags
  MIPS: BCM47XX: Fix detecting Microsoft MN-700 & Asus WL500G
  MIPS: Kconfig: Disable SMP/CPS for 64-bit
  MIPS: Hibernate: flush TLB entries earlier
  MIPS: smp-cps: cpu_set FPU mask if FPU present
  MIPS: lose_fpu(): Disable FPU when MSA enabled
  MIPS: ralink: add missing symbol for RALINK_ILL_ACC
  MIPS: ralink: Fix bad config symbol in PCI makefile.
  SSB: fix Kconfig dependencies
  MIPS: Malta: Detect and fix bad memsize values
  Revert "MIPS: Avoid pipeline stalls on some MIPS32R2 cores."
  MIPS: Octeon: Delete override of cpu_has_mips_r2_exec_hazard.
  MIPS: Fix cpu_has_mips_r2_exec_hazard.
  MIPS: kernel: entry.S: Set correct ISA level for mips_ihb
  MIPS: asm: spinlock: Fix addiu instruction for R10000_LLSC_WAR case
  MIPS: r4kcache: Use correct base register for MIPS R6 cache flushes
  MIPS: Kconfig: Fix typo for the r2-to-r6 emulator kernel parameter
  MIPS: unaligned: Fix regular load/store instruction emulation for EVA
  MIPS: unaligned: Surround load/store macros in do {} while statements
  ...
2015-04-17 15:50:54 -04:00
..
image MIPS: Refactor load/entry address calculations 2013-09-03 17:58:37 +02:00
Kconfig MIPS: Lasat: Add missing CONFIG_PROC_FS dependency to PICVUE_PROC 2014-10-21 17:35:44 +02:00
Makefile MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
Platform MIPS: Lasat: Migrate to new platform makefile style. 2010-08-05 13:25:53 +01:00
at93c.c mips: delete non-required instances of include <linux/init.h> 2014-01-24 22:39:56 +01:00
at93c.h [MIPS] Add back support for LASAT platforms 2007-10-11 23:46:00 +01:00
ds1603.c timekeeping: Increase granularity of read_persistent_clock() 2009-08-15 10:55:46 +02:00
ds1603.h MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
interrupt.c MIPS: Mark cascade and low level interrupts IRQF_NO_THREAD 2011-09-21 17:52:15 +02:00
lasat_board.c [MIPS] Remove mips_machtype for LASAT machines 2008-07-15 18:44:39 +01:00
lasat_models.h [MIPS] Add back support for LASAT platforms 2007-10-11 23:46:00 +01:00
picvue.c mips: delete non-required instances of include <linux/init.h> 2014-01-24 22:39:56 +01:00
picvue.h MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
picvue_proc.c MIPS: Lasat: Replace del_timer by del_timer_sync 2014-03-31 18:17:12 +02:00
prom.c MIPS: Replace all usages of CL_SIZE by COMMAND_LINE_SIZE 2009-12-17 01:56:56 +00:00
prom.h [MIPS] Add back support for LASAT platforms 2007-10-11 23:46:00 +01:00
reset.c Disintegrate asm/system.h for MIPS 2012-03-28 18:30:02 +01:00
serial.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
setup.c [MIPS] Remove mips_machtype for LASAT machines 2008-07-15 18:44:39 +01:00
sysctl.c Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2015-04-17 15:50:54 -04:00