1
0
Fork 0
alistair23-linux/drivers/staging/octeon
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
..
Kconfig MIPS: OCTEON: Rename Kconfig CAVIUM_OCTEON_REFERENCE_BOARD to CAVIUM_OCTEON_SOC 2013-06-10 18:01:25 +02:00
Makefile MIPS: Octeon: Move some Ethernet support files out of staging. 2011-12-07 22:03:28 +00:00
ethernet-defines.h staging: octeon-ethernet: drop CONFIG_CAVIUM_OCTEON_NUM_PACKET_BUFFERS 2014-03-04 16:42:28 -08:00
ethernet-mdio.c staging: octeon-ethernet: delete cvm_oct_set_carrier() 2015-04-03 13:57:28 +02:00
ethernet-mdio.h Staging: octeon: Remove extern from .c file 2015-03-26 10:40:32 +01:00
ethernet-mem.c Staging: octeon: minor style cleanups 2014-06-19 15:24:52 -07:00
ethernet-mem.h
ethernet-rgmii.c staging: octeon: Combined seperate strings. 2014-10-02 09:59:20 -07:00
ethernet-rx.c Staging: octeon: Add blank lines after declarations 2015-01-17 15:00:23 -08:00
ethernet-rx.h MIPS: Octeon: Move some Ethernet support files out of staging. 2011-12-07 22:03:28 +00:00
ethernet-sgmii.c Staging: octeon: Missing a blank line after declarations 2014-09-19 17:42:15 -07:00
ethernet-spi.c Staging: octeon: quoted string split across lines in ethernet-spi.c 2013-10-11 13:52:00 -07:00
ethernet-tx.c MIPS: Octeon: Fix to IP checksum offloading in Little Endian 2015-04-01 17:22:15 +02:00
ethernet-tx.h
ethernet-util.h staging: octeon: Removed unnecessary else expression. 2014-09-28 23:30:54 -04:00
ethernet-xaui.c Staging: octeon: Fix missing blank line warning. 2014-09-23 11:33:47 -07:00
ethernet.c Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2015-04-17 15:50:54 -04:00
octeon-ethernet.h staging: octeon-ethernet: drop multiple NAPI instances 2014-11-26 13:45:11 -08:00