* [PATCH v2] watchdog: imx: use clk_get to acquire the watchdog clock
@ 2010-12-07 16:16 Fabio Estevam
2010-12-07 16:49 ` Sascha Hauer
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Fabio Estevam @ 2010-12-07 16:16 UTC (permalink / raw)
To: linux-arm-kernel
Use clk_get to acquire the watchdog clock and also avoid hardcoding the clock name.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- adapted the watchdog name in arch/arm/plat-mxc/system.c
arch/arm/mach-imx/clock-imx21.c | 2 +-
arch/arm/mach-imx/clock-imx25.c | 2 +-
arch/arm/mach-imx/clock-imx27.c | 2 +-
arch/arm/mach-mx3/clock-imx31.c | 2 +-
arch/arm/mach-mx3/clock-imx35.c | 2 +-
arch/arm/plat-mxc/system.c | 2 +-
drivers/watchdog/imx2_wdt.c | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-imx/clock-imx21.c b/arch/arm/mach-imx/clock-imx21.c
index cf15ea5..c63a4f5 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[] = {
_REGISTER_CLOCK(NULL, "brom", brom_clk)
_REGISTER_CLOCK(NULL, "emma", emma_clk[0])
_REGISTER_CLOCK(NULL, "slcdc", slcdc_clk[0])
- _REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk)
+ _REGISTER_CLOCK("imx2-wdt.0", NULL, wdog_clk)
_REGISTER_CLOCK(NULL, "gpio", gpio_clk)
_REGISTER_CLOCK("imx-i2c.0", NULL, i2c_clk)
_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 9e4a557..2c98be8 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[] = {
_REGISTER_CLOCK("fec.0", NULL, fec_clk)
_REGISTER_CLOCK("imxdi_rtc.0", NULL, dryice_clk)
_REGISTER_CLOCK("imx-fb.0", NULL, lcdc_clk)
- _REGISTER_CLOCK("imx-wdt.0", NULL, wdt_clk)
+ _REGISTER_CLOCK("imx2-wdt.0", NULL, wdog_clk)
_REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk)
_REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)
_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 2202b88..f32f3b8 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[] = {
_REGISTER_CLOCK(NULL, "sahara2", sahara2_clk)
_REGISTER_CLOCK(NULL, "ata", ata_clk)
_REGISTER_CLOCK(NULL, "mstick", mstick_clk)
- _REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk)
+ _REGISTER_CLOCK("imx2-wdt.0", NULL, wdog_clk)
_REGISTER_CLOCK(NULL, "gpio", gpio_clk)
_REGISTER_CLOCK("imx-i2c.0", NULL, i2c1_clk)
_REGISTER_CLOCK("imx-i2c.1", NULL, i2c2_clk)
diff --git a/arch/arm/mach-mx3/clock-imx31.c b/arch/arm/mach-mx3/clock-imx31.c
index 7cf6d29..4193cf5 100644
--- a/arch/arm/mach-mx3/clock-imx31.c
+++ b/arch/arm/mach-mx3/clock-imx31.c
@@ -530,7 +530,7 @@ static struct clk_lookup lookups[] = {
_REGISTER_CLOCK("imx31-cspi.2", NULL, cspi3_clk)
_REGISTER_CLOCK(NULL, "gpt", gpt_clk)
_REGISTER_CLOCK(NULL, "pwm", pwm_clk)
- _REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk)
+ _REGISTER_CLOCK("imx2-wdt.0", NULL, wdog_clk)
_REGISTER_CLOCK(NULL, "rtc", rtc_clk)
_REGISTER_CLOCK(NULL, "epit", epit1_clk)
_REGISTER_CLOCK(NULL, "epit", epit2_clk)
diff --git a/arch/arm/mach-mx3/clock-imx35.c b/arch/arm/mach-mx3/clock-imx35.c
index 61e4a31..22259d9 100644
--- a/arch/arm/mach-mx3/clock-imx35.c
+++ b/arch/arm/mach-mx3/clock-imx35.c
@@ -495,7 +495,7 @@ static struct clk_lookup lookups[] = {
_REGISTER_CLOCK("mxc-ehci.2", "usb", usbotg_clk)
_REGISTER_CLOCK("fsl-usb2-udc", "usb", usbotg_clk)
_REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", usbahb_clk)
- _REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk)
+ _REGISTER_CLOCK("imx2-wdt.0", NULL, wdog_clk)
_REGISTER_CLOCK(NULL, "max", max_clk)
_REGISTER_CLOCK(NULL, "audmux", audmux_clk)
_REGISTER_CLOCK(NULL, "csi", csi_clk)
diff --git a/arch/arm/plat-mxc/system.c b/arch/arm/plat-mxc/system.c
index c3972c5..3455fc0 100644
--- a/arch/arm/plat-mxc/system.c
+++ b/arch/arm/plat-mxc/system.c
@@ -55,7 +55,7 @@ void arch_reset(char mode, const char *cmd)
} else {
struct clk *clk;
- clk = clk_get_sys("imx-wdt.0", NULL);
+ clk = clk_get_sys("imx2-wdt.0", NULL);
if (!IS_ERR(clk))
clk_enable(clk);
wcr_enable = (1 << 2);
diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index 2ee7dac..86f7cac 100644
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@ -270,7 +270,7 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
return -ENOMEM;
}
- imx2_wdt.clk = clk_get_sys("imx-wdt.0", NULL);
+ imx2_wdt.clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(imx2_wdt.clk)) {
dev_err(&pdev->dev, "can't get Watchdog clock\n");
return PTR_ERR(imx2_wdt.clk);
--
1.6.0.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2] watchdog: imx: use clk_get to acquire the watchdog clock
2010-12-07 16:16 [PATCH v2] watchdog: imx: use clk_get to acquire the watchdog clock Fabio Estevam
@ 2010-12-07 16:49 ` Sascha Hauer
2010-12-07 17:00 ` Wolfram Sang
2010-12-07 17:16 ` [PATCH v2] watchdog: imx: use clk_get to acquire the watchdogclock Fabio Estevam
2010-12-10 13:18 ` [PATCH v2] watchdog: imx: use clk_get to acquire the watchdog clock Wim Van Sebroeck
` (2 subsequent siblings)
3 siblings, 2 replies; 9+ messages in thread
From: Sascha Hauer @ 2010-12-07 16:49 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Dec 07, 2010 at 02:16:04PM -0200, Fabio Estevam wrote:
> Use clk_get to acquire the watchdog clock and also avoid hardcoding the clock name.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> Changes since v1:
> - adapted the watchdog name in arch/arm/plat-mxc/system.c
>
> arch/arm/mach-imx/clock-imx21.c | 2 +-
> arch/arm/mach-imx/clock-imx25.c | 2 +-
> arch/arm/mach-imx/clock-imx27.c | 2 +-
> arch/arm/mach-mx3/clock-imx31.c | 2 +-
> arch/arm/mach-mx3/clock-imx35.c | 2 +-
> arch/arm/plat-mxc/system.c | 2 +-
> drivers/watchdog/imx2_wdt.c | 2 +-
> 7 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm/mach-imx/clock-imx21.c b/arch/arm/mach-imx/clock-imx21.c
> index cf15ea5..c63a4f5 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[] = {
> _REGISTER_CLOCK(NULL, "brom", brom_clk)
> _REGISTER_CLOCK(NULL, "emma", emma_clk[0])
> _REGISTER_CLOCK(NULL, "slcdc", slcdc_clk[0])
> - _REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk)
> + _REGISTER_CLOCK("imx2-wdt.0", NULL, wdog_clk)
> _REGISTER_CLOCK(NULL, "gpio", gpio_clk)
> _REGISTER_CLOCK("imx-i2c.0", NULL, i2c_clk)
> _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 9e4a557..2c98be8 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[] = {
> _REGISTER_CLOCK("fec.0", NULL, fec_clk)
> _REGISTER_CLOCK("imxdi_rtc.0", NULL, dryice_clk)
> _REGISTER_CLOCK("imx-fb.0", NULL, lcdc_clk)
> - _REGISTER_CLOCK("imx-wdt.0", NULL, wdt_clk)
> + _REGISTER_CLOCK("imx2-wdt.0", NULL, wdog_clk)
> _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk)
> _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)
> _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 2202b88..f32f3b8 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[] = {
> _REGISTER_CLOCK(NULL, "sahara2", sahara2_clk)
> _REGISTER_CLOCK(NULL, "ata", ata_clk)
> _REGISTER_CLOCK(NULL, "mstick", mstick_clk)
> - _REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk)
> + _REGISTER_CLOCK("imx2-wdt.0", NULL, wdog_clk)
> _REGISTER_CLOCK(NULL, "gpio", gpio_clk)
> _REGISTER_CLOCK("imx-i2c.0", NULL, i2c1_clk)
> _REGISTER_CLOCK("imx-i2c.1", NULL, i2c2_clk)
> diff --git a/arch/arm/mach-mx3/clock-imx31.c b/arch/arm/mach-mx3/clock-imx31.c
> index 7cf6d29..4193cf5 100644
> --- a/arch/arm/mach-mx3/clock-imx31.c
> +++ b/arch/arm/mach-mx3/clock-imx31.c
> @@ -530,7 +530,7 @@ static struct clk_lookup lookups[] = {
> _REGISTER_CLOCK("imx31-cspi.2", NULL, cspi3_clk)
> _REGISTER_CLOCK(NULL, "gpt", gpt_clk)
> _REGISTER_CLOCK(NULL, "pwm", pwm_clk)
> - _REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk)
> + _REGISTER_CLOCK("imx2-wdt.0", NULL, wdog_clk)
> _REGISTER_CLOCK(NULL, "rtc", rtc_clk)
> _REGISTER_CLOCK(NULL, "epit", epit1_clk)
> _REGISTER_CLOCK(NULL, "epit", epit2_clk)
> diff --git a/arch/arm/mach-mx3/clock-imx35.c b/arch/arm/mach-mx3/clock-imx35.c
> index 61e4a31..22259d9 100644
> --- a/arch/arm/mach-mx3/clock-imx35.c
> +++ b/arch/arm/mach-mx3/clock-imx35.c
> @@ -495,7 +495,7 @@ static struct clk_lookup lookups[] = {
> _REGISTER_CLOCK("mxc-ehci.2", "usb", usbotg_clk)
> _REGISTER_CLOCK("fsl-usb2-udc", "usb", usbotg_clk)
> _REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", usbahb_clk)
> - _REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk)
> + _REGISTER_CLOCK("imx2-wdt.0", NULL, wdog_clk)
> _REGISTER_CLOCK(NULL, "max", max_clk)
> _REGISTER_CLOCK(NULL, "audmux", audmux_clk)
> _REGISTER_CLOCK(NULL, "csi", csi_clk)
> diff --git a/arch/arm/plat-mxc/system.c b/arch/arm/plat-mxc/system.c
> index c3972c5..3455fc0 100644
> --- a/arch/arm/plat-mxc/system.c
> +++ b/arch/arm/plat-mxc/system.c
> @@ -55,7 +55,7 @@ void arch_reset(char mode, const char *cmd)
> } else {
> struct clk *clk;
>
> - clk = clk_get_sys("imx-wdt.0", NULL);
> + clk = clk_get_sys("imx2-wdt.0", NULL);
I should have seen this happen. This breaks i.MX1 reset which uses
imx-wdt.0.
The root cause of this problem is that we have two different watchdog
drivers with two different names but only one reset code for all i.MX.
We could register an additional watchdog clock for all i.MXs and use it
for the reset code.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2] watchdog: imx: use clk_get to acquire the watchdog clock
2010-12-07 16:49 ` Sascha Hauer
@ 2010-12-07 17:00 ` Wolfram Sang
2010-12-07 17:16 ` [PATCH v2] watchdog: imx: use clk_get to acquire the watchdogclock Fabio Estevam
1 sibling, 0 replies; 9+ messages in thread
From: Wolfram Sang @ 2010-12-07 17:00 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Dec 07, 2010 at 05:49:05PM +0100, Sascha Hauer wrote:
> I should have seen this happen. This breaks i.MX1 reset which uses
> imx-wdt.0.
>
> The root cause of this problem is that we have two different watchdog
> drivers with two different names but only one reset code for all i.MX.
> We could register an additional watchdog clock for all i.MXs and use it
> for the reset code.
Actually, there is no wdt-driver for mx1 yet. They _could_ be merged,
but the result will not be pretty.
--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20101207/d1c4df50/attachment.sig>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2] watchdog: imx: use clk_get to acquire the watchdogclock
2010-12-07 16:49 ` Sascha Hauer
2010-12-07 17:00 ` Wolfram Sang
@ 2010-12-07 17:16 ` Fabio Estevam
2010-12-07 18:50 ` Sascha Hauer
1 sibling, 1 reply; 9+ messages in thread
From: Fabio Estevam @ 2010-12-07 17:16 UTC (permalink / raw)
To: linux-arm-kernel
Hi Sascha,
On 12/7/2010 2:49 PM, Sascha Hauer wrote:
...
> I should have seen this happen. This breaks i.MX1 reset which uses
> imx-wdt.0.
I think it doesn?t break current mx1 reset mechanism. Please see the
code below (arcm/arm/plat-mxc/system.c):
if (cpu_is_mx1()) {
wcr_enable = (1 << 0);
} else {
struct clk *clk;
clk = clk_get_sys("imx2-wdt.0", NULL);
if (!IS_ERR(clk))
clk_enable(clk);
wcr_enable = (1 << 2);
}
For mx1 the clk_get_sys function is not called.
Regards,
Fabio Estevam
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2] watchdog: imx: use clk_get to acquire the watchdogclock
2010-12-07 17:16 ` [PATCH v2] watchdog: imx: use clk_get to acquire the watchdogclock Fabio Estevam
@ 2010-12-07 18:50 ` Sascha Hauer
0 siblings, 0 replies; 9+ messages in thread
From: Sascha Hauer @ 2010-12-07 18:50 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Dec 07, 2010 at 03:16:15PM -0200, Fabio Estevam wrote:
> Hi Sascha,
>
> On 12/7/2010 2:49 PM, Sascha Hauer wrote:
> ...
>> I should have seen this happen. This breaks i.MX1 reset which uses
>> imx-wdt.0.
>
> I think it doesn?t break current mx1 reset mechanism. Please see the
> code below (arcm/arm/plat-mxc/system.c):
>
> if (cpu_is_mx1()) {
> wcr_enable = (1 << 0);
> } else {
> struct clk *clk;
>
> clk = clk_get_sys("imx2-wdt.0", NULL);
> if (!IS_ERR(clk))
> clk_enable(clk);
> wcr_enable = (1 << 2);
> }
>
> For mx1 the clk_get_sys function is not called.
Oh, you are right. In this case your patch is ok.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2] watchdog: imx: use clk_get to acquire the watchdog clock
2010-12-07 16:16 [PATCH v2] watchdog: imx: use clk_get to acquire the watchdog clock Fabio Estevam
2010-12-07 16:49 ` Sascha Hauer
@ 2010-12-10 13:18 ` Wim Van Sebroeck
2010-12-13 11:46 ` Sascha Hauer
2010-12-10 13:52 ` Uwe Kleine-König
2010-12-14 8:57 ` Sascha Hauer
3 siblings, 1 reply; 9+ messages in thread
From: Wim Van Sebroeck @ 2010-12-10 13:18 UTC (permalink / raw)
To: linux-arm-kernel
Hi All,
> Use clk_get to acquire the watchdog clock and also avoid hardcoding the clock name.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Wim Van Sebroeck <wim@iguana.be>
Since this looks more arch specific, can this go via the arm kernel tree?
Thanks in advance,
Wim.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2] watchdog: imx: use clk_get to acquire the watchdog clock
2010-12-07 16:16 [PATCH v2] watchdog: imx: use clk_get to acquire the watchdog clock Fabio Estevam
2010-12-07 16:49 ` Sascha Hauer
2010-12-10 13:18 ` [PATCH v2] watchdog: imx: use clk_get to acquire the watchdog clock Wim Van Sebroeck
@ 2010-12-10 13:52 ` Uwe Kleine-König
2010-12-14 8:57 ` Sascha Hauer
3 siblings, 0 replies; 9+ messages in thread
From: Uwe Kleine-König @ 2010-12-10 13:52 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Dec 07, 2010 at 02:16:04PM -0200, Fabio Estevam wrote:
> Use clk_get to acquire the watchdog clock and also avoid hardcoding the clock name.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2] watchdog: imx: use clk_get to acquire the watchdog clock
2010-12-10 13:18 ` [PATCH v2] watchdog: imx: use clk_get to acquire the watchdog clock Wim Van Sebroeck
@ 2010-12-13 11:46 ` Sascha Hauer
0 siblings, 0 replies; 9+ messages in thread
From: Sascha Hauer @ 2010-12-13 11:46 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Dec 10, 2010 at 02:18:37PM +0100, Wim Van Sebroeck wrote:
> Hi All,
>
> > Use clk_get to acquire the watchdog clock and also avoid hardcoding the clock name.
> >
> > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
>
> Acked-by: Wim Van Sebroeck <wim@iguana.be>
>
> Since this looks more arch specific, can this go via the arm kernel tree?
Yes, please. I already scheduled this.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2] watchdog: imx: use clk_get to acquire the watchdog clock
2010-12-07 16:16 [PATCH v2] watchdog: imx: use clk_get to acquire the watchdog clock Fabio Estevam
` (2 preceding siblings ...)
2010-12-10 13:52 ` Uwe Kleine-König
@ 2010-12-14 8:57 ` Sascha Hauer
3 siblings, 0 replies; 9+ messages in thread
From: Sascha Hauer @ 2010-12-14 8:57 UTC (permalink / raw)
To: linux-arm-kernel
Hi Fabio,
On Tue, Dec 07, 2010 at 02:16:04PM -0200, Fabio Estevam wrote:
> Use clk_get to acquire the watchdog clock and also avoid hardcoding the clock name.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> Changes since v1:
> - adapted the watchdog name in arch/arm/plat-mxc/system.c
>
> arch/arm/mach-imx/clock-imx21.c | 2 +-
> arch/arm/mach-imx/clock-imx25.c | 2 +-
> arch/arm/mach-imx/clock-imx27.c | 2 +-
> arch/arm/mach-mx3/clock-imx31.c | 2 +-
> arch/arm/mach-mx3/clock-imx35.c | 2 +-
> arch/arm/plat-mxc/system.c | 2 +-
> drivers/watchdog/imx2_wdt.c | 2 +-
> 7 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm/mach-imx/clock-imx21.c b/arch/arm/mach-imx/clock-imx21.c
> index cf15ea5..c63a4f5 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[] = {
> _REGISTER_CLOCK(NULL, "brom", brom_clk)
> _REGISTER_CLOCK(NULL, "emma", emma_clk[0])
> _REGISTER_CLOCK(NULL, "slcdc", slcdc_clk[0])
> - _REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk)
> + _REGISTER_CLOCK("imx2-wdt.0", NULL, wdog_clk)
> _REGISTER_CLOCK(NULL, "gpio", gpio_clk)
> _REGISTER_CLOCK("imx-i2c.0", NULL, i2c_clk)
> _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 9e4a557..2c98be8 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[] = {
> _REGISTER_CLOCK("fec.0", NULL, fec_clk)
> _REGISTER_CLOCK("imxdi_rtc.0", NULL, dryice_clk)
> _REGISTER_CLOCK("imx-fb.0", NULL, lcdc_clk)
> - _REGISTER_CLOCK("imx-wdt.0", NULL, wdt_clk)
> + _REGISTER_CLOCK("imx2-wdt.0", NULL, wdog_clk)
This breaks compilation on i.MX25. I updated the patch to fix this.
Sascha
> _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk)
> _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)
> _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 2202b88..f32f3b8 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[] = {
> _REGISTER_CLOCK(NULL, "sahara2", sahara2_clk)
> _REGISTER_CLOCK(NULL, "ata", ata_clk)
> _REGISTER_CLOCK(NULL, "mstick", mstick_clk)
> - _REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk)
> + _REGISTER_CLOCK("imx2-wdt.0", NULL, wdog_clk)
> _REGISTER_CLOCK(NULL, "gpio", gpio_clk)
> _REGISTER_CLOCK("imx-i2c.0", NULL, i2c1_clk)
> _REGISTER_CLOCK("imx-i2c.1", NULL, i2c2_clk)
> diff --git a/arch/arm/mach-mx3/clock-imx31.c b/arch/arm/mach-mx3/clock-imx31.c
> index 7cf6d29..4193cf5 100644
> --- a/arch/arm/mach-mx3/clock-imx31.c
> +++ b/arch/arm/mach-mx3/clock-imx31.c
> @@ -530,7 +530,7 @@ static struct clk_lookup lookups[] = {
> _REGISTER_CLOCK("imx31-cspi.2", NULL, cspi3_clk)
> _REGISTER_CLOCK(NULL, "gpt", gpt_clk)
> _REGISTER_CLOCK(NULL, "pwm", pwm_clk)
> - _REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk)
> + _REGISTER_CLOCK("imx2-wdt.0", NULL, wdog_clk)
> _REGISTER_CLOCK(NULL, "rtc", rtc_clk)
> _REGISTER_CLOCK(NULL, "epit", epit1_clk)
> _REGISTER_CLOCK(NULL, "epit", epit2_clk)
> diff --git a/arch/arm/mach-mx3/clock-imx35.c b/arch/arm/mach-mx3/clock-imx35.c
> index 61e4a31..22259d9 100644
> --- a/arch/arm/mach-mx3/clock-imx35.c
> +++ b/arch/arm/mach-mx3/clock-imx35.c
> @@ -495,7 +495,7 @@ static struct clk_lookup lookups[] = {
> _REGISTER_CLOCK("mxc-ehci.2", "usb", usbotg_clk)
> _REGISTER_CLOCK("fsl-usb2-udc", "usb", usbotg_clk)
> _REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", usbahb_clk)
> - _REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk)
> + _REGISTER_CLOCK("imx2-wdt.0", NULL, wdog_clk)
> _REGISTER_CLOCK(NULL, "max", max_clk)
> _REGISTER_CLOCK(NULL, "audmux", audmux_clk)
> _REGISTER_CLOCK(NULL, "csi", csi_clk)
> diff --git a/arch/arm/plat-mxc/system.c b/arch/arm/plat-mxc/system.c
> index c3972c5..3455fc0 100644
> --- a/arch/arm/plat-mxc/system.c
> +++ b/arch/arm/plat-mxc/system.c
> @@ -55,7 +55,7 @@ void arch_reset(char mode, const char *cmd)
> } else {
> struct clk *clk;
>
> - clk = clk_get_sys("imx-wdt.0", NULL);
> + clk = clk_get_sys("imx2-wdt.0", NULL);
> if (!IS_ERR(clk))
> clk_enable(clk);
> wcr_enable = (1 << 2);
> diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
> index 2ee7dac..86f7cac 100644
> --- a/drivers/watchdog/imx2_wdt.c
> +++ b/drivers/watchdog/imx2_wdt.c
> @@ -270,7 +270,7 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
> return -ENOMEM;
> }
>
> - imx2_wdt.clk = clk_get_sys("imx-wdt.0", NULL);
> + imx2_wdt.clk = clk_get(&pdev->dev, NULL);
> if (IS_ERR(imx2_wdt.clk)) {
> dev_err(&pdev->dev, "can't get Watchdog clock\n");
> return PTR_ERR(imx2_wdt.clk);
> --
> 1.6.0.4
>
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2010-12-14 8:57 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-07 16:16 [PATCH v2] watchdog: imx: use clk_get to acquire the watchdog clock Fabio Estevam
2010-12-07 16:49 ` Sascha Hauer
2010-12-07 17:00 ` Wolfram Sang
2010-12-07 17:16 ` [PATCH v2] watchdog: imx: use clk_get to acquire the watchdogclock Fabio Estevam
2010-12-07 18:50 ` Sascha Hauer
2010-12-10 13:18 ` [PATCH v2] watchdog: imx: use clk_get to acquire the watchdog clock Wim Van Sebroeck
2010-12-13 11:46 ` Sascha Hauer
2010-12-10 13:52 ` Uwe Kleine-König
2010-12-14 8:57 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).