linux-hardened/Documentation/devicetree/bindings
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
..
arc ARC: [plat-arcfpga]: Enabling DeviceTree for Angel4 board 2013-02-15 23:15:57 +05:30
arm ARM: dt: tegra: add bindings of power management configurations for PMC 2013-04-03 14:31:36 -06:00
ata ARM: EXYNOS: DT Support for SATA and SATA PHY 2012-11-20 21:02:17 +09:00
bus ARM: OMAP2+: Add additional GPMC timing parameters 2013-04-03 20:12:18 -05:00
c6x
clock add suppport common clock framework for exynos 2013-04-09 22:28:45 +02:00
cpufreq cpufreq: SPEAr: Add CPUFreq driver 2012-11-27 14:05:26 +01:00
crypto crypto: caam - Added property fsl, sec-era in SEC4.0 device tree binding. 2013-02-13 07:49:01 -06:00
dma dmaengine: dw_dmac: move to generic DMA binding 2013-02-28 09:53:21 +05:30
drm Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2013-02-25 16:46:44 -08:00
fb video: mxsfb: add simple device tree probe 2012-07-03 13:22:37 +08:00
gpio gpio: vt8500: Remove arch-vt8500 gpio driver 2013-04-04 18:00:44 +13:00
gpu drm: Add NVIDIA Tegra20 support 2012-11-20 15:43:41 +10:00
hwmon hwmon: Versatile Express hwmon driver 2012-10-16 17:12:35 +01:00
i2c Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 2013-02-26 09:41:53 -08:00
input Device tree changes for v3.9 2013-02-20 11:04:46 -08:00
interrupt-controller irqchip: s3c24xx: add devicetree support 2013-04-04 14:56:30 +09:00
iommu iommu/tegra: smmu: Add device tree support for SMMU 2012-06-25 13:50:43 +02:00
leds Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds 2013-02-26 09:29:02 -08:00
lpddr2 Documentation: dt: device tree bindings for LPDDR2 memories 2012-09-07 19:18:37 +02:00
media ARM: dts: Update MFC DT binding documentation 2013-03-07 19:39:51 +09:00
memory-controllers/ti Documentation: dt: emif: device tree bindings for TI's EMIF sdram controller 2012-09-07 19:18:38 +02:00
metag metag: Internal and external irqchips 2013-03-02 20:09:48 +00:00
mfd mfd: ab8500: Kill "reg" property from binding 2013-03-12 09:39:01 +01:00
mips Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next 2013-02-22 10:07:30 +01:00
misc ARM: at91: atmel-ssc: add device tree support 2012-11-07 09:23:49 +01:00
mmc MMC highlights for 3.9: 2013-02-26 09:31:09 -08:00
mtd ARM: OMAP2+: Convert ONENAND to retrieve GPMC settings from DT 2013-04-03 20:13:39 -05:00
net ARM: OMAP2+: Add GPMC DT support for Ethernet child nodes 2013-04-03 20:13:42 -05:00
nvec dt: name all Tegra binding docs consistently 2012-06-11 11:48:42 -06:00
pci
pinctrl pinctrl: gpio: vt8500: Add pincontrol driver for arch-vt8500 2013-04-04 18:00:02 +13:00
power PM / OPP: Initialize OPP table from device tree 2012-09-09 22:06:33 +02:00
power_supply This is the MFD pull request for the 3.9 merge window. 2013-02-24 20:00:58 -08:00
powerpc Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2013-02-23 17:09:55 -08:00
pwm Documentation: Add device tree bindings for Samsung PWM timers 2013-04-28 12:16:03 -07:00
regulator This is the MFD pull request for the 3.9 merge window. 2013-02-24 20:00:58 -08:00
reset dt: describe base reset signal binding 2013-04-12 10:25:25 +02:00
rtc documentation/devicetree: Fix typos 2013-02-06 11:06:36 +00:00
serial Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2013-03-02 07:44:16 -08:00
serio
sound Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next 2013-02-11 11:06:53 +00:00
spi spi/sh-msiof: Add device tree parsing to driver 2013-02-05 12:26:58 +00:00
staging iio: mxs: Implement support for touchscreen 2013-01-26 10:07:46 +00:00
thermal Thermal: Dove: Add Themal sensor support for Dove. 2013-02-08 20:26:02 +08:00
timer add support exynos mct device tree and move into drivers/clocksource 2013-04-09 22:18:24 +02:00
tty/serial tty/serial: Add support for Altera serial port 2013-03-12 08:53:23 -07:00
usb ARM: dts: Enabling ohci-exynos driver for EXYNOS5250 2013-03-07 19:47:12 +09:00
video Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2013-02-25 16:46:44 -08:00
virtio
w1 W1: Add device tree support to MXC onewire master. 2013-02-10 23:25:46 +08:00
watchdog watchdog: at91rm9200: add DT support 2013-03-01 12:55:27 +01:00
x86
eeprom.txt
marvell.txt
open-pic.txt
resource-names.txt
vendor-prefixes.txt Device tree changes for v3.9 2013-02-20 11:04:46 -08:00
xilinx.txt