linux/arch/arm/plat-s5p
Arnd Bergmann 853a0231e0 Merge branch 'samsung/soc' into next/soc2
* samsung/soc:
  ARM: EXYNOS: fix cycle count for periodic mode of clock event timers
  ARM: EXYNOS: add support JPEG
  ARM: EXYNOS: Add DMC1, allow PPMU access for DMC
  ARM: SAMSUNG: Correct MIPI-CSIS io memory resource definition
  ARM: SAMSUNG: fix __init attribute on regarding s3c_set_platdata()
  ARM: SAMSUNG: Add __init attribute to samsung_bl_set()
  ARM: S5PV210: Add usb otg phy control
  ARM: S3C64XX: Add usb otg phy control
  ARM: EXYNOS: Enable l2 configuration through device tree
  ARM: EXYNOS: remove useless code to save/restore L2
  ARM: EXYNOS: save L2 settings during bootup
  ARM: S5P: add L2 early resume code
  ARM: EXYNOS: Add support AFTR mode on EXYNOS4210
  ARM: SAMSUNG: use spin_lock_irqsave() in clk_{enable,disable}
  ARM: S3C64XX: Define some additional always off clocks
  ARM: S3C64XX: Reduce residency requirement for cpuidle WFI mode
  ARM: SAMSUNG: Add a callback 'notify_after' for PWM backlight control
  ARM: SAMSUNG: add G2D to plat-s5p and mach-exynos
  ARM: S3C64XX: Gate some more clocks by default
  ARM: S3C64XX: Add basic cpuidle driver

Conflicts:
	arch/arm/mach-exynos/clock.c
	arch/arm/mach-exynos/common.c

This merges the earlier samsung support into the next/soc2 branch to
resolve conflicts between commits in the earlier work and the exynos5
branch.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-03-15 21:22:00 +00:00
..
Kconfig Merge branch 'samsung/soc' into next/soc2 2012-03-15 21:22:00 +00:00
Makefile ARM: EXYNOS: add support uart for EXYNOS4 and EXYNOS5 2012-03-14 02:13:05 -07:00
clock.c ARM: EXYNOS: add clock part for EXYNOS5250 SoC 2012-03-14 02:13:03 -07:00
dev-mfc.c ARM: S5P: To merge devs.c files to one devs.c 2011-10-06 11:15:09 +09:00
dev-uart.c ARM: SAMSUNG: Remove uart irq handling from plaform code 2011-08-23 10:48:31 -07:00
irq-eint.c ARM: SAMSUNG: use static declaration when it is not used in other files 2012-01-21 13:06:18 +09:00
irq-gpioint.c ARM: SAMSUNG: use static declaration when it is not used in other files 2012-01-21 13:06:18 +09:00
irq-pm.c ARM: EXYNOS: add interrupt definitions for EXYNOS5250 2012-03-14 02:35:04 -07:00
irq.c ARM: SAMSUNG: Remove uart irq handling from plaform code 2011-08-23 10:48:31 -07:00
pm.c ARM: S5P: Remove unused s3c_pm_check_resume_pin 2011-04-14 13:19:40 +09:00
s5p-time.c ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime 2011-12-18 23:00:26 +00:00
setup-mipiphy.c ARM: S5P: Add support for common MIPI CSIS/DSIM D-PHY control 2011-03-11 15:49:01 +09:00
sleep.S ARM: S5P: add L2 early resume code 2012-03-09 07:04:49 -08:00
sysmmu.c ARM: S5P: Fix export.h inclusion 2011-11-17 01:13:34 +09:00