1
0
Fork 0
freescale-linux-fslc/arch/arm/mach-imx
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
..
devices ARM: SoC updates for 3.16 (part 1) 2014-06-02 16:15:12 -07:00
3ds_debugboard.c
3ds_debugboard.h
anatop.c ARM: imx: use imx_init_revision_from_anatop() on imx6sl 2013-10-21 09:13:13 +08:00
avic.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
board-mx31lilly.h
board-mx31lite.h
board-mx31moboard.h
board-pcm038.h
clk-busy.c
clk-fixup-div.c ARM: imx: add common clock support for fixup div 2013-08-16 13:11:24 +08:00
clk-fixup-mux.c ARM: imx: initialize clk_init_data.flags for clk-fixup-mux 2013-09-17 10:04:23 +08:00
clk-gate2.c ARM: imx: add shared gate clock support 2014-05-12 22:58:48 +08:00
clk-imx1.c ARM: i.MX1 clk: Remove clk_register_clkdev() for unused clocks 2014-05-16 15:39:07 +08:00
clk-imx6q.c ARM: imx6q: add the missing esai_ahb clock 2014-05-12 22:58:49 +08:00
clk-imx6sl.c ARM: imx: factor device tree timer initialization 2014-04-30 13:40:28 +08:00
clk-imx6sx.c ARM: imx: add clock driver for imx6sx 2014-05-16 15:35:19 +08:00
clk-imx21.c ARM i.MX: remove PWM platform support 2014-03-05 10:35:09 +08:00
clk-imx25.c ARM: mx25: Add CLKO support 2014-05-16 22:51:34 +08:00
clk-imx27.c ARM: i.MX27 clk: Remove clk_register_clkdev() for unused clocks 2014-05-12 22:58:50 +08:00
clk-imx31.c ARM: i.MX: Remove #ifdef CONFIG_OF 2014-05-12 22:58:47 +08:00
clk-imx35.c ARM: imx: fix function type for CLK_OF_DECLARE 2014-05-20 14:25:21 -05:00
clk-imx51-imx53.c ARM: imx: factor device tree timer initialization 2014-04-30 13:40:28 +08:00
clk-pfd.c ARM: imx: add necessary interface for pfd 2013-12-31 09:36:45 +08:00
clk-pllv1.c ARM: imx: pllv1: Fix PLL calculation for i.MX27 2013-12-31 09:36:29 +08:00
clk-pllv2.c
clk-pllv3.c ARM: imx: set up pllv3 POWER and BYPASS sequentially 2013-11-11 22:58:45 +08:00
clk-vf610.c ARM: imx: clk-vf610: Suppress duplicate const sparse warning 2014-03-05 10:35:08 +08:00
clk.c ARM: imx6: change some clocks to fixup clocks 2013-08-16 13:11:25 +08:00
clk.h ARM: imx: add shared gate clock support 2014-05-12 22:58:48 +08:00
common.h ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
cpu-imx5.c
cpu-imx25.c
cpu-imx27.c
cpu-imx31.c
cpu-imx35.c
cpu.c ARM: imx: add basic imx6sx SoC support 2014-05-16 15:35:25 +08:00
cpuidle-imx5.c
cpuidle-imx6q.c ARM: imx: Use INT_MEM_CLK_LPM as the bit name 2014-03-05 10:34:59 +08:00
cpuidle-imx6sl.c ARM: imx: add cpuidle support for i.mx6sl 2014-03-05 10:35:01 +08:00
cpuidle.h ARM: imx: add cpuidle support for i.mx6sl 2014-03-05 10:35:01 +08:00
crm-regs-imx5.h
crmregs-imx3.h
devices-imx1.h
devices-imx21.h
devices-imx25.h ARM i.MX: remove PWM platform support 2014-03-05 10:35:09 +08:00
devices-imx27.h
devices-imx31.h
devices-imx35.h ARM: imx: prepare for removal of flexcan_platform_data 2013-06-27 15:15:08 +02:00
devices-imx51.h ARM i.MX: remove PWM platform support 2014-03-05 10:35:09 +08:00
ehci-imx5.c
ehci-imx25.c
ehci-imx27.c
ehci-imx31.c
ehci-imx35.c
epit.c ARM: imx: remove IRQF_DISABLED 2013-10-21 09:11:05 +08:00
eukrea-baseboards.h
eukrea_mbimx27-baseboard.c
eukrea_mbimxsd25-baseboard.c ARM: imx: prepare for removal of flexcan_platform_data 2013-06-27 15:15:08 +02:00
eukrea_mbimxsd35-baseboard.c ARM: imx: prepare for removal of flexcan_platform_data 2013-06-27 15:15:08 +02:00
gpc.c ARM: imx: ensure dsm_request signal is not asserted when setting LPM 2013-10-21 09:39:26 +08:00
hardware.h ARM: imx: add suspend in ocram support for i.mx6q 2014-03-05 10:35:10 +08:00
headsmp.S ARM: imx6: drop .text.head section annotation from headsmp.S 2014-03-05 10:48:26 +08:00
hotplug.c ARM: imx: do not return from imx_cpu_die() call 2013-10-21 09:37:31 +08:00
iim.h
imx25-dt.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
imx27-dt.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
imx31-dt.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
imx35-dt.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
imx51-dt.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
iomux-imx31.c
iomux-mx1.h
iomux-mx2x.h
iomux-mx3.h
iomux-mx21.h
iomux-mx25.h
iomux-mx27.h
iomux-mx35.h
iomux-mx51.h
iomux-v1.c
iomux-v1.h
iomux-v3.c
iomux-v3.h
irq-common.c ARM: imx: irq-common: Include header to avoid sparse warning 2013-06-17 15:45:14 +08:00
irq-common.h ARM: imx: drop support for irq priorisation 2013-12-09 13:18:25 +08:00
Kconfig ARM: SoC updates for 3.16 (part 1) 2014-06-02 16:15:12 -07:00
mach-apf9328.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-armadillo5x0.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-bug.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-cpuimx27.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-cpuimx35.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-eukrea_cpuimx25.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-imx6q.c ARM i.MX6q: Mark VPU and IPU AXI transfers as cacheable, increase IPU priority 2014-03-05 10:40:48 +08:00
mach-imx6sl.c ARM: imx: add suspend in ocram support for i.mx6q 2014-03-05 10:35:10 +08:00
mach-imx6sx.c ARM: imx: add basic imx6sx SoC support 2014-05-16 15:35:25 +08:00
mach-imx27_visstrim_m10.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-imx27ipcam.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-imx27lite.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-imx50.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-imx53.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-kzm_arm11_01.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-mx1ads.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-mx21ads.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-mx25_3ds.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-mx27_3ds.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-mx27ads.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-mx31_3ds.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-mx31ads.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-mx31lilly.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-mx31lite.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-mx31moboard.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-mx35_3ds.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-mxt_td60.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-pca100.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-pcm037.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-pcm037_eet.c
mach-pcm038.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-pcm043.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-qong.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-scb9328.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
mach-vf610.c ARM: l2c: imx vf610: convert to generic l2c OF initialisation 2014-05-30 00:49:28 +01:00
mach-vpr200.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
Makefile ARM: imx: add basic imx6sx SoC support 2014-05-16 15:35:25 +08:00
mm-imx1.c ARM: imx: move clk_prepare() out from mxc_restart() 2013-06-17 15:45:10 +08:00
mm-imx3.c Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2013-07-03 09:46:29 -07:00
mm-imx5.c ARM: imx: remove mxc_iomux_v3_init() call from imx53_init_early() 2013-12-09 13:18:24 +08:00
mm-imx21.c ARM: imx: move clk_prepare() out from mxc_restart() 2013-06-17 15:45:10 +08:00
mm-imx25.c ARM: i.MX: remove sdma script address arrays from platform data 2013-08-26 20:47:16 +05:30
mm-imx27.c ARM: imx: move clk_prepare() out from mxc_restart() 2013-06-17 15:45:10 +08:00
mmdc.c
mx1-camera-fiq-ksym.c
mx1-camera-fiq.S
mx1.h
mx2x.h
mx3x.h
mx21.h
mx25.h
mx27.h ARM: i.MX27: Typo fix 2013-07-15 08:28:07 +08:00
mx31.h
mx31lilly-db.c ARM: imx: remove IRQF_DISABLED 2013-10-21 09:11:05 +08:00
mx31lite-db.c
mx31moboard-devboard.c
mx31moboard-marxbot.c
mx31moboard-smartbot.c
mx35.h
mx51.h
mx53.h
mxc.h ARM: imx: add basic imx6sx SoC support 2014-05-16 15:35:25 +08:00
pcm037.h
pcm970-baseboard.c
platsmp.c ARM: clean up cache handling in platform code 2013-12-11 16:24:34 -08:00
pm-imx3.c
pm-imx5.c ARM: mx53: Allow suspend/resume 2013-08-22 23:20:45 +08:00
pm-imx6.c ARM: SoC specific changes 2014-04-05 14:19:54 -07:00
pm-imx27.c
src.c ARM: imx: remove imx_src_prepare_restart() call 2013-11-11 22:58:43 +08:00
ssi-fiq-ksym.c
ssi-fiq.S
suspend-imx6.S ARM: l2c: imx: convert to common l2c310 early resume functionality 2014-05-30 00:49:24 +01:00
system.c ARM: l2c: imx: remove direct write to power control register 2014-05-30 00:49:22 +01:00
time.c ARM: imx: factor device tree timer initialization 2014-04-30 13:40:28 +08:00
tzic.c ARM: i.MX: Setup IRQ handler from IRQ driver 2014-05-12 22:58:51 +08:00
ulpi.h ARM: imx: Remove mxc specific ulpi access ops 2013-06-17 15:45:16 +08:00