davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
241a987126
kernel-ark/drivers/clocksource
History
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
..
acpi_pm.c Drivers: clocksource: remove __dev* attributes. 2013-01-03 15:57:15 -08:00
arm_arch_timer.c ARM: arch_timers: switch to physical timers if HYP mode is available 2013-01-31 15:52:00 +00:00
bcm2835_timer.c clocksource: pass DT node pointer to init functions 2013-03-11 08:42:07 -05:00
cadence_ttc_timer.c arm: zynq: Move timer to generic location 2013-04-04 09:22:09 +02:00
clksrc-dbx500-prcmu.c clocksource: dbx500: convert to clocksource_register_hz() 2012-02-01 18:37:37 -08:00
clksrc-of.c clocksource: make CLOCKSOURCE_OF_DECLARE type safe 2013-03-28 12:01:06 +01:00
cs5535-clockevt.c clocksource: use clockevents_config_and_register() where possible 2013-01-14 10:12:42 -08:00
cyclone.c clocksource: cyclone: Add missing iounmap 2012-01-26 19:30:40 -08:00
dw_apb_timer_of.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
dw_apb_timer.c dw_apb_timer: constify clocksource name 2011-10-04 13:08:18 -07:00
em_sti.c clocksource: em_sti: Set initcall level to subsys 2013-03-13 02:24:36 +09:00
exynos_mct.c clocksource: exynos_mct: remove platform header dependency 2013-04-19 23:00:38 +02:00
i8253.c time: Kill xtime_lock, replacing it with jiffies_lock 2012-11-13 14:08:23 -05:00
Kconfig Merge branch 'exynos/pwm-clocksource' into late/multiplatform 2013-05-06 23:49:09 +02:00
Makefile Merge branch 'exynos/pwm-clocksource' into late/multiplatform 2013-05-06 23:49:09 +02:00
metag_generic.c metag: Time keeping 2013-03-02 20:09:22 +00:00
mmio.c clocksource: add common mmio clocksource 2011-05-23 18:04:51 +01:00
nomadik-mtu.c Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2013-02-26 19:43:20 -08:00
samsung_pwm_timer.c clocksource: samsung_pwm_timer: Work around rounding errors in clockevents core 2013-04-28 12:17:05 -07:00
scx200_hrt.c clocksource: scx200_hrt: Fix the build 2012-02-22 13:25:16 +01:00
sh_cmt.c clocksource: sh_cmt: Set initcall level to subsys 2013-03-13 02:24:36 +09:00
sh_mtu2.c clocksource: sh_mtu2: Set initcall level to subsys 2013-03-13 02:24:37 +09:00
sh_tmu.c clocksource: sh_tmu: Set initcall level to subsys 2013-03-13 02:24:36 +09:00
sunxi_timer.c clk: arm: sunxi: Add a new clock driver for sunxi SOCs 2013-03-27 08:35:34 -07:00
tcb_clksrc.c clocksource: use clockevents_config_and_register() where possible 2013-01-14 10:12:42 -08:00
tegra20_timer.c Merge branch 'tegra/soc' into next/drivers 2013-04-09 17:07:36 +02:00
time-armada-370-xp.c clocksource: time-armada-370-xp: add local timer support 2013-02-28 18:57:07 +01:00
vt8500_timer.c clocksource: make CLOCKSOURCE_OF_DECLARE type safe 2013-03-28 12:01:06 +01:00