1
0
Fork 0
alistair23-linux/arch/arm/mach-w90x900
Linus Torvalds de06dbfa78 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM updates from Russell King:
 "Another mixture of changes this time around:

   - Split XIP linker file from main linker file to make it more
     maintainable, and various XIP fixes, and clean up a resulting
     macro.

   - Decompressor cleanups from Masahiro Yamada

   - Avoid printing an error for a missing L2 cache

   - Remove some duplicated symbols in System.map, and move
     vectors/stubs back into kernel VMA

   - Various low priority fixes from Arnd

   - Updates to allow bus match functions to return negative errno
     values, touching some drivers and the driver core.  Greg has acked
     these changes.

   - Virtualisation platform udpates form Jean-Philippe Brucker.

   - Security enhancements from Kees Cook

   - Rework some Kconfig dependencies and move PSCI idle management code
     out of arch/arm into drivers/firmware/psci.c

   - ARM DMA mapping updates, touching media, acked by Mauro.

   - Fix places in ARM code which should be using virt_to_idmap() so
     that Keystone2 can work.

   - Fix Marvell Tauros2 to work again with non-DT boots.

   - Provide a delay timer for ARM Orion platforms"

* 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (45 commits)
  ARM: 8546/1: dma-mapping: refactor to fix coherent+cma+gfp=0
  ARM: 8547/1: dma-mapping: store buffer information
  ARM: 8543/1: decompressor: rename suffix_y to compress-y
  ARM: 8542/1: decompressor: merge piggy.*.S and simplify Makefile
  ARM: 8541/1: decompressor: drop redundant FORCE in Makefile
  ARM: 8540/1: decompressor: use clean-files instead of extra-y to clean files
  ARM: 8539/1: decompressor: drop more unneeded assignments to "targets"
  ARM: 8538/1: decompressor: drop unneeded assignments to "targets"
  ARM: 8532/1: uncompress: mark putc as inline
  ARM: 8531/1: turn init_new_context into an inline function
  ARM: 8530/1: remove VIRT_TO_BUS
  ARM: 8537/1: drop unused DEBUG_RODATA from XIP_KERNEL
  ARM: 8536/1: mm: hide __start_rodata_section_aligned for non-debug builds
  ARM: 8535/1: mm: DEBUG_RODATA makes no sense with XIP_KERNEL
  ARM: 8534/1: virt: fix hyp-stub build for pre-ARMv7 CPUs
  ARM: make the physical-relative calculation more obvious
  ARM: 8512/1: proc-v7.S: Adjust stack address when XIP_KERNEL
  ARM: 8411/1: Add default SPARSEMEM settings
  ARM: 8503/1: clk_register_clkdev: remove format string interface
  ARM: 8529/1: remove 'i' and 'zi' targets
  ...
2016-03-19 16:31:54 -07:00
..
include/mach ARM: 8532/1: uncompress: mark putc as inline 2016-02-22 16:55:42 +00:00
Kconfig ARM: 5684/1: Add nuc960 platform to w90x900 2009-09-02 11:22:24 +01:00
Makefile ARM: 5684/1: Add nuc960 platform to w90x900 2009-09-02 11:22:24 +01:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
clksel.c ARM: 7274/1: NUC900: Rename nuc900-audio platform device to nuc900-ac97 2012-01-13 08:56:40 +00:00
clock.c ARM: Consolidate clks_register() and similar 2010-02-12 17:32:36 +00:00
clock.h ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
cpu.c ARM: w90x900: make headers more local 2015-12-01 21:52:51 +01:00
cpu.h NUC900 LCD Controller Driver 2010-03-12 15:52:34 -08:00
dev.c arm: Use generic idle loop 2013-04-08 17:39:24 +02:00
gpio.c ARM: w90x900: use gpiochip data pointer 2016-02-19 09:51:42 +01:00
irq.c ARM: kill off set_irq_flags usage 2015-07-28 13:58:13 +02:00
mach-nuc910evb.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-nuc950evb.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-nuc960evb.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mfp.c ARM: 7274/1: NUC900: Rename nuc900-audio platform device to nuc900-ac97 2012-01-13 08:56:40 +00:00
nuc9xx.h reboot: arm: change reboot_mode to use enum reboot_mode 2013-07-09 10:33:29 -07:00
nuc910.c ARM: 6249/1: add nuc900 kpi platform_device structure to nuc910_dev 2010-07-22 09:20:17 +01:00
nuc910.h ARM: w90x900: add common nuc9xx.h 2011-11-21 09:49:30 +00:00
nuc950.c ARM: 6231/1: re-organize the nuc900 lcd arch platform data setting 2010-07-22 09:20:16 +01:00
nuc950.h ARM: w90x900: add common nuc9xx.h 2011-11-21 09:49:30 +00:00
nuc960.c ARM: 5684/1: Add nuc960 platform to w90x900 2009-09-02 11:22:24 +01:00
nuc960.h ARM: w90x900: add common nuc9xx.h 2011-11-21 09:49:30 +00:00
regs-ebi.h ARM: w90x900: make headers more local 2015-12-01 21:52:51 +01:00
regs-gcr.h ARM: w90x900: make headers more local 2015-12-01 21:52:51 +01:00
regs-timer.h ARM: w90x900: make headers more local 2015-12-01 21:52:51 +01:00
regs-usb.h ARM: w90x900: make headers more local 2015-12-01 21:52:51 +01:00
time.c ARM: w90x900: make headers more local 2015-12-01 21:52:51 +01:00