aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/clock24xx.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-01-19 15:44:33 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-02-08 12:50:16 -0500
commit39a80c7f379e1c1d3e63b204b8353b7381d0a3d5 (patch)
tree7e2b60598eac3d5aab46b1c6fcbf8511d2be9ee5 /arch/arm/mach-omap2/clock24xx.c
parentf1c2543738d18e4398e3d6e27abff6676667975a (diff)
[ARM] omap: watchdog: convert clocks to match by devid and conid
This eliminates the need for separate OMAP24xx and OMAP34xx clock requesting code sections. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap2/clock24xx.c')
-rw-r--r--arch/arm/mach-omap2/clock24xx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
index 36093ea878a3..6a6278e5bbce 100644
--- a/arch/arm/mach-omap2/clock24xx.c
+++ b/arch/arm/mach-omap2/clock24xx.c
@@ -163,8 +163,8 @@ static struct omap_clk omap24xx_clks[] = {
163 CLK(NULL, "uart3_fck", &uart3_fck, CK_243X | CK_242X), 163 CLK(NULL, "uart3_fck", &uart3_fck, CK_243X | CK_242X),
164 CLK(NULL, "gpios_ick", &gpios_ick, CK_243X | CK_242X), 164 CLK(NULL, "gpios_ick", &gpios_ick, CK_243X | CK_242X),
165 CLK(NULL, "gpios_fck", &gpios_fck, CK_243X | CK_242X), 165 CLK(NULL, "gpios_fck", &gpios_fck, CK_243X | CK_242X),
166 CLK(NULL, "mpu_wdt_ick", &mpu_wdt_ick, CK_243X | CK_242X), 166 CLK("omap_wdt", "ick", &mpu_wdt_ick, CK_243X | CK_242X),
167 CLK(NULL, "mpu_wdt_fck", &mpu_wdt_fck, CK_243X | CK_242X), 167 CLK("omap_wdt", "fck", &mpu_wdt_fck, CK_243X | CK_242X),
168 CLK(NULL, "sync_32k_ick", &sync_32k_ick, CK_243X | CK_242X), 168 CLK(NULL, "sync_32k_ick", &sync_32k_ick, CK_243X | CK_242X),
169 CLK(NULL, "wdt1_ick", &wdt1_ick, CK_243X | CK_242X), 169 CLK(NULL, "wdt1_ick", &wdt1_ick, CK_243X | CK_242X),
170 CLK(NULL, "omapctrl_ick", &omapctrl_ick, CK_243X | CK_242X), 170 CLK(NULL, "omapctrl_ick", &omapctrl_ick, CK_243X | CK_242X),