kernel-ark/arch/arm/mach-exynos
Arnd Bergmann 241a987126 Merge branch 'exynos/pwm-clocksource' into late/multiplatform
This series from Tomasz Figa restores support for the pwm clocksource
in Exynos, which was broken during the conversion of the platform
to the common clk framework. The clocksource is only used in one
board in the mainline kernel (universal_c210), and this makes it
work for DT based probing as well as restoring the non-DT based
case.

* exynos/pwm-clocksource:
  ARM: dts: exynops4210: really add universal_c210 dts
  ARM: dts: exynos4210: Add basic dts file for universal_c210 board
  ARM: dts: exynos4: Add node for PWM device
  ARM: SAMSUNG: Do not register legacy timer interrupts on Exynos
  clocksource: samsung_pwm_timer: Work around rounding errors in clockevents core
  clocksource: samsung_pwm_timer: Correct programming of clock events
  clocksource: samsung_pwm_timer: Use proper clockevents max_delta
  clocksource: samsung_pwm_timer: Add support for non-DT platforms
  clocksource: samsung_pwm_timer: Drop unused samsung_pwm struct
  clocksource: samsung_pwm_timer: Keep all driver data in a structure
  clocksource: samsung_pwm_timer: Make PWM spinlock global
  clocksource: samsung_pwm_timer: Let platforms select the driver
  Documentation: Add device tree bindings for Samsung PWM timers
  clocksource: add samsung pwm timer driver

Conflicts:
	arch/arm/boot/dts/Makefile
	arch/arm/mach-exynos/common.c
	drivers/clocksource/Kconfig
	drivers/clocksource/Makefile

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2013-05-06 23:49:09 +02:00
..
include/mach ARM: exynos: restore mach/regs-clock.h for exynos5 2013-04-19 23:11:28 +02:00
common.c Merge branch 'exynos/pwm-clocksource' into late/multiplatform 2013-05-06 23:49:09 +02:00
common.h irqchip: exynos: pass irq_base from platform 2013-04-19 23:00:43 +02:00
cpuidle.c ARM: EXYNOS: move mach/pmu.h file into common.h 2013-01-10 10:45:17 -08:00
dev-ahci.c
dev-audio.c ARM: SAMSUNG: cleanup mach/regs-audss.h file 2013-01-10 10:45:18 -08:00
dev-ohci.c ARM: EXYNOS: reorder inclusions of <linux/platform_data/xxx.h> 2012-11-07 08:11:30 +09:00
dev-uart.c ARM: exynos: prepare for sparse IRQ 2013-04-19 13:51:20 +02:00
dma.c ARM: EXYNOS: PL330 MDMA1 fix for revision 0 of Exynos4210 SOC 2012-11-20 20:39:39 +09:00
headsmp.S
hotplug.c ARM: EXYNOS: fix the hotplug for Cortex-A15 2012-11-28 07:42:04 +09:00
Kconfig Merge branch 'samsung/exynos-multiplatform' into next/drivers 2013-04-19 16:50:56 +02:00
mach-armlex4210.c Merge branch 'samsung/exynos-multiplatform' into next/drivers 2013-04-19 16:50:56 +02:00
mach-exynos4-dt.c ARM: EXYNOS: remove auxdata table from exynos4/5 dt machine file 2013-03-25 18:17:13 +09:00
mach-exynos5-dt.c ARM: EXYNOS: remove auxdata table from exynos4/5 dt machine file 2013-03-25 18:17:13 +09:00
mach-nuri.c Merge branch 'samsung/exynos-multiplatform' into next/drivers 2013-04-19 16:50:56 +02:00
mach-origen.c Merge branch 'samsung/exynos-multiplatform' into next/drivers 2013-04-19 16:50:56 +02:00
mach-smdk4x12.c Merge branch 'samsung/exynos-multiplatform' into next/drivers 2013-04-19 16:50:56 +02:00
mach-smdkv310.c Merge branch 'samsung/exynos-multiplatform' into next/drivers 2013-04-19 16:50:56 +02:00
mach-universal_c210.c ARM: EXYNOS: allow legacy board support to specify xxti and xusbxti clock speed 2013-03-25 18:17:13 +09:00
Makefile Merge branch 'samsung/exynos-multiplatform' into next/drivers 2013-04-19 16:50:56 +02:00
Makefile.boot ARM: dts: Add basic dts file for Samsung Trats board 2012-09-21 10:50:27 +09:00
platsmp.c irqchip: Move ARM gic.h to include/linux/irqchip/arm-gic.h 2013-01-12 10:47:32 -06:00
pm_domains.c ARM: EXYNOS: Bind devices to power domains using DT 2012-11-22 00:38:59 +09:00
pm.c arm-soc: cleanups 2013-02-21 14:58:40 -08:00
pmu.c ARM: EXYNOS: move mach/pmu.h file into common.h 2013-01-10 10:45:17 -08:00
setup-fimc.c
setup-fimd0.c include/video: move fimd register headers from platform to include/video 2012-08-08 09:44:49 +09:00
setup-i2c0.c ARM: EXYNOS: add support for EXYNOS5440 SoC 2012-11-22 13:09:18 +09: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
setup-sdhci-gpio.c mmc: sdhci-s3c: remove platform dependencies 2013-04-19 13:51:23 +02: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