tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

arm: zynq: Move timer to generic location

Move zynq timer out of mach folder to generic location
and enable it.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

Michal Simek 4f0f234f 9e09dc5f

+23 -1
+17
Documentation/devicetree/bindings/timer/cadence,ttc-timer.txt
··· 1 + Cadence TTC - Triple Timer Counter 2 + 3 + Required properties: 4 + - compatible : Should be "cdns,ttc". 5 + - reg : Specifies base physical address and size of the registers. 6 + - interrupts : A list of 3 interrupts; one per timer channel. 7 + - clocks: phandle to the source clock 8 + 9 + Example: 10 + 11 + ttc0: ttc0@f8001000 { 12 + interrupt-parent = <&intc>; 13 + interrupts = < 0 10 4 0 11 4 0 12 4 >; 14 + compatible = "cdns,ttc"; 15 + reg = <0xF8001000 0x1000>; 16 + clocks = <&cpu_clk 3>; 17 + };
+1
arch/arm/mach-zynq/Kconfig
··· 9 9 select MIGHT_HAVE_CACHE_L2X0 10 10 select USE_OF 11 11 select SPARSE_IRQ 12 + select CADENCE_TTC_TIMER 12 13 help 13 14 Support for Xilinx Zynq ARM Cortex A9 Platform
+1 -1
arch/arm/mach-zynq/Makefile
··· 3 3 # 4 4 5 5 # Common support 6 - obj-y := common.o timer.o 6 + obj-y := common.o
arch/arm/mach-zynq/timer.c drivers/clocksource/cadence_ttc_timer.c
+3
drivers/clocksource/Kconfig
··· 31 31 config VT8500_TIMER 32 32 bool 33 33 34 + config CADENCE_TTC_TIMER 35 + bool 36 + 34 37 config CLKSRC_NOMADIK_MTU 35 38 bool 36 39 depends on (ARCH_NOMADIK || ARCH_U8500)
+1
drivers/clocksource/Makefile
··· 19 19 obj-$(CONFIG_SUNXI_TIMER) += sunxi_timer.o 20 20 obj-$(CONFIG_ARCH_TEGRA) += tegra20_timer.o 21 21 obj-$(CONFIG_VT8500_TIMER) += vt8500_timer.o 22 + obj-$(CONFIG_CADENCE_TTC_TIMER) += cadence_ttc_timer.o 22 23 23 24 obj-$(CONFIG_ARM_ARCH_TIMER) += arm_arch_timer.o 24 25 obj-$(CONFIG_CLKSRC_METAG_GENERIC) += metag_generic.o