linux/drivers
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
..
accessibility
acpi PCI updates for v3.9: 2013-04-05 19:29:36 -07:00
amba ARM: 7675/1: amba: tegra-ahb: Fix build error w/ PM_SLEEP w/o PM_RUNTIME 2013-03-15 17:20:02 +00:00
ata Simple stuff. See one-line summaries. 2013-03-23 12:33:36 -07:00
atm
auxdisplay
base ACPI and power management fixes for 3.9-rc6 2013-04-04 15:56:28 -07:00
bcma
block loop: prevent bdev freeing while device in use 2013-04-01 15:48:47 -07:00
bluetooth Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth 2013-03-18 15:17:11 -04:00
bus
cdrom
char One reversion, a tiny leak fix, and a cc:stable locking fix, in two parts. 2013-04-01 16:17:52 -07:00
clk Merge branch 'samsung/exynos-multiplatform-drivers' into late/multiplatform 2013-04-20 00:35:17 +02:00
clocksource Merge branch 'exynos/pwm-clocksource' into late/multiplatform 2013-05-06 23:49:09 +02:00
connector
cpufreq cpufreq: Correct header guards typo 2013-04-02 15:14:29 +02:00
cpuidle
crypto Revert "crypto: caam - add IPsec ESN support" 2013-03-21 17:36:03 +08:00
dca
devfreq
dio
dma Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 2013-04-03 10:48:22 -07:00
edac EDAC: Merge mci.mem_is_per_rank with mci.csbased 2013-03-16 06:32:30 +01:00
eisa EISA/PCI: Init EISA early, before PNP 2013-04-01 12:02:05 -06:00
extcon extcon: max77693: Initialize register of MUIC device to bring up it without platform data 2013-03-13 17:38:57 +09:00
firewire
firmware efivars: Fix check for CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE 2013-03-22 20:08:01 +00:00
gpio Merge branch 'next/drivers' into late/multiplatform 2013-04-19 23:12:42 +02:00
gpu PCI updates for v3.9: 2013-04-05 19:29:36 -07:00
hid HID: magicmouse: fix race between input_register() and probe() 2013-04-04 09:49:56 +02:00
hsi
hv
hwmon hwmon: (lm75.h) Update header inclusion 2013-03-18 21:19:49 +01:00
hwspinlock
i2c ACPI / I2C: Use parent's ACPI_HANDLE() in acpi_i2c_register_devices() 2013-04-02 15:30:41 +02:00
ide
idle
iio
infiniband firmware,IB/qib: revert firmware file move 2013-04-05 12:19:39 -07:00
input arm-soc: bug fixes for 3.9-rc3 2013-03-18 08:17:14 -07:00
iommu IOMMU fixes for Linux v3.9-rc4 2013-03-27 09:25:11 -07:00
ipack
irqchip irqchip: exynos: look up irq using irq_find_mapping 2013-04-19 23:00:43 +02:00
isdn isdn: hisax: netjet requires VIRT_TO_BUS 2013-03-17 12:01:10 -04:00
leds
lguest
macintosh
mailbox
md dm cache: reduce bio front_pad size in writeback mode 2013-04-05 15:36:34 +01:00
media Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid 2013-04-04 08:40:45 -07:00
memory
memstick
message
mfd mfd: twl4030-madc: Remove __exit_p annotation 2013-03-15 07:42:22 +01:00
misc VMCI: Fix process-to-process DRGAMs. 2013-03-15 12:58:12 -07:00
mmc Merge branch 'samsung/exynos-multiplatform' into next/drivers 2013-04-19 16:50:56 +02:00
mtd mtd: onenand/samsung: make regs-onenand.h file local 2013-04-19 13:51:24 +02:00
net ixgbe: fix registration order of driver and DCA nofitication 2013-04-05 00:49:13 -04:00
nfc NFC: microread: Fix build failure due to a new MEI bus API 2013-04-01 00:52:42 +02:00
ntb
nubus
of of: Remove duplicated code for validating property and value 2013-04-04 17:59:18 +13:00
oprofile
parisc
parport
pci PCI/PM: Disable runtime PM of PCIe ports 2013-04-03 15:54:59 -06:00
pcmcia
pinctrl pinctrl: vt8500: wmt: Fix checking return value of pinctrl_register() 2013-04-19 17:16:36 +02:00
platform Platform: x86: chromeos_laptop : Add basic platform data for atmel devices 2013-03-08 16:03:29 -08:00
pnp
power
pps
ps3
ptp
pwm
rapidio
regulator
remoteproc
reset reset: NULL deref on allocation failure 2013-04-12 10:26:24 +02:00
rpmsg
rtc Merge branch 'next/drivers' into late/multiplatform 2013-04-19 23:12:42 +02:00
s390 s390/3270: fix minor_start issue 2013-03-21 13:35:39 +01:00
sbus
scsi libfcoe: Fix fcoe_sysfs VN2VN mode 2013-03-25 16:04:22 -07:00
sfi
sh
sn
spi spi: Fixes for v3.9 2013-04-05 10:04:41 -07:00
ssb
staging staging: comedi: s626: fix continuous acquisition 2013-03-25 11:35:38 -07:00
target target: Fix RESERVATION_CONFLICT status regression for iscsi-target special case 2013-03-28 23:42:47 -07:00
tc
thermal thermal/exynos: remove unnecessary header inclusions 2013-04-19 13:51:23 +02:00
tty TTY/serial fixes for 3.9-rc4 2013-03-28 15:53:33 -07:00
uio
usb USB / PM: Don't try to hide PM QoS flags from usb_port_device_release() 2013-04-02 01:25:09 +02:00
uwb
vfio vfio: include <linux/slab.h> for kmalloc 2013-03-15 12:58:20 -06:00
vhost Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending 2013-03-30 13:13:05 -07:00
video Merge branch 'next/drivers' into late/multiplatform 2013-04-19 23:12:42 +02:00
virt
virtio
vlynq
vme
w1 w1: fix oops when w1_search is called from netlink connector 2013-03-12 16:20:46 -07:00
watchdog watchdog: sp5100_tco: Set the AcpiMmioSel bitmask value to 1 instead of 2 2013-03-22 23:21:55 +01:00
xen Bug-fixes: 2013-03-27 12:56:25 -07:00
zorro
Kconfig reset: Add reset controller API 2013-04-12 10:26:23 +02:00
Makefile reset: Add reset controller API 2013-04-12 10:26:23 +02:00