diff options
author | Tarun Kanti DebBarma <tarun.kanti@ti.com> | 2011-09-20 07:30:16 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-09-21 18:50:31 -0400 |
commit | 318c3e15cd55c73a26ae22a65a8183655b3003f9 (patch) | |
tree | feeff06d11e081488b16d465c59d30cc3bfd4566 /arch/arm/mach-omap2 | |
parent | ee17f1147f010898e97dea2524b2aa3bcd2447a4 (diff) |
ARM: OMAP2+: dmtimer: add device names to flck nodes
Add device name to OMAP2 dmtimer fclk nodes so that the fclk nodes can be
retrieved by doing a clk_get with the corresponding device pointers or
device names.
Reviewed-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com>
Signed-off-by: Thara Gopinath <thara@ti.com>
Acked-by: Cousson, Benoit <b-cousson@ti.com>
[tony@atomide.com: fixed typo in email address]
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/clock2420_data.c | 48 | ||||
-rw-r--r-- | arch/arm/mach-omap2/clock2430_data.c | 48 | ||||
-rw-r--r-- | arch/arm/mach-omap2/clock3xxx_data.c | 36 | ||||
-rw-r--r-- | arch/arm/mach-omap2/clock44xx_data.c | 33 |
4 files changed, 165 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/clock2420_data.c b/arch/arm/mach-omap2/clock2420_data.c index debc040872f1..14a6277dd184 100644 --- a/arch/arm/mach-omap2/clock2420_data.c +++ b/arch/arm/mach-omap2/clock2420_data.c | |||
@@ -1898,6 +1898,54 @@ static struct omap_clk omap2420_clks[] = { | |||
1898 | CLK(NULL, "pka_ick", &pka_ick, CK_242X), | 1898 | CLK(NULL, "pka_ick", &pka_ick, CK_242X), |
1899 | CLK(NULL, "usb_fck", &usb_fck, CK_242X), | 1899 | CLK(NULL, "usb_fck", &usb_fck, CK_242X), |
1900 | CLK("musb-hdrc", "fck", &osc_ck, CK_242X), | 1900 | CLK("musb-hdrc", "fck", &osc_ck, CK_242X), |
1901 | CLK("omap_timer.1", "fck", &gpt1_fck, CK_242X), | ||
1902 | CLK("omap_timer.2", "fck", &gpt2_fck, CK_242X), | ||
1903 | CLK("omap_timer.3", "fck", &gpt3_fck, CK_242X), | ||
1904 | CLK("omap_timer.4", "fck", &gpt4_fck, CK_242X), | ||
1905 | CLK("omap_timer.5", "fck", &gpt5_fck, CK_242X), | ||
1906 | CLK("omap_timer.6", "fck", &gpt6_fck, CK_242X), | ||
1907 | CLK("omap_timer.7", "fck", &gpt7_fck, CK_242X), | ||
1908 | CLK("omap_timer.8", "fck", &gpt8_fck, CK_242X), | ||
1909 | CLK("omap_timer.9", "fck", &gpt9_fck, CK_242X), | ||
1910 | CLK("omap_timer.10", "fck", &gpt10_fck, CK_242X), | ||
1911 | CLK("omap_timer.11", "fck", &gpt11_fck, CK_242X), | ||
1912 | CLK("omap_timer.12", "fck", &gpt12_fck, CK_242X), | ||
1913 | CLK("omap_timer.1", "32k_ck", &func_32k_ck, CK_243X), | ||
1914 | CLK("omap_timer.2", "32k_ck", &func_32k_ck, CK_243X), | ||
1915 | CLK("omap_timer.3", "32k_ck", &func_32k_ck, CK_243X), | ||
1916 | CLK("omap_timer.4", "32k_ck", &func_32k_ck, CK_243X), | ||
1917 | CLK("omap_timer.5", "32k_ck", &func_32k_ck, CK_243X), | ||
1918 | CLK("omap_timer.6", "32k_ck", &func_32k_ck, CK_243X), | ||
1919 | CLK("omap_timer.7", "32k_ck", &func_32k_ck, CK_243X), | ||
1920 | CLK("omap_timer.8", "32k_ck", &func_32k_ck, CK_243X), | ||
1921 | CLK("omap_timer.9", "32k_ck", &func_32k_ck, CK_243X), | ||
1922 | CLK("omap_timer.10", "32k_ck", &func_32k_ck, CK_243X), | ||
1923 | CLK("omap_timer.11", "32k_ck", &func_32k_ck, CK_243X), | ||
1924 | CLK("omap_timer.12", "32k_ck", &func_32k_ck, CK_243X), | ||
1925 | CLK("omap_timer.1", "sys_ck", &sys_ck, CK_243X), | ||
1926 | CLK("omap_timer.2", "sys_ck", &sys_ck, CK_243X), | ||
1927 | CLK("omap_timer.3", "sys_ck", &sys_ck, CK_243X), | ||
1928 | CLK("omap_timer.4", "sys_ck", &sys_ck, CK_243X), | ||
1929 | CLK("omap_timer.5", "sys_ck", &sys_ck, CK_243X), | ||
1930 | CLK("omap_timer.6", "sys_ck", &sys_ck, CK_243X), | ||
1931 | CLK("omap_timer.7", "sys_ck", &sys_ck, CK_243X), | ||
1932 | CLK("omap_timer.8", "sys_ck", &sys_ck, CK_243X), | ||
1933 | CLK("omap_timer.9", "sys_ck", &sys_ck, CK_243X), | ||
1934 | CLK("omap_timer.10", "sys_ck", &sys_ck, CK_243X), | ||
1935 | CLK("omap_timer.11", "sys_ck", &sys_ck, CK_243X), | ||
1936 | CLK("omap_timer.12", "sys_ck", &sys_ck, CK_243X), | ||
1937 | CLK("omap_timer.1", "alt_ck", &alt_ck, CK_243X), | ||
1938 | CLK("omap_timer.2", "alt_ck", &alt_ck, CK_243X), | ||
1939 | CLK("omap_timer.3", "alt_ck", &alt_ck, CK_243X), | ||
1940 | CLK("omap_timer.4", "alt_ck", &alt_ck, CK_243X), | ||
1941 | CLK("omap_timer.5", "alt_ck", &alt_ck, CK_243X), | ||
1942 | CLK("omap_timer.6", "alt_ck", &alt_ck, CK_243X), | ||
1943 | CLK("omap_timer.7", "alt_ck", &alt_ck, CK_243X), | ||
1944 | CLK("omap_timer.8", "alt_ck", &alt_ck, CK_243X), | ||
1945 | CLK("omap_timer.9", "alt_ck", &alt_ck, CK_243X), | ||
1946 | CLK("omap_timer.10", "alt_ck", &alt_ck, CK_243X), | ||
1947 | CLK("omap_timer.11", "alt_ck", &alt_ck, CK_243X), | ||
1948 | CLK("omap_timer.12", "alt_ck", &alt_ck, CK_243X), | ||
1901 | }; | 1949 | }; |
1902 | 1950 | ||
1903 | /* | 1951 | /* |
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 | /* |
diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c index dadb8c6c0115..65dd363163bc 100644 --- a/arch/arm/mach-omap2/clock3xxx_data.c +++ b/arch/arm/mach-omap2/clock3xxx_data.c | |||
@@ -3464,6 +3464,42 @@ static struct omap_clk omap3xxx_clks[] = { | |||
3464 | CLK("musb-am35x", "fck", &hsotgusb_fck_am35xx, CK_AM35XX), | 3464 | CLK("musb-am35x", "fck", &hsotgusb_fck_am35xx, CK_AM35XX), |
3465 | CLK(NULL, "hecc_ck", &hecc_ck, CK_AM35XX), | 3465 | CLK(NULL, "hecc_ck", &hecc_ck, CK_AM35XX), |
3466 | CLK(NULL, "uart4_ick", &uart4_ick_am35xx, CK_AM35XX), | 3466 | CLK(NULL, "uart4_ick", &uart4_ick_am35xx, CK_AM35XX), |
3467 | CLK("omap_timer.1", "fck", &gpt1_fck, CK_3XXX), | ||
3468 | CLK("omap_timer.2", "fck", &gpt2_fck, CK_3XXX), | ||
3469 | CLK("omap_timer.3", "fck", &gpt3_fck, CK_3XXX), | ||
3470 | CLK("omap_timer.4", "fck", &gpt4_fck, CK_3XXX), | ||
3471 | CLK("omap_timer.5", "fck", &gpt5_fck, CK_3XXX), | ||
3472 | CLK("omap_timer.6", "fck", &gpt6_fck, CK_3XXX), | ||
3473 | CLK("omap_timer.7", "fck", &gpt7_fck, CK_3XXX), | ||
3474 | CLK("omap_timer.8", "fck", &gpt8_fck, CK_3XXX), | ||
3475 | CLK("omap_timer.9", "fck", &gpt9_fck, CK_3XXX), | ||
3476 | CLK("omap_timer.10", "fck", &gpt10_fck, CK_3XXX), | ||
3477 | CLK("omap_timer.11", "fck", &gpt11_fck, CK_3XXX), | ||
3478 | CLK("omap_timer.12", "fck", &gpt12_fck, CK_3XXX), | ||
3479 | CLK("omap_timer.1", "32k_ck", &omap_32k_fck, CK_3XXX), | ||
3480 | CLK("omap_timer.2", "32k_ck", &omap_32k_fck, CK_3XXX), | ||
3481 | CLK("omap_timer.3", "32k_ck", &omap_32k_fck, CK_3XXX), | ||
3482 | CLK("omap_timer.4", "32k_ck", &omap_32k_fck, CK_3XXX), | ||
3483 | CLK("omap_timer.5", "32k_ck", &omap_32k_fck, CK_3XXX), | ||
3484 | CLK("omap_timer.6", "32k_ck", &omap_32k_fck, CK_3XXX), | ||
3485 | CLK("omap_timer.7", "32k_ck", &omap_32k_fck, CK_3XXX), | ||
3486 | CLK("omap_timer.8", "32k_ck", &omap_32k_fck, CK_3XXX), | ||
3487 | CLK("omap_timer.9", "32k_ck", &omap_32k_fck, CK_3XXX), | ||
3488 | CLK("omap_timer.10", "32k_ck", &omap_32k_fck, CK_3XXX), | ||
3489 | CLK("omap_timer.11", "32k_ck", &omap_32k_fck, CK_3XXX), | ||
3490 | CLK("omap_timer.12", "32k_ck", &omap_32k_fck, CK_3XXX), | ||
3491 | CLK("omap_timer.1", "sys_ck", &sys_ck, CK_3XXX), | ||
3492 | CLK("omap_timer.2", "sys_ck", &sys_ck, CK_3XXX), | ||
3493 | CLK("omap_timer.3", "sys_ck", &sys_ck, CK_3XXX), | ||
3494 | CLK("omap_timer.4", "sys_ck", &sys_ck, CK_3XXX), | ||
3495 | CLK("omap_timer.5", "sys_ck", &sys_ck, CK_3XXX), | ||
3496 | CLK("omap_timer.6", "sys_ck", &sys_ck, CK_3XXX), | ||
3497 | CLK("omap_timer.7", "sys_ck", &sys_ck, CK_3XXX), | ||
3498 | CLK("omap_timer.8", "sys_ck", &sys_ck, CK_3XXX), | ||
3499 | CLK("omap_timer.9", "sys_ck", &sys_ck, CK_3XXX), | ||
3500 | CLK("omap_timer.10", "sys_ck", &sys_ck, CK_3XXX), | ||
3501 | CLK("omap_timer.11", "sys_ck", &sys_ck, CK_3XXX), | ||
3502 | CLK("omap_timer.12", "sys_ck", &sys_ck, CK_3XXX), | ||
3467 | }; | 3503 | }; |
3468 | 3504 | ||
3469 | 3505 | ||
diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c index c0b6fbda3408..946bf04a956d 100644 --- a/arch/arm/mach-omap2/clock44xx_data.c +++ b/arch/arm/mach-omap2/clock44xx_data.c | |||
@@ -3363,6 +3363,39 @@ static struct omap_clk omap44xx_clks[] = { | |||
3363 | CLK("usbhs-omap.0", "usbhost_ick", &dummy_ck, CK_443X), | 3363 | CLK("usbhs-omap.0", "usbhost_ick", &dummy_ck, CK_443X), |
3364 | CLK("usbhs-omap.0", "usbtll_fck", &dummy_ck, CK_443X), | 3364 | CLK("usbhs-omap.0", "usbtll_fck", &dummy_ck, CK_443X), |
3365 | CLK("omap_wdt", "ick", &dummy_ck, CK_443X), | 3365 | CLK("omap_wdt", "ick", &dummy_ck, CK_443X), |
3366 | CLK("omap_timer.1", "fck", &timer1_fck, CK_443X), | ||
3367 | CLK("omap_timer.2", "fck", &timer2_fck, CK_443X), | ||
3368 | CLK("omap_timer.3", "fck", &timer3_fck, CK_443X), | ||
3369 | CLK("omap_timer.4", "fck", &timer4_fck, CK_443X), | ||
3370 | CLK("omap_timer.5", "fck", &timer5_fck, CK_443X), | ||
3371 | CLK("omap_timer.6", "fck", &timer6_fck, CK_443X), | ||
3372 | CLK("omap_timer.7", "fck", &timer7_fck, CK_443X), | ||
3373 | CLK("omap_timer.8", "fck", &timer8_fck, CK_443X), | ||
3374 | CLK("omap_timer.9", "fck", &timer9_fck, CK_443X), | ||
3375 | CLK("omap_timer.10", "fck", &timer10_fck, CK_443X), | ||
3376 | CLK("omap_timer.11", "fck", &timer11_fck, CK_443X), | ||
3377 | CLK("omap_timer.1", "32k_ck", &sys_32k_ck, CK_443X), | ||
3378 | CLK("omap_timer.2", "32k_ck", &sys_32k_ck, CK_443X), | ||
3379 | CLK("omap_timer.3", "32k_ck", &sys_32k_ck, CK_443X), | ||
3380 | CLK("omap_timer.4", "32k_ck", &sys_32k_ck, CK_443X), | ||
3381 | CLK("omap_timer.5", "32k_ck", &sys_32k_ck, CK_443X), | ||
3382 | CLK("omap_timer.6", "32k_ck", &sys_32k_ck, CK_443X), | ||
3383 | CLK("omap_timer.7", "32k_ck", &sys_32k_ck, CK_443X), | ||
3384 | CLK("omap_timer.8", "32k_ck", &sys_32k_ck, CK_443X), | ||
3385 | CLK("omap_timer.9", "32k_ck", &sys_32k_ck, CK_443X), | ||
3386 | CLK("omap_timer.10", "32k_ck", &sys_32k_ck, CK_443X), | ||
3387 | CLK("omap_timer.11", "32k_ck", &sys_32k_ck, CK_443X), | ||
3388 | CLK("omap_timer.1", "sys_ck", &sys_clkin_ck, CK_443X), | ||
3389 | CLK("omap_timer.2", "sys_ck", &sys_clkin_ck, CK_443X), | ||
3390 | CLK("omap_timer.3", "sys_ck", &sys_clkin_ck, CK_443X), | ||
3391 | CLK("omap_timer.4", "sys_ck", &sys_clkin_ck, CK_443X), | ||
3392 | CLK("omap_timer.9", "sys_ck", &sys_clkin_ck, CK_443X), | ||
3393 | CLK("omap_timer.10", "sys_ck", &sys_clkin_ck, CK_443X), | ||
3394 | CLK("omap_timer.11", "sys_ck", &sys_clkin_ck, CK_443X), | ||
3395 | CLK("omap_timer.5", "sys_ck", &syc_clk_div_ck, CK_443X), | ||
3396 | CLK("omap_timer.6", "sys_ck", &syc_clk_div_ck, CK_443X), | ||
3397 | CLK("omap_timer.7", "sys_ck", &syc_clk_div_ck, CK_443X), | ||
3398 | CLK("omap_timer.8", "sys_ck", &syc_clk_div_ck, CK_443X), | ||
3366 | }; | 3399 | }; |
3367 | 3400 | ||
3368 | int __init omap4xxx_clk_init(void) | 3401 | int __init omap4xxx_clk_init(void) |