diff options
| author | Russell King | 2009-01-23 13:48:37 +0100 |
|---|---|---|
| committer | Russell King | 2009-02-08 18:50:16 +0100 |
| commit | 4c5e1946b5f89c33e3bc8ed73fa7ba8f31e37cc5 (patch) | |
| tree | fb8892538fc97ce6d6836c8f82b9342a55e3e970 /arch/arm/mach-omap1/clock.c | |
| parent | [ARM] omap: watchdog: convert clocks to match by devid and conid (diff) | |
| download | kernel-qcow2-linux-4c5e1946b5f89c33e3bc8ed73fa7ba8f31e37cc5.tar.gz kernel-qcow2-linux-4c5e1946b5f89c33e3bc8ed73fa7ba8f31e37cc5.tar.xz kernel-qcow2-linux-4c5e1946b5f89c33e3bc8ed73fa7ba8f31e37cc5.zip | |
[ARM] omap: watchdog: provide a dummy ick for OMAP1
Eliminate the OMAP1 vs OMAP2 clock knowledge in the watchdog driver.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap1/clock.c')
| -rw-r--r-- | arch/arm/mach-omap1/clock.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index 8ae7827bb8b8..758abaadaf37 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c @@ -86,6 +86,8 @@ static struct omap_clk omap_clks[] = { CLK(NULL, "armxor_ck", &armxor_ck.clk, CK_16XX | CK_1510 | CK_310), CLK(NULL, "armtim_ck", &armtim_ck.clk, CK_16XX | CK_1510 | CK_310), CLK("omap_wdt", "fck", &armwdt_ck.clk, CK_16XX | CK_1510 | CK_310), + CLK("omap_wdt", "ick", &armper_ck.clk, CK_16XX), + CLK("omap_wdt", "ick", &dummy_ck, CK_1510 | CK_310), CLK(NULL, "arminth_ck", &arminth_ck1510, CK_1510 | CK_310), CLK(NULL, "arminth_ck", &arminth_ck16xx, CK_16XX), /* CK_GEN2 clocks */ |