aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx2
diff options
context:
space:
mode:
authorValentin Longchamp <valentin.longchamp@epfl.ch>2009-10-08 18:12:24 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2009-10-13 10:24:10 +0200
commit679bfef0e366109483981899401b98b8a65ed06c (patch)
treef3e848bc03ee647d6ef62ca3fe029ec92388b297 /arch/arm/mach-mx2
parentd9e8b88478be7c8cd3fab91213c05e6194de294e (diff)
downloadkernel_samsung_tuna-679bfef0e366109483981899401b98b8a65ed06c.zip
kernel_samsung_tuna-679bfef0e366109483981899401b98b8a65ed06c.tar.gz
kernel_samsung_tuna-679bfef0e366109483981899401b98b8a65ed06c.tar.bz2
MXC: fix reset for mx31, mx35 and mx27 SoCs
The clock name for the watchdog devices was not set consistently with mx21 on these platforms, resulting in the reset not to work. Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx2')
-rw-r--r--arch/arm/mach-mx2/clock_imx27.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx2/clock_imx27.c b/arch/arm/mach-mx2/clock_imx27.c
index 174fa3e..ff5e332 100644
--- a/arch/arm/mach-mx2/clock_imx27.c
+++ b/arch/arm/mach-mx2/clock_imx27.c
@@ -665,7 +665,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(NULL, "wdog", wdog_clk)
+ _REGISTER_CLOCK("imx-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)