diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2010-12-07 11:16:04 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-12-14 03:54:19 -0500 |
commit | 2c1f4672f0711e7f23ae49cbb7541088126fe576 (patch) | |
tree | 2e72446f10f1b0a07bbe470c1f24025516f9cfe4 /arch/arm/mach-imx | |
parent | a96efbc1fc8e4540dc1d561bb5e42a16a7b472d5 (diff) |
watchdog: imx: use clk_get to acquire the watchdog clock
Use clk_get to acquire the watchdog clock and also avoid hardcoding the clock name.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r-- | arch/arm/mach-imx/clock-imx21.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/clock-imx25.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/clock-imx27.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/clock-imx21.c b/arch/arm/mach-imx/clock-imx21.c index cf15ea516a72..c63a4f5ffcb6 100644 --- a/arch/arm/mach-imx/clock-imx21.c +++ b/arch/arm/mach-imx/clock-imx21.c | |||
@@ -1185,7 +1185,7 @@ static struct clk_lookup lookups[] = { | |||
1185 | _REGISTER_CLOCK(NULL, "brom", brom_clk) | 1185 | _REGISTER_CLOCK(NULL, "brom", brom_clk) |
1186 | _REGISTER_CLOCK(NULL, "emma", emma_clk[0]) | 1186 | _REGISTER_CLOCK(NULL, "emma", emma_clk[0]) |
1187 | _REGISTER_CLOCK(NULL, "slcdc", slcdc_clk[0]) | 1187 | _REGISTER_CLOCK(NULL, "slcdc", slcdc_clk[0]) |
1188 | _REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk) | 1188 | _REGISTER_CLOCK("imx2-wdt.0", NULL, wdog_clk) |
1189 | _REGISTER_CLOCK(NULL, "gpio", gpio_clk) | 1189 | _REGISTER_CLOCK(NULL, "gpio", gpio_clk) |
1190 | _REGISTER_CLOCK("imx-i2c.0", NULL, i2c_clk) | 1190 | _REGISTER_CLOCK("imx-i2c.0", NULL, i2c_clk) |
1191 | _REGISTER_CLOCK("mxc-keypad", NULL, kpp_clk) | 1191 | _REGISTER_CLOCK("mxc-keypad", NULL, kpp_clk) |
diff --git a/arch/arm/mach-imx/clock-imx25.c b/arch/arm/mach-imx/clock-imx25.c index 9e4a5578c2fb..21ef34c501e5 100644 --- a/arch/arm/mach-imx/clock-imx25.c +++ b/arch/arm/mach-imx/clock-imx25.c | |||
@@ -296,7 +296,7 @@ static struct clk_lookup lookups[] = { | |||
296 | _REGISTER_CLOCK("fec.0", NULL, fec_clk) | 296 | _REGISTER_CLOCK("fec.0", NULL, fec_clk) |
297 | _REGISTER_CLOCK("imxdi_rtc.0", NULL, dryice_clk) | 297 | _REGISTER_CLOCK("imxdi_rtc.0", NULL, dryice_clk) |
298 | _REGISTER_CLOCK("imx-fb.0", NULL, lcdc_clk) | 298 | _REGISTER_CLOCK("imx-fb.0", NULL, lcdc_clk) |
299 | _REGISTER_CLOCK("imx-wdt.0", NULL, wdt_clk) | 299 | _REGISTER_CLOCK("imx2-wdt.0", NULL, wdt_clk) |
300 | _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) | 300 | _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) |
301 | _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) | 301 | _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) |
302 | _REGISTER_CLOCK("sdhci-esdhc-imx.0", NULL, esdhc1_clk) | 302 | _REGISTER_CLOCK("sdhci-esdhc-imx.0", NULL, esdhc1_clk) |
diff --git a/arch/arm/mach-imx/clock-imx27.c b/arch/arm/mach-imx/clock-imx27.c index 2202b88667b5..f32f3b8e8ba4 100644 --- a/arch/arm/mach-imx/clock-imx27.c +++ b/arch/arm/mach-imx/clock-imx27.c | |||
@@ -667,7 +667,7 @@ static struct clk_lookup lookups[] = { | |||
667 | _REGISTER_CLOCK(NULL, "sahara2", sahara2_clk) | 667 | _REGISTER_CLOCK(NULL, "sahara2", sahara2_clk) |
668 | _REGISTER_CLOCK(NULL, "ata", ata_clk) | 668 | _REGISTER_CLOCK(NULL, "ata", ata_clk) |
669 | _REGISTER_CLOCK(NULL, "mstick", mstick_clk) | 669 | _REGISTER_CLOCK(NULL, "mstick", mstick_clk) |
670 | _REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk) | 670 | _REGISTER_CLOCK("imx2-wdt.0", NULL, wdog_clk) |
671 | _REGISTER_CLOCK(NULL, "gpio", gpio_clk) | 671 | _REGISTER_CLOCK(NULL, "gpio", gpio_clk) |
672 | _REGISTER_CLOCK("imx-i2c.0", NULL, i2c1_clk) | 672 | _REGISTER_CLOCK("imx-i2c.0", NULL, i2c1_clk) |
673 | _REGISTER_CLOCK("imx-i2c.1", NULL, i2c2_clk) | 673 | _REGISTER_CLOCK("imx-i2c.1", NULL, i2c2_clk) |