Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-18 10:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
4f8a428dac
linux/arch/arm/mach-imx
History
Linus Torvalds deb9b4ce97 Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm 
* 'fixes' of git://git.linaro.org/people/rmk/linux-arm: (31 commits)
  ARM: 7304/1: ioremap: fix boundary check when reusing static mapping
  ARM: 7301/1: Rename the T() macro to TUSER() to avoid namespace conflicts
  ARM: 7299/1: ftrace: clear zero bit in reported IPs for Thumb-2
  ARM: 7298/1: realview: fix mapping of MPCore private memory region
  PCMCIA: fix sa1111 oops on remove
  ARM: 7288/1: mach-sa1100: add missing module_init() call
  ARM: 7297/1: smp_twd: make sure timer is stopped before registering it
  ARM: 7296/1: proc-v7.S: remove HARVARD_CACHE preprocessor guards
  ARM: 7295/1: cortex-a7: move proc_info out of !CONFIG_ARM_LPAE block
  ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP
  ARM: 7291/1: cache: assume 64-byte L1 cachelines for ARMv7 CPUs
  ARM: 7290/1: vmlinux.lds.S: align the exception fixup table to a 4-byte boundary
  ARM: 7289/1: vmlinux.lds.S: do not hardcode cacheline size as 32 bytes
  MFD: ucb1x00-ts: fix resume failure
  MFD: ucb1x00-core: fix gpiolib direction_output handling
  MFD: ucb1x00-core: fix missing restore of io output data on resume
  MFD: mcp-core: fix mcp_priv() to be more type safe
  MFD: mcp-core: fix complaints from the genirq layer
  Revert "ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus."
  Revert "ARM: sa1100: Refactor mcp-sa11x0 to use platform resources."
  ...

Fix up conflict due to arch/arm/mach-mx5/Kconfig having been merged into
mach-imx5 (commit 784a90c0a7: "ARM i.MX: Merge i.MX5 support into
mach-imx"), but the ARM_L1_CACHE_SHIFT_6 entry was moved to be driven by
the CPU_V7 logic from it in the old location in rmk's branch (commit
a092f2b153: "ARM: 7291/1: cache: assume 64-byte L1 cachelines for
ARMv7 CPUs").
2012-01-28 13:27:10 -08:00
..
include/mach dmaengine: Add Freescale i.MX SDMA support 2010-10-05 15:49:26 -07:00
clock-imx1.c serial/imx: get rid of the uses of cpu_is_mx1() 2011-07-27 09:30:38 +08:00
clock-imx6q.c ARM: imx6: add missing twd_clk for imx6q clock 2012-01-20 10:16:39 +08:00
clock-imx21.c serial/imx: get rid of the uses of cpu_is_mx1() 2011-07-27 09:30:38 +08:00
clock-imx25.c ARM: mx25: Print silicon revision on boot 2011-08-26 08:50:58 +02:00
clock-imx27.c Merge branches 'features/assorted', 'features/imx-cpurev', 'features/imx-pata', 'features/multisoc' and 'features/mxs' into imx-features-for-arnd 2011-08-26 10:10:12 +02:00
clock-imx31.c Merge branches 'features/assorted', 'features/imx-cpurev', 'features/imx-pata', 'features/multisoc' and 'features/mxs' into imx-features-for-arnd 2011-08-26 10:10:12 +02:00
clock-imx35.c clock-imx35: fix reboot in internal boot mode 2011-12-19 12:26:08 +01:00
clock-mx51-mx53.c Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00
cpu_op-mx51.c ARM i.MX: Merge i.MX5 support into mach-imx 2011-11-16 08:37:37 +01:00
cpu_op-mx51.h ARM i.MX: Merge i.MX5 support into mach-imx 2011-11-16 08:37:37 +01:00
cpu-imx5.c Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00
cpu-imx25.c ARM: mx25: Print silicon revision on boot 2011-08-26 08:50:58 +02:00
cpu-imx27.c ARM: mx27: Print silicon revision on boot 2011-08-26 08:50:58 +02:00
cpu-imx31.c ARM: mx31: use generic function for displaying silicon revision 2011-08-26 08:50:59 +02:00
cpu-imx35.c ARM: mx35: use generic function for displaying silicon revision 2011-08-26 08:50:59 +02:00
crm-regs-imx5.h ARM i.MX: Merge i.MX5 support into mach-imx 2011-11-16 08:37:37 +01:00
crmregs-imx31.h ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
devices-imx1.h ARM: imx: clean up the section marks of extern data 2011-05-19 13:11:11 +02:00
devices-imx21.h ARM: imx: clean up the section marks of extern data 2011-05-19 13:11:11 +02:00
devices-imx25.h ARM: imx: clean up the section marks of extern data 2011-05-19 13:11:11 +02:00
devices-imx27.h ARM: imx: Define functions for registering PATA 2011-08-24 18:13:34 +02:00
devices-imx31.h ARM: imx: Define functions for registering PATA 2011-08-24 18:13:34 +02:00
devices-imx35.h ARM: imx: Define functions for registering PATA 2011-08-24 18:13:34 +02:00
devices-imx50.h ARM i.MX: Merge i.MX5 support into mach-imx 2011-11-16 08:37:37 +01:00
devices-imx51.h ARM i.MX: Merge i.MX5 support into mach-imx 2011-11-16 08:37:37 +01:00
devices-imx53.h ARM i.MX: Merge i.MX5 support into mach-imx 2011-11-16 08:37:37 +01:00
dma-v1.c Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-25 12:38:42 -07:00
efika.h ARM i.MX: Merge i.MX5 support into mach-imx 2011-11-16 08:37:37 +01:00
ehci-imx5.c ARM i.MX: Merge i.MX5 support into mach-imx 2011-11-16 08:37:37 +01:00
ehci-imx25.c ARM i.MX ehci: factor out soc specific functions 2011-02-11 08:34:17 +01:00
ehci-imx27.c ARM i.MX ehci: factor out soc specific functions 2011-02-11 08:34:17 +01:00
ehci-imx31.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
ehci-imx35.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
eukrea_mbimx27-baseboard.c ARM: imx: convert to new leds-gpio registration helper 2011-07-07 09:59:57 +02:00
eukrea_mbimx51-baseboard.c ARM i.MX: Merge i.MX5 support into mach-imx 2011-11-16 08:37:37 +01:00
eukrea_mbimxsd25-baseboard.c mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5 2011-07-27 09:31:14 +08:00
eukrea_mbimxsd35-baseboard.c mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5 2011-07-27 09:31:14 +08:00
eukrea_mbimxsd-baseboard.c ARM i.MX: Merge i.MX5 support into mach-imx 2011-11-16 08:37:37 +01:00
gpc.c arm/imx6q: add core drivers clock, gpc, mmdc and src 2011-10-31 14:26:23 +01:00
head-v7.S Merge branch 'imx/pm2' of git://git.linaro.org/people/shawnguo/linux-2.6 into imx6/pm 2012-01-06 12:44:05 -08:00
hotplug.c arm/imx6q: add smp and cpu hotplug support 2011-10-31 14:26:24 +01:00
imx51-dt.c Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00
imx53-dt.c Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00
iomux-imx31.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
Kconfig Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm 2012-01-28 13:27:10 -08:00
lluart.c arm/imx6q: add core definitions and low-level debug uart 2011-10-31 14:26:21 +01:00
localtimer.c arm/imx6q: add smp and cpu hotplug support 2011-10-31 14:26:24 +01:00
mach-apf9328.c Merge branch 'samsung/cleanup' into next/boards 2012-01-09 17:06:36 +00:00
mach-armadillo5x0.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-bug.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-cpuimx27.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-cpuimx35.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-cpuimx51.c Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00
mach-cpuimx51sd.c Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00
mach-eukrea_cpuimx25.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-imx6q.c Merge branch 'samsung/cleanup' into next/boards 2012-01-09 17:06:36 +00:00
mach-imx27_visstrim_m10.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-imx27ipcam.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-imx27lite.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-kzm_arm11_01.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-mx1ads.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-mx21ads.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-mx25_3ds.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-mx27_3ds.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-mx27ads.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-mx31_3ds.c ARM: Add arm_memblock_steal() to allocate memory away from the kernel 2012-01-13 15:02:35 +00:00
mach-mx31ads.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-mx31lilly.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-mx31lite.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-mx31moboard.c ARM: Add arm_memblock_steal() to allocate memory away from the kernel 2012-01-13 15:02:35 +00:00
mach-mx35_3ds.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-mx50_rdp.c Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00
mach-mx51_3ds.c Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00
mach-mx51_babbage.c Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00
mach-mx51_efikamx.c Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00
mach-mx51_efikasb.c Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00
mach-mx53_ard.c arm-soc fixes for 3.3-rc: 2012-01-28 13:21:54 -08:00
mach-mx53_evk.c Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00
mach-mx53_loco.c Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00
mach-mx53_smd.c Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00
mach-mxt_td60.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-pca100.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-pcm037_eet.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
mach-pcm037.c ARM: Add arm_memblock_steal() to allocate memory away from the kernel 2012-01-13 15:02:35 +00:00
mach-pcm038.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-pcm043.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-qong.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-scb9328.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
mach-vpr200.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
Makefile Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00
Makefile.boot Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00
mm-imx1.c gpio/mxc: get rid of the uses of cpu_is_mx() 2011-07-08 12:38:12 -06:00
mm-imx3.c Merge branch 'cleanups/assorted' into imx-fixes-for-arnd 2011-11-22 11:32:39 +01:00
mm-imx5.c Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00
mm-imx21.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
mm-imx25.c dmaengine: imx-sdma: use platform_device_id to identify sdma version 2011-07-27 09:31:45 +08:00
mm-imx27.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
mmdc.c arm/imx6q: add core drivers clock, gpc, mmdc and src 2011-10-31 14:26:23 +01:00
mx1-camera-fiq-ksym.c
mx1-camera-fiq.S
mx31lilly-db.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
mx31lite-db.c ARM: imx: convert to new leds-gpio registration helper 2011-07-07 09:59:57 +02:00
mx31moboard-devboard.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
mx31moboard-marxbot.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
mx31moboard-smartbot.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
mx51_efika.c ARM i.MX: Merge i.MX5 support into mach-imx 2011-11-16 08:37:37 +01:00
pcm037.h ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
pcm970-baseboard.c ARM: imx: remove now empty devices.h 2010-11-17 10:01:34 +01:00
platsmp.c arm/imx6q: add smp and cpu hotplug support 2011-10-31 14:26:24 +01:00
pm-imx5.c Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. 2012-01-23 14:50:30 -08:00
pm-imx6q.c ARM: imx6q: resume PL310 only when CACHE_L2X0 defined 2011-12-26 10:18:59 +08:00
pm-imx27.c arm/imx: explicitly includes mach/hardware.h in pm-imx27.c 2011-10-17 21:41:03 +02:00
src.c ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00