2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 19:53:59 +08:00
linux-next/arch/arm/mach-exynos
Linus Torvalds 0e51793e16 Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM updates from Russell King:
 "This is the first chunk of ARM updates for this merge window.
  Conflicts are expected in two files - asm/timex.h and
  mach-integrator/integrator_cp.c.  Nothing particularly stands out more
  than anything else.

  Most of the growth is down to the opcodes stuff from Dave Martin,
  which is countered by Rob's patches to use more of the asm-generic
  headers on ARM."

(A few more conflicts grew since then, but it all looked fairly trivial)

* 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (44 commits)
  ARM: 7548/1: include linux/sched.h in syscall.h
  ARM: 7541/1: Add ARM ERRATA 775420 workaround
  ARM: ensure vm_struct has its phys_addr member filled in
  ARM: 7540/1: kexec: Check segment memory addresses
  ARM: 7539/1: kexec: scan for dtb magic in segments
  ARM: 7538/1: delay: add registration mechanism for delay timer sources
  ARM: 7536/1: smp: Formalize an IPI for wakeup
  ARM: 7525/1: ptrace: use updated syscall number for syscall auditing
  ARM: 7524/1: support syscall tracing
  ARM: 7519/1: integrator: convert platform devices to Device Tree
  ARM: 7518/1: integrator: convert AMBA devices to device tree
  ARM: 7517/1: integrator: initial device tree support
  ARM: 7516/1: plat-versatile: add DT support to FPGA IRQ
  ARM: 7515/1: integrator: check PL010 base address from resource
  ARM: 7514/1: integrator: call common init function from machine
  ARM: 7522/1: arch_timers: register a time/cycle counter
  ARM: 7523/1: arch_timers: enable the use of the virtual timer
  ARM: 7531/1: mark kernelmode mem{cpy,set} non-experimental
  ARM: 7520/1: Build dtb files in all target
  ARM: Fix build warning in arch/arm/mm/alignment.c
  ...
2012-10-07 21:20:57 +09:00
..
include/mach ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
clock-exynos4.c ARM: EXYNOS: Put PCM, Slimbus, Spdif clocks to off state 2012-09-21 11:06:00 +09:00
clock-exynos4.h ARM: EXYNOS: Move G2D clock entries to clock-exynos4210.c file 2012-07-17 07:52:03 +09:00
clock-exynos5.c Merge branch 'next/dt2' into HEAD 2012-10-01 14:37:01 -07:00
clock-exynos4210.c ARM: EXYNOS: Move G2D clock entries to clock-exynos4210.c file 2012-07-17 07:52:03 +09:00
clock-exynos4212.c ARM: EXYNOS: Add G2D related clock entries for SMDK4X12 2012-07-17 07:52:03 +09:00
common.c ARM: EXYNOS: skip wakeup interrupt setup if pinctrl driver is used 2012-09-07 06:07:40 +09:00
common.h ARM: SoC: convert Exynos4 to SMP operations 2012-09-14 11:14:50 +02:00
cpuidle.c Merge branch 'late/soc' into devel-late 2012-05-30 16:06:46 -07:00
dev-ahci.c ARM: EXYNOS: Use common macro to define resources on dev-ahci.c 2012-05-12 16:12:19 +09:00
dev-audio.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
dev-drm.c ARM: EXYNOS: add platform device for core DRM subsystem 2012-05-12 06:42:33 +09:00
dev-dwmci.c ARM: EXYNOS: Fix resource on dev-dwmci.c 2012-04-24 13:50:00 -07:00
dev-ohci.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
dev-sysmmu.c ARM: EXYNOS: Change System MMU platform device definitions 2012-04-04 09:23:02 -07:00
dev-uart.c ARM: EXYNOS: add support uart for EXYNOS4 and EXYNOS5 2012-03-14 02:13:05 -07:00
dma.c ARM: EXYNOS: Support DMA for EXYNOS5250 SoC 2012-05-13 08:20:04 +09:00
headsmp.S ARM: exynos: remove incorrect BSYM usage 2012-01-16 08:36:04 -06:00
hotplug.c ARM: consolidate pen_release instead of having per platform definitions 2012-09-14 11:15:01 +02:00
Kconfig Merge branch 'next/boards' into HEAD 2012-10-01 14:34:39 -07:00
mach-armlex4210.c ARM: SoC: convert Exynos4 to SMP operations 2012-09-14 11:14:50 +02:00
mach-exynos4-dt.c ARM: EXYNOS: Add OF compatibility lookups for EXYNOS4 i2c adapters 2012-09-21 10:47:24 +09:00
mach-exynos5-dt.c ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
mach-nuri.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
mach-origen.c ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
mach-smdk4x12.c ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
mach-smdkv310.c ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
mach-universal_c210.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
Makefile ARM: EXYNOS: Add PMU table for EXYNOS5250 2012-05-20 03:13:17 +09:00
Makefile.boot ARM: dts: Add basic dts file for Samsung Trats board 2012-09-21 10:50:27 +09:00
mct.c ARM: EXYNOS: Redefine IRQ_MCT_L0,1 definition 2012-05-15 16:59:33 +09:00
platsmp.c Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2012-10-07 21:20:57 +09:00
pm_domains.c ARM: exynos: exynos_pm_add_dev_to_genpd may be unused 2012-08-10 12:27:34 +02:00
pm.c ARM: EXYNOS: Support suspend and resume for EXYNOS5250 2012-05-20 03:14:36 +09:00
pmu.c ARM: EXYNOS: Add missing static storage class specifier in pmu.c file 2012-07-13 06:46:08 +09:00
setup-fimc.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-fimd0.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-i2c0.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-i2c1.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-i2c2.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-i2c3.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-i2c4.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-i2c5.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-i2c6.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-i2c7.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-keypad.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-sdhci-gpio.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-spi.c ARM: SAMSUNG: Remove pdev pointer parameter from spi gpio setup functions 2012-07-13 15:23:46 +09:00
setup-usb-phy.c ARM: EXYNOS: Update HSOTG PHY clock setting for EXYNOS4X12 2012-07-13 06:45:55 +09:00