alistair23-linux/arch/arm/mach-omap1
Linus Torvalds 2d1eb87ae1 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM changes from Russell King:

 - Perf updates from Will Deacon:
   - Support for Qualcomm Krait processors (run perf on your phone!)
   - Support for Cortex-A12 (run perf stat on your FPGA!)
   - Support for perf_sample_event_took, allowing us to automatically decrease
     the sample rate if we can't handle the PMU interrupts quickly enough
     (run perf record on your FPGA!).

 - Basic uprobes support from David Long:
     This patch series adds basic uprobes support to ARM. It is based on
     patches developed earlier by Rabin Vincent. That approach of adding
     hooks into the kprobes instruction parsing code was not well received.
     This approach separates the ARM instruction parsing code in kprobes out
     into a separate set of functions which can be used by both kprobes and
     uprobes. Both kprobes and uprobes then provide their own semantic action
     tables to process the results of the parsing.

 - ARMv7M (microcontroller) updates from Uwe Kleine-König

 - OMAP DMA updates (recently added Vinod's Ack even though they've been
   sitting in linux-next for a few months) to reduce the reliance of
   omap-dma on the code in arch/arm.

 - SA11x0 changes from Dmitry Eremin-Solenikov and Alexander Shiyan

 - Support for Cortex-A12 CPU

 - Align support for ARMv6 with ARMv7 so they can cooperate better in a
   single zImage.

 - Addition of first AT_HWCAP2 feature bits for ARMv8 crypto support.

 - Removal of IRQ_DISABLED from various ARM files

 - Improved efficiency of virt_to_page() for single zImage

 - Patch from Ulf Hansson to permit runtime PM callbacks to be available for
   AMBA devices for suspend/resume as well.

 - Finally kill asm/system.h on ARM.

* 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (89 commits)
  dmaengine: omap-dma: more consolidation of CCR register setup
  dmaengine: omap-dma: move IRQ handling to omap-dma
  dmaengine: omap-dma: move register read/writes into omap-dma.c
  ARM: omap: dma: get rid of 'p' allocation and clean up
  ARM: omap: move dma channel allocation into plat-omap code
  ARM: omap: dma: get rid of errata global
  ARM: omap: clean up DMA register accesses
  ARM: omap: remove almost-const variables
  ARM: omap: remove references to disable_irq_lch
  dmaengine: omap-dma: cleanup errata 3.3 handling
  dmaengine: omap-dma: provide register read/write functions
  dmaengine: omap-dma: use cached CCR value when enabling DMA
  dmaengine: omap-dma: move barrier to omap_dma_start_desc()
  dmaengine: omap-dma: move clnk_ctrl setting to preparation functions
  dmaengine: omap-dma: improve efficiency loading C.SA/C.EI/C.FI registers
  dmaengine: omap-dma: consolidate clearing channel status register
  dmaengine: omap-dma: move CCR buffering disable errata out of the fast path
  dmaengine: omap-dma: provide register definitions
  dmaengine: omap-dma: consolidate setup of CCR
  dmaengine: omap-dma: consolidate setup of CSDP
  ...
2014-04-05 13:20:43 -07:00
..
include/mach ARM: OMAP1: USB: move omap_usb_config to platform data 2013-12-06 14:36:31 -06:00
ams-delta-fiq-handler.S
ams-delta-fiq.c arm: omap: Fix typo in ams-delta-fiq.c 2014-03-20 12:44:02 +01:00
board-ams-delta.c Merge branch 'clocksource/cleanup' into next/cleanup 2013-01-14 10:20:02 -08:00
board-fsample.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-generic.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-h2-mmc.c
board-h2.c ARM: OMAP1: Remove legacy irda.h and irda setup from board files 2013-06-18 00:12:34 -07:00
board-h2.h
board-h3-mmc.c
board-h3.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-h3.h
board-htcherald.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-innovator.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-nand.c
board-nokia770.c ARM: OMAP1: nokia770: enable tahvo-usb 2014-02-13 15:20:14 -08:00
board-osk.c misc: (at24) move header to linux/platform_data/ 2013-09-30 06:02:34 +02:00
board-palmte.c ARM: OMAP1: Remove legacy irda.h and irda setup from board files 2013-06-18 00:12:34 -07:00
board-palmtt.c ARM: OMAP1: Remove legacy irda.h and irda setup from board files 2013-06-18 00:12:34 -07:00
board-palmz71.c ARM: OMAP1: Remove legacy irda.h and irda setup from board files 2013-06-18 00:12:34 -07:00
board-perseus2.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-sx1-mmc.c
board-sx1.c ARM: OMAP1: Remove legacy irda.h and irda setup from board files 2013-06-18 00:12:34 -07:00
board-voiceblue.c reboot: arm: change reboot_mode to use enum reboot_mode 2013-07-09 10:33:29 -07:00
clock.c
clock.h
clock_data.c ARM: OMAP1: fix USB host on 1710 2013-03-13 04:10:57 -06:00
common.h ARM: mach-omap1: Fix omap1510_fpga_init_irq() implicit declarations. 2013-10-08 11:04:22 -07:00
devices.c ARM: OMAP1: Remove duplicated DMA channel definitions 2013-06-18 00:12:34 -07:00
dma.c dmaengine: omap-dma: move register read/writes into omap-dma.c 2014-04-04 00:31:49 +01:00
fb.c
flash.c
fpga.c ARM: OMAP: remove deprecated IRQF_DISABLED 2013-10-03 13:24:36 -07:00
fpga.h
gpio7xx.c ARM: OMAP1: Fix a bunch of GPIO related section warnings after initdata got corrected 2013-10-18 10:50:51 -07:00
gpio15xx.c ARM: OMAP1: Fix a bunch of GPIO related section warnings after initdata got corrected 2013-10-18 10:50:51 -07:00
gpio16xx.c ARM: OMAP1: Fix a bunch of GPIO related section warnings after initdata got corrected 2013-10-18 10:50:51 -07:00
i2c.c ARM: OMAP: Fix i2c cmdline initcall for multiplatform 2013-01-11 11:24:19 -08:00
id.c
io.c
iomap.h
irq.c
Kconfig ARM: OMAP1: remove "config MACH_OMAP_HTCWIZARD" 2013-04-01 08:52:27 -07:00
lcd_dma.c ARM: OMAP1: Remove dma.h 2013-06-18 00:12:34 -07:00
Makefile mailbox/omap: move the OMAP mailbox framework to drivers 2013-06-11 11:41:51 -05:00
Makefile.boot
mcbsp.c ARM: OMAP1: Remove McBSP DMA channel definitions 2013-06-18 00:12:34 -07:00
mmc.h
mux.c
ocpi.c
opp.h
opp_data.c
pm.c ARM: OMAP: remove deprecated IRQF_DISABLED 2013-10-03 13:24:36 -07:00
pm.h
pm_bus.c
reset.c reboot: arm: change reboot_mode to use enum reboot_mode 2013-07-09 10:33:29 -07:00
serial.c
sleep.S
soc.h
sram-init.c
sram.h
sram.S
time.c ARM: OMAP1: Switch to sched_clock_register() 2013-11-21 15:41:00 -08:00
timer.c
timer32k.c ARM: OMAP: remove deprecated IRQF_DISABLED 2013-10-03 13:24:36 -07:00
usb.c ARM: OMAP1: fix omap_udc registration 2013-04-08 13:59:51 -07:00