1
0
Fork 0
alistair23-linux/arch/mips/ath79
Linus Torvalds 4305f42401 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 4.8.  Also includes is a
  minor SSB cleanup as SSB code traditionally is merged through the MIPS
  tree:

  ATH25:
    - MIPS: Add default configuration for ath25

  Boot:
    - For zboot, copy appended dtb to the end of the kernel
    - store the appended dtb address in a variable

  BPF:
    - Fix off by one error in offset allocation

  Cobalt code:
    - Fix typos

  Core code:
    - debugfs_create_file returns NULL on error, so don't use IS_ERR for
      testing for errors.
    - Fix double locking issue in RM7000 S-cache code.  This would only
      affect RM7000 ARC systems on reboot.
    - Fix page table corruption on THP permission changes.
    - Use compat_sys_keyctl for 32 bit userspace on 64 bit kernels.
      David says, there are no compatibility issues raised by this fix.
    - Move some signal code around.
    - Rewrite r4k count/compare clockevent device registration such that
      min_delta_ticks/max_delta_ticks files are guaranteed to be
      initialized.
    - Only register r4k count/compare as clockevent device if we can
      assume the clock to be constant.
    - Fix MSA asm warnings in control reg accessors
    - uasm and tlbex fixes and tweaking.
    - Print segment physical address when EU=1.
    - Define AT_VECTOR_SIZE_ARCH for ARCH_DLINFO.
    - CP: Allow booting by VP other than VP 0
    - Cache handling fixes and optimizations for r4k class caches
    - Add hotplug support for R6 processors
    - Cleanup hotplug bits in kconfig
    - traps: return correct si code for accessing nonmapped addresses
    - Remove cpu_has_safe_index_cacheops

  Lantiq:
    - Register IRQ handler for virtual IRQ number
    - Fix EIU interrupt loading code
    - Use the real EXIN count
    - Fix build error.

  Loongson 3:
    - Increase HPET_MIN_PROG_DELTA and decrease HPET_MIN_CYCLES

  Octeon:
    - Delete built-in DTB pruning code for D-Link DSR-1000N.
    - Clean up GPIO definitions in dlink_dsr-1000n.dts.
    - Add more LEDs to the DSR-100n DTS
    - Fix off by one in octeon_irq_gpio_map()
    - Typo fixes
    - Enable SATA by default in cavium_octeon_defconfig
    - Support readq/writeq()
    - Remove forced mappings of USB interrupts.
    - Ensure DMA descriptors are always in the low 4GB
    - Improve USB reset code for OCTEON II.

  Pistachio:
    - Add maintainers entry for pistachio SoC Support
    - Remove plat_setup_iocoherency

  Ralink:
    - Fix pwm UART in spis group pinmux.

  SSB:
    - Change bare unsigned to unsigned int to suit coding style

  Tools:
    - Fix reloc tool compiler warnings.

  Other:
    - Delete use of ARCH_WANT_OPTIONAL_GPIOLIB"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (61 commits)
  MIPS: mm: Fix definition of R6 cache instruction
  MIPS: tools: Fix relocs tool compiler warnings
  MIPS: Cobalt: Fix typo
  MIPS: Octeon: Fix typo
  MIPS: Lantiq: Fix build failure
  MIPS: Use CPHYSADDR to implement mips32 __pa
  MIPS: Octeon: Dlink_dsr-1000n.dts: add more leds.
  MIPS: Octeon: Clean up GPIO definitions in dlink_dsr-1000n.dts.
  MIPS: Octeon: Delete built-in DTB pruning code for D-Link DSR-1000N.
  MIPS: store the appended dtb address in a variable
  MIPS: ZBOOT: copy appended dtb to the end of the kernel
  MIPS: ralink: fix spis group pinmux
  MIPS: Factor o32 specific code into signal_o32.c
  MIPS: non-exec stack & heap when non-exec PT_GNU_STACK is present
  MIPS: Use per-mm page to execute branch delay slot instructions
  MIPS: Modify error handling
  MIPS: c-r4k: Use SMP calls for CM indexed cache ops
  MIPS: c-r4k: Avoid small flush_icache_range SMP calls
  MIPS: c-r4k: Local flush_icache_range cache op override
  MIPS: c-r4k: Split r4k_flush_kernel_vmap_range()
  ...
2016-08-06 09:13:11 -04:00
..
Kconfig MIPS: ath79: Remove the builtin DTB support 2016-05-13 14:01:37 +02:00
Makefile MIPS: ath79: Move the GPIO driver to drivers/gpio 2015-09-03 12:08:02 +02:00
Platform MIPS: Add initial support for the Atheros AR71XX/AR724X/AR931X SoCs 2011-01-18 19:30:24 +01:00
clock.c MIPS: ath79: Remove CLK_IS_ROOT 2016-05-13 15:30:25 +02:00
common.c MIPS: ath79: fix regression in PCI window initialization 2016-05-17 11:13:28 +02:00
common.h MIPS: ath79: Allow using ath79_ddr_wb_flush() from drivers 2016-01-04 09:42:25 +01:00
dev-common.c MIPS: ath79: Add OF support to the GPIO driver 2015-06-21 21:54:09 +02:00
dev-common.h MIPS: ath79: add common watchdog device 2011-01-18 19:30:26 +01:00
dev-gpio-buttons.c MIPS: ath79: Use kmemdup rather than duplicating its implementation 2012-05-15 17:49:00 +02:00
dev-gpio-buttons.h MIPS: ath79: add common GPIO buttons device 2011-01-18 19:30:27 +01:00
dev-leds-gpio.c MIPS: ath79: Use kmemdup rather than duplicating its implementation 2012-05-15 17:49:00 +02:00
dev-leds-gpio.h MIPS: ath79: add common GPIO LEDs device 2011-01-18 19:30:26 +01:00
dev-spi.c MIPS: ath79: add common SPI controller device 2011-01-18 19:30:27 +01:00
dev-spi.h MIPS: ath79: add common SPI controller device 2011-01-18 19:30:27 +01:00
dev-usb.c MIPS: ath79: add USB controller registration code for the QCA955X SoCs 2013-02-19 09:36:33 +01:00
dev-usb.h MIPS: ath79: add common USB Host Controller device 2011-12-07 22:02:44 +00:00
dev-wmac.c MIPS: ath79: add WMAC registration code for the QCA955X SoCs 2013-02-19 09:36:30 +01:00
dev-wmac.h MIPS: ath79: Rename dev-ar913x-wmac.h to dev-wmac.h 2011-12-07 22:02:48 +00:00
early_printk.c MIPS: ath79: make bootconsole wait for both THRE and TEMT 2016-04-30 09:26:55 -07:00
irq.c irqchip/ath79-cpu: Move the CPU IRQ driver from arch/mips/ath79/ 2016-02-17 13:47:19 +00:00
mach-ap81.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
mach-ap121.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
mach-ap136.c MIPS: ath79: Fix argument for the ap136_pc_init function 2013-06-21 18:07:02 +02:00
mach-db120.c MIPS: ath79: Fix compilation error when CONFIG_PCI is disabled 2014-10-22 23:16:59 +02:00
mach-pb44.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
mach-ubnt-xm.c MIPS: ath79: remove ar724x_pci_add_data function 2012-05-15 17:49:06 +02:00
machtypes.h MIPS: ath79: Add basic device tree support 2015-06-21 21:54:01 +02:00
pci.c MIPS: ath79: add PCI controller registration code for the QCA955X SoCs 2013-02-19 09:36:32 +01:00
pci.h MIPS: ath79: allow to specify bus number in PCI IRQ maps 2013-02-17 01:25:38 +01:00
prom.c MIPS: ath79: fix build problem if CONFIG_BLK_DEV_INITRD is not set 2015-05-29 20:23:36 +02:00
setup.c Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2016-08-06 09:13:11 -04:00