2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 18:23:53 +08:00
linux-next/arch/arm/mach-imx
Linus Torvalds fb2af0020a Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM updates from Russell King:
 "This contains the usual updates from other people (listed below) and
  the usual random muddle of miscellaneous ARM updates which cover some
  low priority bug fixes and performance improvements.

  I've started to put the pull request wording into the merge commits,
  which are:

   - NoMMU stuff:

     This includes the following series sent earlier to the list:
      - nommu-fixes
      - R7 Support
      - MPU support

     I've left out the ARCH_MULTIPLATFORM/!MMU stuff that Arnd and I
     were discussing today until we've reached a conclusion/that's had
     some more review.

     This is rebased (and re-tested) on your devel-stable branch because
     otherwise there were going to be conflicts with Uwe's V7M work now
     that you've merged that.  I've included the fix for limiting MPU to
     CPU_V7.

   - Huge page support

     These changes bring both HugeTLB support and Transparent HugePage
     (THP) support to ARM.  Only long descriptors (LPAE) are supported
     in this series.

     The code has been tested on an Arndale board (Exynos 5250).

   - LPAE updates

     Please pull these miscellaneous LPAE fixes I've been collecting for
     a while now for 3.11.  They've been tested and reviewed by quite a
     few people, and most of the patches are pretty trivial.  -- Will Deacon.

   - arch_timer cleanups

     Please pull these arch_timer cleanups I've been holding onto for a
     while.  They're the same as my last posting, but have been rebased
     to v3.10-rc3.

   - mpidr linearisation (multiprocessor id register - identifies which
     CPU number we are in the system)

     This patch series that implements MPIDR linearization through a
     simple hashing algorithm and updates current cpu_{suspend}/{resume}
     code to use the newly created hash structures to retrieve context
     pointers.  It represents a stepping stone for the implementation of
     power management code on forthcoming multi-cluster ARM systems.

     It has been tested on TC2 (dual cluster A15xA7 system), iMX6q,
     OMAP4 and Tegra, with processors hitting low-power states requiring
     warm-boot resume through the cpu_resume code path"

* 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (77 commits)
  ARM: 7775/1: mm: Remove do_sect_fault from LPAE code
  ARM: 7777/1: Avoid extra calls to the C compiler
  ARM: 7774/1: Fix dtb dependency to use order-only prerequisites
  ARM: 7770/1: remove residual ARMv2 support from decompressor
  ARM: 7769/1: Cortex-A15: fix erratum 798181 implementation
  ARM: 7768/1: prevent risks of out-of-bound access in ASID allocator
  ARM: 7767/1: let the ASID allocator handle suspended animation
  ARM: 7766/1: versatile: don't mark pen as __INIT
  ARM: 7765/1: perf: Record the user-mode PC in the call chain.
  ARM: 7735/2: Preserve the user r/w register TPIDRURW on context switch and fork
  ARM: kernel: implement stack pointer save array through MPIDR hashing
  ARM: kernel: build MPIDR hash function data structure
  ARM: mpu: Ensure that MPU depends on CPU_V7
  ARM: mpu: protect the vectors page with an MPU region
  ARM: mpu: Allow enabling of the MPU via kconfig
  ARM: 7758/1: introduce config HAS_BANDGAP
  ARM: 7757/1: mm: don't flush icache in switch_mm with hardware broadcasting
  ARM: 7751/1: zImage: don't overwrite ourself with a page table
  ARM: 7749/1: spinlock: retry trylock operation if strex fails on free lock
  ARM: 7748/1: oabi: handle faults when loading swi instruction from userspace
  ...
2013-07-03 09:46:29 -07:00
..
devices Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2013-05-03 09:13:19 -07:00
3ds_debugboard.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
3ds_debugboard.h ARM: imx: include board headers in the same folder 2012-10-15 09:18:14 +08:00
anatop.c ARM: imx: do not use regmap_read for ANADIG_DIGPROG 2013-04-12 19:28:13 +08:00
avic.c ARM: arm-soc cleanup for 3.10 2013-05-02 09:03:55 -07:00
board-mx31lilly.h ARM: imx: include board headers in the same folder 2012-10-15 09:18:14 +08:00
board-mx31lite.h ARM: imx: include board headers in the same folder 2012-10-15 09:18:14 +08:00
board-mx31moboard.h ARM: imx: include board headers in the same folder 2012-10-15 09:18:14 +08:00
board-pcm038.h ARM: imx: include board headers in the same folder 2012-10-15 09:18:14 +08:00
clk-busy.c ARM: arm-soc non-critical fixes for 3.10 2013-05-02 08:56:55 -07:00
clk-gate2.c ARM: mach-imx: clk-gate2: Include "clk.h" 2013-04-01 16:17:50 +08:00
clk-imx1.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
clk-imx6q.c ARM: clk-imx6qdl: Add clko1 configuration for imx6qdl-sabresd 2013-06-17 15:45:16 +08:00
clk-imx6sl.c ARM: imx6: use common of_clk_init() call to initialize clocks 2013-06-17 15:45:14 +08:00
clk-imx21.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
clk-imx25.c ARM: i.MX25: clk: parent per5_clk to AHB clock 2013-02-05 10:54:35 +01:00
clk-imx27.c ARM: imx27 DT init cpufreq-cpu0 device 2013-04-09 22:52:56 +08:00
clk-imx31.c Linux 3.8-rc6 2013-02-04 22:56:41 -08:00
clk-imx35.c ARM: imx35 Bugfix admux clock 2013-04-09 19:46:30 +08:00
clk-imx51-imx53.c ARM: imx: move imx53-qsb audio codec clk lookup into DT 2013-06-17 16:04:15 +08:00
clk-pfd.c ARM: imx: add common clock support for pfd 2012-05-02 12:08:20 +02:00
clk-pllv1.c ARM: mach-imx: clk-pllv1: Staticize clk_pllv1_ops 2013-04-01 16:17:49 +08:00
clk-pllv2.c ARM: mach-imx: clk-pllv2: Staticize clk_pllv2_ops 2013-04-01 16:17:50 +08:00
clk-pllv3.c ARM: imx: remove MLB PLL from pllv3 2013-06-17 15:45:12 +08:00
clk-vf610.c ARM: imx: add VF610 clock support 2013-06-17 15:45:15 +08:00
clk.c ARM: imx: clk: No need to initialize phandle struct 2013-06-17 15:45:15 +08:00
clk.h ARM: imx: remove MLB PLL from pllv3 2013-06-17 15:45:12 +08:00
common.h ARM: imx6: use common of_clk_init() call to initialize clocks 2013-06-17 15:45:14 +08:00
cpu-imx5.c ARM: mach-imx: cpu-imx5: Include "common.h" 2013-04-01 16:17:49 +08:00
cpu-imx25.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
cpu-imx27.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
cpu-imx31.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
cpu-imx35.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
cpu.c ARM: mach-imx: cpu: Include "common.h" 2013-04-01 16:17:48 +08:00
cpuidle-imx5.c ARM: imx: cpuidle: use init/exit common routine 2013-04-23 13:45:23 +02:00
cpuidle-imx6q.c ARM: imx: cpuidle: use init/exit common routine 2013-04-23 13:45:23 +02:00
cpuidle.h ARM: imx: cpuidle: use init/exit common routine 2013-04-23 13:45:23 +02:00
crm-regs-imx5.h ARM i.MX53: Fix PLL4 base address 2012-06-04 15:23:57 +02:00
crmregs-imx3.h ARM i.MX3: Make ccm base address a variable 2012-04-25 17:03:45 +02:00
devices-imx1.h ARM: imx: move platform device code into mach-imx 2012-10-15 09:18:15 +08:00
devices-imx21.h ARM: imx: move platform device code into mach-imx 2012-10-15 09:18:15 +08:00
devices-imx25.h ARM: imx: move platform device code into mach-imx 2012-10-15 09:18:15 +08:00
devices-imx27.h ARM : i.MX27 : split code for allocation of ressources of camera and eMMA 2012-11-16 16:21:48 +01:00
devices-imx31.h ARM: imx: move platform device code into mach-imx 2012-10-15 09:18:15 +08:00
devices-imx35.h ARM: imx: move platform device code into mach-imx 2012-10-15 09:18:15 +08:00
devices-imx51.h ARM: imx: move platform device code into mach-imx 2012-10-15 09:18:15 +08:00
ehci-imx5.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
ehci-imx25.c Merge branch 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc 2012-11-30 09:27:57 -08:00
ehci-imx27.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
ehci-imx31.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
ehci-imx35.c Merge branch 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc 2012-11-30 09:27:57 -08:00
epit.c ARM: use clockevents_config_and_register() where possible 2013-01-14 10:12:42 -08:00
eukrea_mbimx27-baseboard.c ARM: cpuimx27 and mbimx27: prepend CONFIG_ to Kconfig macro 2013-04-03 16:50:54 +08:00
eukrea_mbimxsd25-baseboard.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
eukrea_mbimxsd35-baseboard.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
eukrea_mbimxsd51-baseboard.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
eukrea-baseboards.h ARM: imx: include board headers in the same folder 2012-10-15 09:18:14 +08:00
gpc.c ARM: arm-soc platform updates for 3.10, part 3 2013-05-07 11:02:18 -07:00
hardware.h ARM: imx: include <asm/io.h> in hardware.h 2013-06-17 15:45:10 +08:00
headsmp.S ARM: imx: replicate the diagnostic register of boot cpu into secondary cores 2013-05-12 21:39:18 +08:00
hotplug.c ARM: imx: compile fix for hotplug.c 2013-05-09 13:05:22 -07:00
iim.h ARM: imx: include iim.h rather than mach/iim.h 2012-10-15 10:03:10 +08:00
imx25-dt.c ARM: imx: create mxc_arch_reset_init_dt() for DT boot 2013-06-17 15:45:10 +08:00
imx27-dt.c ARM: imx: create mxc_arch_reset_init_dt() for DT boot 2013-06-17 15:45:10 +08:00
imx31-dt.c ARM: imx: create mxc_arch_reset_init_dt() for DT boot 2013-06-17 15:45:10 +08:00
imx51-dt.c ARM: imx: create mxc_arch_reset_init_dt() for DT boot 2013-06-17 15:45:10 +08:00
iomux-imx31.c ARM: mach-imx: iomux-imx31: Staticize mxc_pin_alloc_map 2013-04-01 16:17:48 +08:00
iomux-mx1.h ARM: imx: move iomux drivers and headers into mach-imx 2012-10-15 09:18:14 +08:00
iomux-mx2x.h ARM: imx: move iomux drivers and headers into mach-imx 2012-10-15 09:18:14 +08:00
iomux-mx3.h ARM: imx: move iomux drivers and headers into mach-imx 2012-10-15 09:18:14 +08:00
iomux-mx21.h ARM: imx: move iomux drivers and headers into mach-imx 2012-10-15 09:18:14 +08:00
iomux-mx25.h ARM: imx: move iomux drivers and headers into mach-imx 2012-10-15 09:18:14 +08:00
iomux-mx27.h ARM: imx: move iomux drivers and headers into mach-imx 2012-10-15 09:18:14 +08:00
iomux-mx35.h ARM: imx: move iomux drivers and headers into mach-imx 2012-10-15 09:18:14 +08:00
iomux-mx51.h ARM: imx: move iomux drivers and headers into mach-imx 2012-10-15 09:18:14 +08:00
iomux-v1.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
iomux-v1.h ARM: imx: move iomux drivers and headers into mach-imx 2012-10-15 09:18:14 +08:00
iomux-v3.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
iomux-v3.h ARM: imx: move iomux drivers and headers into mach-imx 2012-10-15 09:18:14 +08:00
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: remove header file mach/irqs.h 2012-10-15 10:05:43 +08:00
Kconfig ARM: imx: select syscon for IMX6SL 2013-06-24 16:14:40 +02:00
mach-apf9328.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-armadillo5x0.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-bug.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-cpuimx27.c ARM: cpuimx27 and mbimx27: prepend CONFIG_ to Kconfig macro 2013-04-03 16:50:54 +08:00
mach-cpuimx35.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-cpuimx51sd.c ARM: imx: Remove cpufreq driver 2013-04-01 16:17:34 +08:00
mach-eukrea_cpuimx25.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-imx6q.c ARM: clk-imx6qdl: Add clko1 configuration for imx6qdl-sabresd 2013-06-17 15:45:16 +08:00
mach-imx6sl.c ARM: imx6: use common of_clk_init() call to initialize clocks 2013-06-17 15:45:14 +08:00
mach-imx27_visstrim_m10.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-imx27ipcam.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-imx27lite.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-imx53.c ARM: imx: move imx53-qsb audio codec clk lookup into DT 2013-06-17 16:04:15 +08:00
mach-kzm_arm11_01.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mx1ads.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mx21ads.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mx25_3ds.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mx27_3ds.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mx27ads.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mx31_3ds.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mx31ads.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mx31lilly.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mx31lite.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mx31moboard.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mx35_3ds.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-mx51_babbage.c ARM: imx: Remove cpufreq driver 2013-04-01 16:17:34 +08:00
mach-mxt_td60.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-pca100.c ARM: imx: Remove mxc specific ulpi access ops 2013-06-17 15:45:16 +08:00
mach-pcm037_eet.c ARM: imx: include common.h rather than mach/common.h 2012-10-15 10:03:10 +08:00
mach-pcm037.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-pcm038.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-pcm043.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-qong.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-scb9328.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
mach-vf610.c ARM: imx: add initial support for VF610 2013-06-17 15:45:16 +08:00
mach-vpr200.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
Makefile ARM: imx: Remove mxc specific ulpi access ops 2013-06-17 15:45:16 +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: move clk_prepare() out from mxc_restart() 2013-06-17 15:45:10 +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: imx: move clk_prepare() out from mxc_restart() 2013-06-17 15:45:10 +08:00
mm-imx27.c ARM: imx: move clk_prepare() out from mxc_restart() 2013-06-17 15:45:10 +08:00
mmdc.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
mx1-camera-fiq-ksym.c ARM: imx: move platform_data definitions 2012-09-14 11:17:21 +02:00
mx1-camera-fiq.S ARM: imx: move mx1 support to mach-imx 2010-06-30 08:59:44 +02:00
mx1.h ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx2x.h ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx3x.h ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx21.h ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx25.h ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx27.h ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx31.h ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx31lilly-db.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx31lite-db.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx31moboard-devboard.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx31moboard-marxbot.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx31moboard-smartbot.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx35.h ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx51.h ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mx53.h ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
mxc.h ARM: imx: add initial imx6dl support 2013-04-12 19:28:15 +08:00
pcm037.h ARM: imx: use machine specific hook for late init 2012-05-08 20:36:16 +08:00
pcm970-baseboard.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
platsmp.c ARM: imx: replicate the diagnostic register of boot cpu into secondary cores 2013-05-12 21:39:18 +08:00
pm-imx3.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
pm-imx5.c ARM: imx: cpuidle: use init/exit common routine 2013-04-23 13:45:23 +02:00
pm-imx6q.c ARM: imx: enable anatop suspend/resume 2013-04-12 19:01:42 +08:00
pm-imx27.c ARM: imx: include hardware.h rather than mach/hardware.h 2012-10-15 10:05:43 +08:00
src.c ARM: arm-soc platform updates for 3.10, part 3 2013-05-07 11:02:18 -07:00
ssi-fiq-ksym.c ARM: imx: merge plat-mxc into mach-imx 2012-10-15 10:02:19 +08:00
ssi-fiq.S ARM: imx: merge plat-mxc into mach-imx 2012-10-15 10:02:19 +08:00
system.c ARM: imx: create mxc_arch_reset_init_dt() for DT boot 2013-06-17 15:45:10 +08:00
time.c imx6q cpuidle support for 3.9 2013-02-04 22:24:20 -08:00
tzic.c ARM: mach-imx: tzic: Staticize *tzic_base 2013-04-01 16:17:51 +08:00
ulpi.h ARM: imx: Remove mxc specific ulpi access ops 2013-06-17 15:45:16 +08:00