Maxime Ripard 31f8ad387e ARM: sun7i: a20: Add support for the High Speed Timers ... The Allwinner A20 has support for four high speed timers. Apart for the number of timers (4 vs 2), it's basically the same logic than the high speed timers found in the sun5i chips. Now that we have a driver to support it, we can enable them in the device tree. [dlezcano] : Fixed conflict with 428abbb8 "Enable the I2C controllers" Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Tested-by: Emilio López <emilio@elopez.com.ar> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>		2013-12-11 11:40:01 +01:00
..
boot	ARM: sun7i: a20: Add support for the High Speed Timers	2013-12-11 11:40:01 +01:00
common	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2013-11-20 13:20:24 -08:00
configs	watchdog: sirf: add watchdog driver of CSR SiRFprimaII and SiRFatlasVI	2013-11-17 19:37:23 +01:00
crypto
include	ARM: fix booting low-vectors machines	2013-11-30 14:45:31 +00:00
kernel	ARM: 7897/1: kexec: Use the right ISA for relocate_new_kernel	2013-11-30 22:21:02 +00:00
kvm	Fix percpu vmalloc allocations	2013-11-19 10:43:05 +02:00
lib	ARM: 7907/1: lib: delay-loop: Add align directive to fix BogoMIPS calculation	2013-11-30 22:21:03 +00:00
mach-at91	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2013-11-18 15:50:07 -08:00
mach-bcm
mach-bcm2835	Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-12 10:02:59 +09:00
mach-clps711x
mach-cns3xxx
mach-davinci	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2013-11-18 15:50:07 -08:00
mach-dove	ARM: driver updates for 3.13	2013-11-11 17:05:37 +09:00
mach-ebsa110
mach-ep93xx
mach-exynos	ACPI and power management updates for 3.13-rc1	2013-11-14 13:41:48 +09:00
mach-footbridge	ARM: footbridge: fix EBSA285 LEDs	2013-11-30 22:20:59 +00:00
mach-gemini	GPIO bulk changes for the v3.13 development cycle	2013-11-12 15:50:46 +09:00
mach-highbank	ARM: SoC fixes for 3.13 merge window	2013-11-16 12:45:55 -08:00
mach-imx	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2013-11-18 15:50:07 -08:00
mach-integrator	Few clock fixes, a runtime PM fix, and pinctrl-single fix along	2013-11-15 15:17:59 -08:00
mach-iop13xx	dmaengine: remove DMA unmap from drivers	2013-11-14 11:04:38 -08:00
mach-iop32x
mach-iop33x
mach-ixp4xx	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	2013-11-14 08:51:29 +09:00
mach-keystone	DeviceTree updates for 3.13. This is a bit larger pull request than	2013-11-12 16:52:17 +09:00
mach-kirkwood	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2013-11-18 15:50:07 -08:00
mach-ks8695
mach-lpc32xx
mach-mmp	fbdev changes for 3.13	2013-11-14 14:44:20 +09:00
mach-msm	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-12 10:36:00 +09:00
mach-mv78xx0
mach-mvebu
mach-mxs	ARM: SoC DT updates for 3.13	2013-11-11 17:34:56 +09:00
mach-netx
mach-nomadik
mach-nspire
mach-omap1	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2013-11-18 15:50:07 -08:00
mach-omap2	Merge tag 'omap-for-v3.13/more-fixes-for-merge-window-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes	2013-11-25 13:34:49 -08:00
mach-orion5x
mach-picoxcell
mach-prima2
mach-pxa	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2013-11-18 15:50:07 -08:00
mach-realview
mach-rockchip	ARM: SoC board updates for 3.13	2013-11-11 16:57:16 +09:00
mach-rpc
mach-s3c24xx	Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2013-11-18 15:50:07 -08:00
mach-s3c64xx	pwm: Changes for v3.13-rc1	2013-11-16 12:21:40 -08:00
mach-s5p64x0
mach-s5pc100
mach-s5pv210	pwm: Changes for v3.13-rc1	2013-11-16 12:21:40 -08:00
mach-sa1100	ACPI and power management updates for 3.13-rc1	2013-11-14 13:41:48 +09:00
mach-shmobile	pwm: Changes for v3.13-rc1	2013-11-16 12:21:40 -08:00
mach-socfpga
mach-spear
mach-sti	ARM: SoC fixes for 3.13 merge window	2013-11-16 12:45:55 -08:00
mach-sunxi	clocksource: Add Allwinner SoCs HS timers driver	2013-12-11 11:37:50 +01:00
mach-tegra	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2013-11-23 16:18:25 -08:00
mach-u300	DeviceTree updates for 3.13. This is a bit larger pull request than	2013-11-12 16:52:17 +09:00
mach-ux500	ACPI and power management updates for 3.13-rc1	2013-11-14 13:41:48 +09:00
mach-versatile
mach-vexpress	ARM: vexpress/TC2: Implement MCPM power_down_finish()	2013-11-25 14:12:14 -08:00
mach-virt
mach-vt8500
mach-w90x900
mach-zynq	ACPI and power management updates for 3.13-rc1	2013-11-14 13:41:48 +09:00
mm	ARM: fix booting low-vectors machines	2013-11-30 14:45:31 +00:00
net	Merge branch 'devel-stable' into for-next	2013-11-12 10:58:59 +00:00
nwfpe
oprofile
plat-iop
plat-omap
plat-orion
plat-pxa
plat-samsung	pwm: Changes for v3.13-rc1	2013-11-16 12:21:40 -08:00
plat-versatile
tools
vfp
xen	xen/arm: p2m_init and p2m_lock should be static	2013-11-18 15:33:10 +00:00
Kconfig	Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm	2013-11-22 09:56:51 -08:00
Kconfig-nommu
Kconfig.debug	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	2013-11-14 08:51:29 +09:00
Makefile	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	2013-11-14 08:51:29 +09:00