clocksource/imx: Fix boot with non-DT systems
Subsystems (2)
PATCH 1/1 clocksource/imx: Fix boot with non-DT systems
Commit 6dd747825b20 ("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 6dd747825b20 ("ARM: imx: move timer resources into a structure")
Cc Shawn Guo <[email protected]>
Signed-off-by Guenter Roeck <[email protected]>
--- drivers/clocksource/timer-imx-gpt.c | 1 + 1 file changed, 1 insertion(+)
drivers/clocksource/timer-imx-gpt.c +1 -0
@@ -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); }
Signature · 1 line
2.1.4
tip-bot for Guenter Roeck
merge botclocksource/imx: Fix boot with non-DT systems
Commit-ID: be3b0f9babc0b29931b75f7048d81f966473ce13 Gitweb: http://git.kernel.org/tip/be3b0f9babc0b29931b75f7048d81f966473ce13 Author: Guenter Roeck <[email protected]> AuthorDate: Thu, 20 Aug 2015 03:27:21 -0700 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 20 Aug 2015 17:22:56 +0200
clocksource/imx: Fix boot with non-DT systems
Commit 6dd747825b20 ("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 6dd747825b20 ("ARM: imx: move timer resources into a structure")
Signed-off-by Guenter Roeck <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Daniel Lezcano <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
--- drivers/clocksource/timer-imx-gpt.c | 1 + 1 file changed, 1 insertion(+)
drivers/clocksource/timer-imx-gpt.c +1 -0
@@ -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); }