1
0
Fork 0
alistair23-linux/drivers/ssb
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 SSB: fix Kconfig dependencies 2015-04-10 15:41:50 +02:00
Makefile ssb: add place for serial flash driver 2013-01-09 14:37:09 -05:00
b43_pci_bridge.c ssb: add PCI ID 0x4351 2014-08-25 15:39:22 -04:00
driver_chipcommon.c ssb: Convert ssb_printk to ssb_<level> 2013-03-06 16:24:23 -05:00
driver_chipcommon_pmu.c MIPS: BCM47xx: Move NVRAM header to the include/linux/. 2015-04-01 17:22:00 +02:00
driver_chipcommon_sflash.c ssb: fix sparse warnings in driver_chipcommon_sflash.c 2014-01-03 15:37:01 -05:00
driver_extif.c Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2012-12-14 14:27:45 -08:00
driver_gige.c treewide: Remove unnecessary SSB_DEVTABLE_END macro 2015-02-11 14:38:29 -08:00
driver_gpio.c driver:gpio remove all usage of gpio_remove retval in driver 2014-09-18 11:03:10 -07:00
driver_mipscore.c MIPS: BCM47xx: Move NVRAM header to the include/linux/. 2015-04-01 17:22:00 +02:00
driver_pcicore.c ssb: add delay after PCI reset to fix SoC reboots 2015-04-07 20:18:10 +03:00
embedded.c ssb: Convert ssb_printk to ssb_<level> 2013-03-06 16:24:23 -05:00
main.c ssb: Silence warning for unknown backplane revision 2015-03-03 15:49:40 +02:00
pci.c ssb: extract power info from SPROM revs 4 and 5 2014-07-18 13:45:24 -04:00
pcihost_wrapper.c SSB / B44: fix WOL for BCM4401 2014-12-04 11:32:46 -05:00
pcmcia.c ssb: Convert ssb_printk to ssb_<level> 2013-03-06 16:24:23 -05:00
scan.c ssb: Convert ssb_printk to ssb_<level> 2013-03-06 16:24:23 -05:00
sdio.c ssb: remove 5GHz antenna gain from sprom 2012-03-05 15:20:49 -05:00
sprom.c ssb: sprom: replace strict_strtoul() with kstrtoul() 2013-06-03 00:39:46 -07:00
ssb_private.h ssb: register serial flash as platform device 2013-06-18 14:46:46 -04:00