1
0
Fork 0
freescale-linux-fslc/arch/arm/mach-tegra
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
..
apbio.c tree-wide: use reinit_completion instead of INIT_COMPLETION 2013-11-15 09:32:21 +09:00
apbio.h ARM: tegra: apbio access using dma for tegra20 only 2012-07-06 11:48:56 -06:00
board-paz00.c ARM: tegra: add gpiod_lookup table for paz00 2013-12-11 12:49:29 +01:00
board.h ARM: tegra: delete stale header content 2013-09-17 13:44:21 -06:00
common.h Revert "ARM: tegra: add cpu_disable for hotplug" 2013-07-19 10:00:37 -06:00
cpuidle-tegra20.c ARM: tegra: disable LP2 cpuidle state if PCIe is enabled 2013-08-13 12:07:56 -06:00
cpuidle-tegra30.c ARM: tegra: don't pass CPU ID to tegra_{set,clear}_cpu_in_lp2 2013-06-05 11:44:58 -06:00
cpuidle-tegra114.c ARM: tegra: cpuidle: use firmware for power down 2014-02-18 13:46:50 -07:00
cpuidle.c ARM: tegra: enable CPU idle for Tegra124 2013-10-18 16:28:09 -06:00
cpuidle.h ARM: tegra: disable LP2 cpuidle state if PCIe is enabled 2013-08-13 12:07:56 -06:00
flowctrl.c ARM: tegra: add LP1 support code for Tegra124 2013-10-18 16:28:10 -06:00
flowctrl.h ARM: tegra: shut off the CPU rail when the last CPU in suspend 2013-07-19 10:08:07 -06:00
fuse.c ARM: tegra: SoC-specific core code changes 2013-12-26 11:02:25 -08:00
fuse.h ARM: tegra: add Tegra124 SoC support 2013-10-18 16:28:07 -06:00
headsmp.S ARM: tegra: do v7_invalidate_l1 only when CPU is Cortex-A9 2013-07-19 10:08:04 -06:00
hotplug.c ARM: tegra: CPU hotplug support for Tegra124 2013-10-18 16:28:08 -06:00
io.c ARM: tegra: don't include iomap.h from debug-macro.S 2012-11-16 12:22:17 -07:00
iomap.h ARM: tegra: use section-sized static mappings for LPAE too 2013-12-04 12:25:25 -07:00
irammap.h ARM: tegra: move resume vector define to irammap.h 2013-09-17 13:44:22 -06:00
irq.c ARM: tegra114: Reprogram GIC CPU interface to bypass IRQ on CPU PM entry 2013-07-19 10:07:14 -06:00
irq.h ARM: tegra: irq: add wake up handling 2013-04-03 14:31:32 -06:00
Kconfig ARM: kconfig: allow PCI support to be selected with ARCH_MULTIPLATFORM 2014-05-29 12:42:38 -07:00
Makefile ARM: tegra: remove tegra EMC scaling driver 2014-02-25 10:58:06 -07:00
platsmp.c ARM: tegra: don't timeout if CPU is powergated 2014-02-12 12:10:58 -07:00
pm-tegra20.c ARM: tegra: add LP1 suspend support for Tegra20 2013-08-12 13:30:11 -06:00
pm-tegra30.c ARM: tegra: add LP1 suspend support for Tegra30 2013-08-12 13:30:11 -06:00
pm.c arm, pm, vmpressure: add missing slab.h includes 2014-02-03 13:24:01 -05:00
pm.h ARM: l2c: tegra: convert to common l2c310 early resume functionality 2014-05-30 00:50:12 +01:00
pmc.c ARM: tegra: Support reboot modes 2014-05-07 09:58:03 -06:00
pmc.h ARM: tegra: remove common.c 2013-09-17 13:44:21 -06:00
powergate.c ARM: tegra: Export I/O rail functions 2014-02-25 13:16:32 -07:00
reset-handler.S ARM: l2c: tegra: convert to common l2c310 early resume functionality 2014-05-30 00:50:12 +01:00
reset.c ARM: tegra: set CPU reset handler using firmware 2013-12-13 12:50:31 -07:00
reset.h ARM: tegra: add common LP1 suspend support 2013-08-12 13:29:24 -06:00
sleep-tegra20.S ARM: tegra: move resume vector define to irammap.h 2013-09-17 13:44:22 -06:00
sleep-tegra30.S ARM: tegra: add LP1 support code for Tegra124 2013-10-18 16:28:10 -06:00
sleep.h ARM: l2c: tegra: convert to common l2c310 early resume functionality 2014-05-30 00:50:12 +01:00
sleep.S ARM: tegra: add LP1 suspend support for Tegra30 2013-08-12 13:30:11 -06:00
tegra.c ARM: l2c: tegra: convert to generic l2c OF initialisation 2014-05-30 00:50:15 +01:00
tegra20_speedo.c ARM: tegra: Add speedo-based process identification 2012-11-15 14:34:20 -07:00
tegra30_speedo.c ARM: tegra: Tegra30 speedo-based process identification 2012-11-15 14:36:59 -07:00
tegra114_speedo.c ARM: tegra: add speedo-based process id for Tegra114 2013-03-19 11:52:06 -06:00