1
0
Fork 0
alistair23-linux/arch/arm/mach-msm
Linus Torvalds eb3d3ec567 Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into next
Pull ARM updates from Russell King:

 - Major clean-up of the L2 cache support code.  The existing mess was
   becoming rather unmaintainable through all the additions that others
   have done over time.  This turns it into a much nicer structure, and
   implements a few performance improvements as well.

 - Clean up some of the CP15 control register tweaks for alignment
   support, moving some code and data into alignment.c

 - DMA properties for ARM, from Santosh and reviewed by DT people.  This
   adds DT properties to specify bus translations we can't discover
   automatically, and to indicate whether devices are coherent.

 - Hibernation support for ARM

 - Make ftrace work with read-only text in modules

 - add suspend support for PJ4B CPUs

 - rework interrupt masking for undefined instruction handling, which
   allows us to enable interrupts earlier in the handling of these
   exceptions.

 - support for big endian page tables

 - fix stacktrace support to exclude stacktrace functions from the
   trace, and add save_stack_trace_regs() implementation so that kprobes
   can record stack traces.

 - Add support for the Cortex-A17 CPU.

 - Remove last vestiges of ARM710 support.

 - Removal of ARM "meminfo" structure, finally converting us solely to
   memblock to handle the early memory initialisation.

* 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (142 commits)
  ARM: ensure C page table setup code follows assembly code (part II)
  ARM: ensure C page table setup code follows assembly code
  ARM: consolidate last remaining open-coded alignment trap enable
  ARM: remove global cr_no_alignment
  ARM: remove CPU_CP15 conditional from alignment.c
  ARM: remove unused adjust_cr() function
  ARM: move "noalign" command line option to alignment.c
  ARM: provide common method to clear bits in CPU control register
  ARM: 8025/1: Get rid of meminfo
  ARM: 8060/1: mm: allow sub-architectures to override PCI I/O memory type
  ARM: 8066/1: correction for ARM patch 8031/2
  ARM: 8049/1: ftrace/add save_stack_trace_regs() implementation
  ARM: 8065/1: remove last use of CONFIG_CPU_ARM710
  ARM: 8062/1: Modify ldrt fixup handler to re-execute the userspace instruction
  ARM: 8047/1: rwsem: use asm-generic rwsem implementation
  ARM: l2c: trial at enabling some Cortex-A9 optimisations
  ARM: l2c: add warnings for stuff modifying aux_ctrl register values
  ARM: l2c: print a warning with L2C-310 caches if the cache size is modified
  ARM: l2c: remove old .set_debug method
  ARM: l2c: kill L2X0_AUX_CTRL_MASK before anyone else makes use of this
  ...
2014-06-05 15:57:04 -07:00
..
include/mach ARM: drop <mach/timex.h> for !ARCH_MULTIPLATFORM, too 2013-12-20 17:17:16 +01:00
Kconfig ARM: debug: qcom: make UART address selection configuration option 2014-05-22 11:50:15 -05:00
Makefile ARM: qcom: Split Qualcomm support into legacy and multiplatform 2014-02-06 16:20:26 -06:00
Makefile.boot ARM: dtb: move all dtb targets to common Makefile 2012-09-20 22:58:17 -07:00
board-halibut.c ARM: 8025/1: Get rid of meminfo 2014-06-01 01:17:12 +01:00
board-mahimahi.c ARM: 8025/1: Get rid of meminfo 2014-06-01 01:17:12 +01:00
board-msm7x30.c Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into next 2014-06-05 15:57:04 -07:00
board-qsd8x50.c usb: phy: msm: Replace custom enum usb_mode_type with enum usb_dr_mode 2014-04-30 11:28:43 -05:00
board-sapphire.c ARM: 8025/1: Get rid of meminfo 2014-06-01 01:17:12 +01:00
board-trout-gpio.c ARM: msm: Silence readb/writeb warnings due to missing IOMEM() 2014-05-27 11:42:59 -07:00
board-trout-mmc.c ARM: msm: move platform_data definitions 2012-09-14 11:17:35 +02:00
board-trout-panel.c ARM: msm: Prepare clk_get() users in mach-msm for clock-pcom driver 2013-06-24 13:06:43 -07:00
board-trout.c Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into next 2014-06-05 15:57:04 -07:00
board-trout.h ARM: msm: Silence readb/writeb warnings due to missing IOMEM() 2014-05-27 11:42:59 -07:00
clock-pcom.c ARM: msm: Migrate to common clock framework 2013-06-24 13:08:05 -07:00
clock-pcom.h ARM: msm: Migrate to common clock framework 2013-06-24 13:08:05 -07:00
clock.c ARM: msm: Migrate to common clock framework 2013-06-24 13:08:05 -07:00
clock.h ARM: msm: Migrate to common clock framework 2013-06-24 13:08:05 -07:00
common.h ARM: qcom: Re-organize platsmp to make it extensible 2014-02-11 15:00:37 -06:00
devices-msm7x00.c msm_serial: Switch clock consumer strings and simplify code 2013-08-27 16:22:58 -07:00
devices-msm7x30.c ARM: SoC cleanups for 3.12 2013-09-06 13:21:16 -07:00
devices-qsd8x50.c ARM: SoC cleanups for 3.12 2013-09-06 13:21:16 -07:00
devices.h ARM: msm: Make proc_comm clock control into a platform driver 2013-06-24 13:07:53 -07:00
dma.c ARM: msm: export legacy DMA interfaces 2014-03-21 18:23:32 +01:00
gpiomux-8x50.c msm: 8x50: Add initial support for SDCC 2011-01-21 16:58:02 -08:00
gpiomux-v1.h msm: add gpiomux api for gpio multiplex & configuration. 2010-10-06 09:01:15 -07:00
gpiomux.c ARM: msm: Remove gpiomux-v2 and re-organize MSM_GPIOMUX configs 2013-06-12 13:52:51 -07:00
gpiomux.h ARM: msm: Consolidate gpiomux for older architectures 2013-07-26 14:55:38 -07:00
io.c ARM: msm: avoid calling debug_ll_addr on !MMU 2014-03-21 18:23:31 +01:00
irq-vic.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
irq.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
last_radio_log.c proc: Use PDE attribute setting accessor functions 2013-05-07 15:01:11 -04:00
proc_comm.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
proc_comm.h ARM: msm: proc_comm_boot_wait should not be __init 2013-02-11 17:42:28 -08:00
sirc.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
smd.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
smd_debug.c ARM: msm: use machine specific hook for late init 2012-05-08 20:36:17 +08:00
smd_private.h arm: msm: smd: msm7x30 a2m clean up 2010-05-12 09:19:04 -07:00
vreg.c ARM: msm: vreg is a module and so needs module.h 2012-01-06 11:07:57 -08:00