From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752862AbbL2Kp5 (ORCPT ); Tue, 29 Dec 2015 05:45:57 -0500 Received: from terminus.zytor.com ([198.137.202.10]:57027 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751984AbbL2Kpz (ORCPT ); Tue, 29 Dec 2015 05:45:55 -0500 Date: Tue, 29 Dec 2015 02:45:37 -0800 From: tip-bot for Eric Anholt Message-ID: Cc: tglx@linutronix.de, swarren@wwwdotorg.org, lee@kernel.org, linux-kernel@vger.kernel.org, jason@lakedaemon.net, f.fainelli@gmail.com, mingo@kernel.org, eric@anholt.net, hpa@zytor.com, marc.zyngier@arm.com Reply-To: marc.zyngier@arm.com, hpa@zytor.com, mingo@kernel.org, eric@anholt.net, linux-kernel@vger.kernel.org, f.fainelli@gmail.com, jason@lakedaemon.net, tglx@linutronix.de, lee@kernel.org, swarren@wwwdotorg.org In-Reply-To: <1451166444-11044-2-git-send-email-eric@anholt.net> References: <1451166444-11044-2-git-send-email-eric@anholt.net> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] irqchip/bcm2836: Fix initialization of the LOCAL_IRQ_CNT timers Git-Commit-ID: 401667bb8a2e0825090c5e6c15b899c1c36a4773 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: 401667bb8a2e0825090c5e6c15b899c1c36a4773 Gitweb: http://git.kernel.org/tip/401667bb8a2e0825090c5e6c15b899c1c36a4773 Author: Eric Anholt AuthorDate: Sat, 26 Dec 2015 13:47:21 -0800 Committer: Thomas Gleixner CommitDate: Tue, 29 Dec 2015 11:40:45 +0100 irqchip/bcm2836: Fix initialization of the LOCAL_IRQ_CNT timers The irqchip's register area includes the the setup for the timer's scaling factors, and for the platform we want a fixed configuration of these registers. Signed-off-by: Eric Anholt Cc: linux-arm-kernel@lists.infradead.org Cc: Stephen Warren Cc: Lee Jones Cc: Florian Fainelli Cc: Jason Cooper Cc: Marc Zyngier Cc: linux-rpi-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/1451166444-11044-2-git-send-email-eric@anholt.net Signed-off-by: Thomas Gleixner --- drivers/irqchip/irq-bcm2836.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c index f687082..6ec125e 100644 --- a/drivers/irqchip/irq-bcm2836.c +++ b/drivers/irqchip/irq-bcm2836.c @@ -21,6 +21,9 @@ #include #include +#define LOCAL_CONTROL 0x000 +#define LOCAL_PRESCALER 0x008 + /* * The low 2 bits identify the CPU that the GPU IRQ goes to, and the * next 2 bits identify the CPU that the GPU FIQ goes to. @@ -237,6 +240,27 @@ bcm2836_arm_irqchip_smp_init(void) #endif } +/* + * The LOCAL_IRQ_CNT* timer firings are based off of the external + * oscillator with some scaling. The firmware sets up CNTFRQ to + * report 19.2Mhz, but doesn't set up the scaling registers. + */ +static void bcm2835_init_local_timer_frequency(void) +{ + /* + * Set the timer to source from the 19.2Mhz crystal clock (bit + * 8 unset), and only increment by 1 instead of 2 (bit 9 + * unset). + */ + writel(0, intc.base + LOCAL_CONTROL); + + /* + * Set the timer prescaler to 1:1 (timer freq = input freq * + * 2**31 / prescaler) + */ + writel(0x80000000, intc.base + LOCAL_PRESCALER); +} + static int __init bcm2836_arm_irqchip_l1_intc_of_init(struct device_node *node, struct device_node *parent) { @@ -246,6 +270,8 @@ static int __init bcm2836_arm_irqchip_l1_intc_of_init(struct device_node *node, node->full_name); } + bcm2835_init_local_timer_frequency(); + intc.domain = irq_domain_add_linear(node, LAST_IRQ + 1, &bcm2836_arm_irqchip_intc_ops, NULL);