diff options
| author | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-03-26 10:50:45 +0100 |
|---|---|---|
| committer | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-03-26 10:53:53 +0100 |
| commit | 614eef6720756a1c6e4718668c83088b4807a55f (patch) | |
| tree | c9aa48a8ec6ba85ac7423b94692d28b5e05beb2b | |
| parent | 6bd07c4b452992ae91dd933bc1fe34c7d665f219 (diff) | |
ccwmx51: The iMX51 does not define a wdog clock
Downgrade the warning message from the generic mxc watchdog driver to
debug level.
Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
| -rw-r--r-- | arch/arm/plat-mxc/clock.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/wdog.c | 4 | ||||
| -rw-r--r-- | drivers/watchdog/mxc_wdt.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/plat-mxc/clock.c b/arch/arm/plat-mxc/clock.c index b980a1779e37..8a282da7efe1 100644 --- a/arch/arm/plat-mxc/clock.c +++ b/arch/arm/plat-mxc/clock.c @@ -123,7 +123,7 @@ struct clk *clk_get(struct device *dev, const char *id) } } - printk(KERN_WARNING "clk: Unable to get requested clock: %s\n", id); + printk(KERN_DEBUG "clk: Unable to get requested clock: %s\n", id); found: mutex_unlock(&clocks_mutex); diff --git a/arch/arm/plat-mxc/wdog.c b/arch/arm/plat-mxc/wdog.c index 8f242e707f58..9b9aa49964e6 100644 --- a/arch/arm/plat-mxc/wdog.c +++ b/arch/arm/plat-mxc/wdog.c @@ -26,6 +26,7 @@ #include <linux/irq.h> #include <linux/clk.h> #include <linux/io.h> +#include <linux/err.h> #include <mach/hardware.h> #define WDOG_WT 0x8 /* WDOG WT starting bit inside WCR */ @@ -60,7 +61,8 @@ void mxc_wd_reset(void) struct clk *clk; clk = clk_get(NULL, "wdog_clk"); - clk_enable(clk); + if( !IS_ERR(clk) ) + clk_enable(clk); reg = __raw_readw(wdog_base[0] + WDOG_WCR) & ~WCR_SRS_BIT; reg |= WCR_WDE_BIT; diff --git a/drivers/watchdog/mxc_wdt.c b/drivers/watchdog/mxc_wdt.c index 234ddfc0ebb9..8c58cecb984f 100644 --- a/drivers/watchdog/mxc_wdt.c +++ b/drivers/watchdog/mxc_wdt.c @@ -277,7 +277,8 @@ static int __init mxc_wdt_probe(struct platform_device *pdev) mxc_wdt_miscdev.this_device = &pdev->dev; mxc_wdt_clk = clk_get(NULL, "wdog_clk"); - clk_enable(mxc_wdt_clk); + if( !IS_ERR(mxc_wdt_clk) ) + clk_enable(mxc_wdt_clk); ret = misc_register(&mxc_wdt_miscdev); if (ret) |