[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>

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[] = {
         CLK(NULL,       "uart3_fck",    &uart3_fck,     CK_243X | CK_242X),
         CLK(NULL,       "gpios_ick",    &gpios_ick,     CK_243X | CK_242X),
         CLK(NULL,       "gpios_fck",    &gpios_fck,     CK_243X | CK_242X),
-        CLK(NULL,       "mpu_wdt_ick",  &mpu_wdt_ick,   CK_243X | CK_242X),
-        CLK(NULL,       "mpu_wdt_fck",  &mpu_wdt_fck,   CK_243X | CK_242X),
+        CLK("omap_wdt", "ick",          &mpu_wdt_ick,   CK_243X | CK_242X),
+        CLK("omap_wdt", "fck",          &mpu_wdt_fck,   CK_243X | CK_242X),
         CLK(NULL,       "sync_32k_ick", &sync_32k_ick,  CK_243X | CK_242X),
         CLK(NULL,       "wdt1_ick",     &wdt1_ick,      CK_243X | CK_242X),
         CLK(NULL,       "omapctrl_ick", &omapctrl_ick,  CK_243X | CK_242X),