diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-01 23:18:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-01 23:18:05 -0400 |
| commit | ac5761a650d22dd7dfad4d417463a0981d2da0a4 (patch) | |
| tree | c01a46a889dde74fbbb05d3b2da22387bb4875c6 /arch/arm/mach-omap2/clock2430_data.c | |
| parent | 25498e5b3df931a3d52a6e0642ae242e4ee19488 (diff) | |
| parent | eed1e576507b52e03e549e0c9e0c747978122403 (diff) | |
Merge branch 'next/timer' of git://git.linaro.org/people/arnd/arm-soc
* 'next/timer' of git://git.linaro.org/people/arnd/arm-soc:
clocksource: fixup ux500 build problems
ARM: omap: use __devexit_p in dmtimer driver
ARM: ux500: Reprogram timers upon resume
ARM: plat-nomadik: timer: Export reset functions
ARM: plat-nomadik: timer: Add support for periodic timers
ARM: ux500: Move timer code to separate file
ARM: ux500: add support for clocksource DBX500 PRCMU
clocksource: add DBX500 PRCMU Timer support
ARM: plat-nomadik: MTU sched_clock as an option
ARM: OMAP: dmtimer: add error handling to export APIs
ARM: OMAP: dmtimer: low-power mode support
ARM: OMAP: dmtimer: skip reserved timers
ARM: OMAP: dmtimer: pm_runtime support
ARM: OMAP: dmtimer: switch-over to platform device driver
ARM: OMAP: dmtimer: platform driver
ARM: OMAP2+: dmtimer: convert to platform devices
ARM: OMAP1: dmtimer: conversion to platform devices
ARM: OMAP2+: dmtimer: add device names to flck nodes
ARM: OMAP: Add support for dmtimer v2 ip
Diffstat (limited to 'arch/arm/mach-omap2/clock2430_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock2430_data.c | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/clock2430_data.c b/arch/arm/mach-omap2/clock2430_data.c index 96a942e42db1..ea6717cfa3c8 100644 --- a/arch/arm/mach-omap2/clock2430_data.c +++ b/arch/arm/mach-omap2/clock2430_data.c | |||
| @@ -1998,6 +1998,54 @@ static struct omap_clk omap2430_clks[] = { | |||
| 1998 | CLK(NULL, "mdm_intc_ick", &mdm_intc_ick, CK_243X), | 1998 | CLK(NULL, "mdm_intc_ick", &mdm_intc_ick, CK_243X), |
| 1999 | CLK("omap_hsmmc.0", "mmchsdb_fck", &mmchsdb1_fck, CK_243X), | 1999 | CLK("omap_hsmmc.0", "mmchsdb_fck", &mmchsdb1_fck, CK_243X), |
| 2000 | CLK("omap_hsmmc.1", "mmchsdb_fck", &mmchsdb2_fck, CK_243X), | 2000 | CLK("omap_hsmmc.1", "mmchsdb_fck", &mmchsdb2_fck, CK_243X), |
| 2001 | CLK("omap_timer.1", "fck", &gpt1_fck, CK_243X), | ||
| 2002 | CLK("omap_timer.2", "fck", &gpt2_fck, CK_243X), | ||
| 2003 | CLK("omap_timer.3", "fck", &gpt3_fck, CK_243X), | ||
| 2004 | CLK("omap_timer.4", "fck", &gpt4_fck, CK_243X), | ||
| 2005 | CLK("omap_timer.5", "fck", &gpt5_fck, CK_243X), | ||
| 2006 | CLK("omap_timer.6", "fck", &gpt6_fck, CK_243X), | ||
| 2007 | CLK("omap_timer.7", "fck", &gpt7_fck, CK_243X), | ||
| 2008 | CLK("omap_timer.8", "fck", &gpt8_fck, CK_243X), | ||
| 2009 | CLK("omap_timer.9", "fck", &gpt9_fck, CK_243X), | ||
| 2010 | CLK("omap_timer.10", "fck", &gpt10_fck, CK_243X), | ||
| 2011 | CLK("omap_timer.11", "fck", &gpt11_fck, CK_243X), | ||
| 2012 | CLK("omap_timer.12", "fck", &gpt12_fck, CK_243X), | ||
| 2013 | CLK("omap_timer.1", "32k_ck", &func_32k_ck, CK_243X), | ||
| 2014 | CLK("omap_timer.2", "32k_ck", &func_32k_ck, CK_243X), | ||
| 2015 | CLK("omap_timer.3", "32k_ck", &func_32k_ck, CK_243X), | ||
| 2016 | CLK("omap_timer.4", "32k_ck", &func_32k_ck, CK_243X), | ||
| 2017 | CLK("omap_timer.5", "32k_ck", &func_32k_ck, CK_243X), | ||
| 2018 | CLK("omap_timer.6", "32k_ck", &func_32k_ck, CK_243X), | ||
| 2019 | CLK("omap_timer.7", "32k_ck", &func_32k_ck, CK_243X), | ||
| 2020 | CLK("omap_timer.8", "32k_ck", &func_32k_ck, CK_243X), | ||
| 2021 | CLK("omap_timer.9", "32k_ck", &func_32k_ck, CK_243X), | ||
| 2022 | CLK("omap_timer.10", "32k_ck", &func_32k_ck, CK_243X), | ||
| 2023 | CLK("omap_timer.11", "32k_ck", &func_32k_ck, CK_243X), | ||
| 2024 | CLK("omap_timer.12", "32k_ck", &func_32k_ck, CK_243X), | ||
| 2025 | CLK("omap_timer.1", "sys_ck", &sys_ck, CK_243X), | ||
| 2026 | CLK("omap_timer.2", "sys_ck", &sys_ck, CK_243X), | ||
| 2027 | CLK("omap_timer.3", "sys_ck", &sys_ck, CK_243X), | ||
| 2028 | CLK("omap_timer.4", "sys_ck", &sys_ck, CK_243X), | ||
| 2029 | CLK("omap_timer.5", "sys_ck", &sys_ck, CK_243X), | ||
| 2030 | CLK("omap_timer.6", "sys_ck", &sys_ck, CK_243X), | ||
| 2031 | CLK("omap_timer.7", "sys_ck", &sys_ck, CK_243X), | ||
| 2032 | CLK("omap_timer.8", "sys_ck", &sys_ck, CK_243X), | ||
| 2033 | CLK("omap_timer.9", "sys_ck", &sys_ck, CK_243X), | ||
| 2034 | CLK("omap_timer.10", "sys_ck", &sys_ck, CK_243X), | ||
| 2035 | CLK("omap_timer.11", "sys_ck", &sys_ck, CK_243X), | ||
| 2036 | CLK("omap_timer.12", "sys_ck", &sys_ck, CK_243X), | ||
| 2037 | CLK("omap_timer.1", "alt_ck", &alt_ck, CK_243X), | ||
| 2038 | CLK("omap_timer.2", "alt_ck", &alt_ck, CK_243X), | ||
| 2039 | CLK("omap_timer.3", "alt_ck", &alt_ck, CK_243X), | ||
| 2040 | CLK("omap_timer.4", "alt_ck", &alt_ck, CK_243X), | ||
| 2041 | CLK("omap_timer.5", "alt_ck", &alt_ck, CK_243X), | ||
| 2042 | CLK("omap_timer.6", "alt_ck", &alt_ck, CK_243X), | ||
| 2043 | CLK("omap_timer.7", "alt_ck", &alt_ck, CK_243X), | ||
| 2044 | CLK("omap_timer.8", "alt_ck", &alt_ck, CK_243X), | ||
| 2045 | CLK("omap_timer.9", "alt_ck", &alt_ck, CK_243X), | ||
| 2046 | CLK("omap_timer.10", "alt_ck", &alt_ck, CK_243X), | ||
| 2047 | CLK("omap_timer.11", "alt_ck", &alt_ck, CK_243X), | ||
| 2048 | CLK("omap_timer.12", "alt_ck", &alt_ck, CK_243X), | ||
| 2001 | }; | 2049 | }; |
| 2002 | 2050 | ||
| 2003 | /* | 2051 | /* |