diff options
author | Jon Hunter <jon-hunter@ti.com> | 2012-06-05 13:35:00 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-06-14 05:39:47 -0400 |
commit | c59b537d87068be8c357a0150f6172a2dc8cdf82 (patch) | |
tree | ffcc6f3cf259feee766dae4f7579bf457ccc37f2 /arch/arm/mach-omap2/clock2420_data.c | |
parent | 2b2d35230099613365ad6000f4d71086130b9e71 (diff) |
ARM: OMAP2+: Simplify dmtimer clock aliases
The OMAP dmtimer driver allows you to dynamically configure the functional
clock that drives the timer logic. The dmtimer driver uses the device name and
a "con-id" string to search for the appropriate functional clock.
Currently, we define a clock alias for each functional clock source each timer
supports. Some functional clock sources are common to all of the timers on a
device and so for these clock sources we can use a single alias with a unique
con-id string.
The possible functional clock sources for an OMAP device are a 32kHz clock,
a system (MHz range) clock and (for OMAP2 only) an external clock. By defining
a unique con-id name for each of these (timer_32k_ck, timer_sys_ck and
timer_ext_ck) we can eliminate a lot of the clock aliases for timers. This
reduces code, speeds-up searches and clock initialisation time.
Signed-off-by: Jon Hunter <jon-hunter@ti.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/clock2420_data.c')
-rw-r--r-- | arch/arm/mach-omap2/clock2420_data.c | 39 |
1 files changed, 3 insertions, 36 deletions
diff --git a/arch/arm/mach-omap2/clock2420_data.c b/arch/arm/mach-omap2/clock2420_data.c index bace9308a4db..861767ed1a3a 100644 --- a/arch/arm/mach-omap2/clock2420_data.c +++ b/arch/arm/mach-omap2/clock2420_data.c | |||
@@ -1901,42 +1901,9 @@ static struct omap_clk omap2420_clks[] = { | |||
1901 | CLK(NULL, "pka_ick", &pka_ick, CK_242X), | 1901 | CLK(NULL, "pka_ick", &pka_ick, CK_242X), |
1902 | CLK(NULL, "usb_fck", &usb_fck, CK_242X), | 1902 | CLK(NULL, "usb_fck", &usb_fck, CK_242X), |
1903 | CLK("musb-hdrc", "fck", &osc_ck, CK_242X), | 1903 | CLK("musb-hdrc", "fck", &osc_ck, CK_242X), |
1904 | CLK("omap_timer.1", "32k_ck", &func_32k_ck, CK_243X), | 1904 | CLK(NULL, "timer_32k_ck", &func_32k_ck, CK_243X), |
1905 | CLK("omap_timer.2", "32k_ck", &func_32k_ck, CK_243X), | 1905 | CLK(NULL, "timer_sys_ck", &sys_ck, CK_243X), |
1906 | CLK("omap_timer.3", "32k_ck", &func_32k_ck, CK_243X), | 1906 | CLK(NULL, "timer_ext_ck", &alt_ck, CK_243X), |
1907 | CLK("omap_timer.4", "32k_ck", &func_32k_ck, CK_243X), | ||
1908 | CLK("omap_timer.5", "32k_ck", &func_32k_ck, CK_243X), | ||
1909 | CLK("omap_timer.6", "32k_ck", &func_32k_ck, CK_243X), | ||
1910 | CLK("omap_timer.7", "32k_ck", &func_32k_ck, CK_243X), | ||
1911 | CLK("omap_timer.8", "32k_ck", &func_32k_ck, CK_243X), | ||
1912 | CLK("omap_timer.9", "32k_ck", &func_32k_ck, CK_243X), | ||
1913 | CLK("omap_timer.10", "32k_ck", &func_32k_ck, CK_243X), | ||
1914 | CLK("omap_timer.11", "32k_ck", &func_32k_ck, CK_243X), | ||
1915 | CLK("omap_timer.12", "32k_ck", &func_32k_ck, CK_243X), | ||
1916 | CLK("omap_timer.1", "sys_ck", &sys_ck, CK_243X), | ||
1917 | CLK("omap_timer.2", "sys_ck", &sys_ck, CK_243X), | ||
1918 | CLK("omap_timer.3", "sys_ck", &sys_ck, CK_243X), | ||
1919 | CLK("omap_timer.4", "sys_ck", &sys_ck, CK_243X), | ||
1920 | CLK("omap_timer.5", "sys_ck", &sys_ck, CK_243X), | ||
1921 | CLK("omap_timer.6", "sys_ck", &sys_ck, CK_243X), | ||
1922 | CLK("omap_timer.7", "sys_ck", &sys_ck, CK_243X), | ||
1923 | CLK("omap_timer.8", "sys_ck", &sys_ck, CK_243X), | ||
1924 | CLK("omap_timer.9", "sys_ck", &sys_ck, CK_243X), | ||
1925 | CLK("omap_timer.10", "sys_ck", &sys_ck, CK_243X), | ||
1926 | CLK("omap_timer.11", "sys_ck", &sys_ck, CK_243X), | ||
1927 | CLK("omap_timer.12", "sys_ck", &sys_ck, CK_243X), | ||
1928 | CLK("omap_timer.1", "alt_ck", &alt_ck, CK_243X), | ||
1929 | CLK("omap_timer.2", "alt_ck", &alt_ck, CK_243X), | ||
1930 | CLK("omap_timer.3", "alt_ck", &alt_ck, CK_243X), | ||
1931 | CLK("omap_timer.4", "alt_ck", &alt_ck, CK_243X), | ||
1932 | CLK("omap_timer.5", "alt_ck", &alt_ck, CK_243X), | ||
1933 | CLK("omap_timer.6", "alt_ck", &alt_ck, CK_243X), | ||
1934 | CLK("omap_timer.7", "alt_ck", &alt_ck, CK_243X), | ||
1935 | CLK("omap_timer.8", "alt_ck", &alt_ck, CK_243X), | ||
1936 | CLK("omap_timer.9", "alt_ck", &alt_ck, CK_243X), | ||
1937 | CLK("omap_timer.10", "alt_ck", &alt_ck, CK_243X), | ||
1938 | CLK("omap_timer.11", "alt_ck", &alt_ck, CK_243X), | ||
1939 | CLK("omap_timer.12", "alt_ck", &alt_ck, CK_243X), | ||
1940 | }; | 1907 | }; |
1941 | 1908 | ||
1942 | /* | 1909 | /* |