Skip to content

Commit

Permalink
clocksource/imx: Fix boot with non-DT systems
Browse files Browse the repository at this point in the history
Commit 6dd7478 ("ARM: imx: move timer resources into a structure")
moved initialization parameters into a data structure, but neglected to set
the irq field in that data structure for non-DT boots. This causes the system
to hang if a non-DT boot is attempted.

Fixes: 6dd7478 ("ARM: imx: move timer resources into a structure")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: http://lkml.kernel.org/r/1440066441-13930-1-git-send-email-linux@roeck-us.net
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Guenter Roeck authored and Thomas Gleixner committed Aug 20, 2015
1 parent d0023a1 commit be3b0f9
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions drivers/clocksource/timer-imx-gpt.c
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,7 @@ void __init mxc_timer_init(unsigned long pbase, int irq, enum imx_gpt_type type)
BUG_ON(!imxtm->base);

imxtm->type = type;
imxtm->irq = irq;

_mxc_timer_init(imxtm);
}
Expand Down

0 comments on commit be3b0f9

Please sign in to comment.