Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be3b0f9b authored by Guenter Roeck's avatar Guenter Roeck Committed by Thomas Gleixner
Browse files

clocksource/imx: Fix boot with non-DT systems 



Commit 6dd74782 ("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: 6dd74782 ("ARM: imx: move timer resources into a structure")
Signed-off-by: default avatarGuenter 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: default avatarThomas Gleixner <tglx@linutronix.de>
parent d0023a14

drivers/clocksource/timer-imx-gpt.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

}