From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753607AbbHTP2B (ORCPT ); Thu, 20 Aug 2015 11:28:01 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38488 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753290AbbHTP17 (ORCPT ); Thu, 20 Aug 2015 11:27:59 -0400 Date: Thu, 20 Aug 2015 08:27:32 -0700 From: tip-bot for Guenter Roeck Message-ID: Cc: shawn.guo@linaro.org, linux-kernel@vger.kernel.org, linux@roeck-us.net, daniel.lezcano@linaro.org, mingo@kernel.org, hpa@zytor.com, tglx@linutronix.de Reply-To: hpa@zytor.com, tglx@linutronix.de, shawn.guo@linaro.org, linux-kernel@vger.kernel.org, mingo@kernel.org, daniel.lezcano@linaro.org, linux@roeck-us.net In-Reply-To: <1440066441-13930-1-git-send-email-linux@roeck-us.net> References: <1440066441-13930-1-git-send-email-linux@roeck-us.net> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/urgent] clocksource/imx: Fix boot with non-DT systems Git-Commit-ID: be3b0f9babc0b29931b75f7048d81f966473ce13 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: be3b0f9babc0b29931b75f7048d81f966473ce13 Gitweb: http://git.kernel.org/tip/be3b0f9babc0b29931b75f7048d81f966473ce13 Author: Guenter Roeck AuthorDate: Thu, 20 Aug 2015 03:27:21 -0700 Committer: Thomas Gleixner 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 Cc: Shawn Guo Cc: Daniel Lezcano Link: http://lkml.kernel.org/r/1440066441-13930-1-git-send-email-linux@roeck-us.net Signed-off-by: Thomas Gleixner --- drivers/clocksource/timer-imx-gpt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c index 2d59038..86c7eb6 100644 --- a/drivers/clocksource/timer-imx-gpt.c +++ b/drivers/clocksource/timer-imx-gpt.c @@ -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); }