Commit 2c1f4672f0711e7f23ae49cbb7541088126fe576
Committed by
Sascha Hauer
1 parent
a96efbc1fc
Exists in
master
and in
7 other branches
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>
Showing 8 changed files with 9 additions and 9 deletions Side-by-side Diff
arch/arm/mach-imx/clock-imx21.c
... | ... | @@ -1185,7 +1185,7 @@ |
1185 | 1185 | _REGISTER_CLOCK(NULL, "brom", brom_clk) |
1186 | 1186 | _REGISTER_CLOCK(NULL, "emma", emma_clk[0]) |
1187 | 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 | 1189 | _REGISTER_CLOCK(NULL, "gpio", gpio_clk) |
1190 | 1190 | _REGISTER_CLOCK("imx-i2c.0", NULL, i2c_clk) |
1191 | 1191 | _REGISTER_CLOCK("mxc-keypad", NULL, kpp_clk) |
arch/arm/mach-imx/clock-imx25.c
... | ... | @@ -296,7 +296,7 @@ |
296 | 296 | _REGISTER_CLOCK("fec.0", NULL, fec_clk) |
297 | 297 | _REGISTER_CLOCK("imxdi_rtc.0", NULL, dryice_clk) |
298 | 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 | 300 | _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) |
301 | 301 | _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) |
302 | 302 | _REGISTER_CLOCK("sdhci-esdhc-imx.0", NULL, esdhc1_clk) |
arch/arm/mach-imx/clock-imx27.c
... | ... | @@ -667,7 +667,7 @@ |
667 | 667 | _REGISTER_CLOCK(NULL, "sahara2", sahara2_clk) |
668 | 668 | _REGISTER_CLOCK(NULL, "ata", ata_clk) |
669 | 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 | 671 | _REGISTER_CLOCK(NULL, "gpio", gpio_clk) |
672 | 672 | _REGISTER_CLOCK("imx-i2c.0", NULL, i2c1_clk) |
673 | 673 | _REGISTER_CLOCK("imx-i2c.1", NULL, i2c2_clk) |
arch/arm/mach-mx3/clock-imx31.c
... | ... | @@ -530,7 +530,7 @@ |
530 | 530 | _REGISTER_CLOCK("imx31-cspi.2", NULL, cspi3_clk) |
531 | 531 | _REGISTER_CLOCK(NULL, "gpt", gpt_clk) |
532 | 532 | _REGISTER_CLOCK(NULL, "pwm", pwm_clk) |
533 | - _REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk) | |
533 | + _REGISTER_CLOCK("imx2-wdt.0", NULL, wdog_clk) | |
534 | 534 | _REGISTER_CLOCK(NULL, "rtc", rtc_clk) |
535 | 535 | _REGISTER_CLOCK(NULL, "epit", epit1_clk) |
536 | 536 | _REGISTER_CLOCK(NULL, "epit", epit2_clk) |
arch/arm/mach-mx3/clock-imx35.c
... | ... | @@ -495,7 +495,7 @@ |
495 | 495 | _REGISTER_CLOCK("mxc-ehci.2", "usb", usbotg_clk) |
496 | 496 | _REGISTER_CLOCK("fsl-usb2-udc", "usb", usbotg_clk) |
497 | 497 | _REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", usbahb_clk) |
498 | - _REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk) | |
498 | + _REGISTER_CLOCK("imx2-wdt.0", NULL, wdog_clk) | |
499 | 499 | _REGISTER_CLOCK(NULL, "max", max_clk) |
500 | 500 | _REGISTER_CLOCK(NULL, "audmux", audmux_clk) |
501 | 501 | _REGISTER_CLOCK(NULL, "csi", csi_clk) |
arch/arm/mach-mx5/clock-mx51-mx53.c
... | ... | @@ -1110,8 +1110,8 @@ |
1110 | 1110 | _REGISTER_CLOCK("sdhci-esdhc-imx.1", NULL, esdhc2_clk) |
1111 | 1111 | _REGISTER_CLOCK(NULL, "cpu_clk", cpu_clk) |
1112 | 1112 | _REGISTER_CLOCK(NULL, "iim_clk", iim_clk) |
1113 | - _REGISTER_CLOCK("imx-wdt.0", NULL, dummy_clk) | |
1114 | - _REGISTER_CLOCK("imx-wdt.1", NULL, dummy_clk) | |
1113 | + _REGISTER_CLOCK("imx2-wdt.0", NULL, dummy_clk) | |
1114 | + _REGISTER_CLOCK("imx2-wdt.1", NULL, dummy_clk) | |
1115 | 1115 | }; |
1116 | 1116 | |
1117 | 1117 | static struct clk_lookup mx53_lookups[] = { |
arch/arm/plat-mxc/system.c
drivers/watchdog/imx2_wdt.c
... | ... | @@ -270,7 +270,7 @@ |
270 | 270 | return -ENOMEM; |
271 | 271 | } |
272 | 272 | |
273 | - imx2_wdt.clk = clk_get_sys("imx-wdt.0", NULL); | |
273 | + imx2_wdt.clk = clk_get(&pdev->dev, NULL); | |
274 | 274 | if (IS_ERR(imx2_wdt.clk)) { |
275 | 275 | dev_err(&pdev->dev, "can't get Watchdog clock\n"); |
276 | 276 | return PTR_ERR(imx2_wdt.clk); |