Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp2721100imj; Mon, 11 Feb 2019 07:29:56 -0800 (PST) X-Google-Smtp-Source: AHgI3IY+8j9Ib2z/v2MfaKnES2BRpELLOobyVk37XDmzYqGrVaiv0MtxI6E627L/0eKRQohh7BWB X-Received: by 2002:a17:902:6502:: with SMTP id b2mr37445793plk.44.1549898996773; Mon, 11 Feb 2019 07:29:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549898996; cv=none; d=google.com; s=arc-20160816; b=om14iRty0QoUKCO1navj5Urbt7xY6aHRG+zXk0Pkm0BSkZT3Wt55zzjTAb0GaxO3tk 5Z1B/fMNgMQWkClVJ90trAoheWQ3pZAiGGbxNjQamf/haSpdM+255D2sT7oImYwk0z63 2cATC/997uo/X9Wy3hyCAeXcCeQkp6mbg9cjhMRdD7mOeatAoMIIqE9jMjsEf4Ko2JeV eXn272pJiiIKKWkTa/ejGfksjb8y/cqrXzQq+IIfi4OLzQw6usep0W0/8mIAmOHdZGub AxIB5BdbHbxSezkFRcOVrJmqx11mU8oexKh/qOlg3S6DLORI147X0iNkOYctk86nxMBY P+Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=mKeGOlR/rzsJh7oBYkTESljUaTL3ZphatSszWoTBVwA=; b=MQjefD1I2GSWzbk8EwYoBqDeD/vakrXV8yeLzILzXpmYbbl+46M2pTRpEXndGq54y0 XOOOZo2+HXzdNepVb/GN84SNXXbo0RoVR6Zxthhr0paNXRzFbNXNrPLH9Tb+sGK7xM0q UV9AaU/nWfysZgLhG7Dp/kLNmxE60h0eUW2Q+QdpL+dsekN/gvR9wVGhGyCwp9it5zbD Khbq2R/qAYMQy2UoJycyE7b4C55KdBXxmTpKAPFi/hvl9UL16IBZBVl7SNlBSb4wqZsn cXtEGU/VAyqSpBLUNZzPIQFmLw8UxzA1ZzgZmiZC0y4AW5XX0jAeudfjRQ/f40gpqI01 wlxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WsMXW6rz; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t11si9033546pgv.251.2019.02.11.07.29.40; Mon, 11 Feb 2019 07:29:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WsMXW6rz; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390407AbfBKP2x (ORCPT + 99 others); Mon, 11 Feb 2019 10:28:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:45788 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389090AbfBKO6N (ORCPT ); Mon, 11 Feb 2019 09:58:13 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CC990222A6; Mon, 11 Feb 2019 14:58:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549897093; bh=l5vx3LgoG1dFp+HxbHEI7mj4ZNN6wXqk30fN8mDcxcY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WsMXW6rzjgllpwSGumYT/F0l+eOEXq+oT06tAi99GtVaXKibeQMDVFh5+VENuhQwy B3BTlj7gAajRNxVvTVczU5fEtr9Iz7JNU+2/7yC+he+vVu/LpYa8YUJKiek4sNC2Bv Y4v6J4vfd4Nk585HQtnZdcwXC18EMcd0lxCZ/ADc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lubomir Rintel , Pavel Machek , Olof Johansson , Sasha Levin Subject: [PATCH 4.14 058/205] ARM: mmp/mmp2: dt: enable the clock Date: Mon, 11 Feb 2019 15:17:36 +0100 Message-Id: <20190211141832.594303634@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141827.214852402@linuxfoundation.org> References: <20190211141827.214852402@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit f36797ee43802b367e59f0f9a9805304a4ff0c98 ] The device-tree booted MMP2 needs to enable the timer clock, otherwise it would stop ticking when the boot finishes. It can also use the clock rate from the clk, the non-DT boards need to keep using the hardcoded rates. Signed-off-by: Lubomir Rintel Acked-by: Pavel Machek Signed-off-by: Olof Johansson Signed-off-by: Sasha Levin --- arch/arm/mach-mmp/common.h | 2 +- arch/arm/mach-mmp/mmp2.c | 2 +- arch/arm/mach-mmp/pxa168.c | 2 +- arch/arm/mach-mmp/time.c | 32 ++++++++++++++++++++------------ 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/arch/arm/mach-mmp/common.h b/arch/arm/mach-mmp/common.h index 7e284d9c429f..5ac2851ef5d3 100644 --- a/arch/arm/mach-mmp/common.h +++ b/arch/arm/mach-mmp/common.h @@ -2,7 +2,7 @@ #include #define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x) -extern void timer_init(int irq); +extern void timer_init(int irq, unsigned long rate); extern void __init mmp_map_io(void); extern void mmp_restart(enum reboot_mode, const char *); diff --git a/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c index afba5460cdaf..fb3e7e32c882 100644 --- a/arch/arm/mach-mmp/mmp2.c +++ b/arch/arm/mach-mmp/mmp2.c @@ -134,7 +134,7 @@ void __init mmp2_timer_init(void) clk_rst = APBC_APBCLK | APBC_FNCLK | APBC_FNCLKSEL(1); __raw_writel(clk_rst, APBC_TIMERS); - timer_init(IRQ_MMP2_TIMER1); + timer_init(IRQ_MMP2_TIMER1, 6500000); } /* on-chip devices */ diff --git a/arch/arm/mach-mmp/pxa168.c b/arch/arm/mach-mmp/pxa168.c index 0f5f16fb8c66..77a358165a56 100644 --- a/arch/arm/mach-mmp/pxa168.c +++ b/arch/arm/mach-mmp/pxa168.c @@ -79,7 +79,7 @@ void __init pxa168_timer_init(void) /* 3.25MHz, bus/functional clock enabled, release reset */ __raw_writel(TIMER_CLK_RST, APBC_TIMERS); - timer_init(IRQ_PXA168_TIMER1); + timer_init(IRQ_PXA168_TIMER1, 6500000); } void pxa168_clear_keypad_wakeup(void) diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c index 96ad1db0b04b..eab0fd8a7343 100644 --- a/arch/arm/mach-mmp/time.c +++ b/arch/arm/mach-mmp/time.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -38,12 +39,6 @@ #include "cputype.h" #include "clock.h" -#ifdef CONFIG_CPU_MMP2 -#define MMP_CLOCK_FREQ 6500000 -#else -#define MMP_CLOCK_FREQ 3250000 -#endif - #define TIMERS_VIRT_BASE TIMERS1_VIRT_BASE #define MAX_DELTA (0xfffffffe) @@ -189,19 +184,18 @@ static struct irqaction timer_irq = { .dev_id = &ckevt, }; -void __init timer_init(int irq) +void __init timer_init(int irq, unsigned long rate) { timer_config(); - sched_clock_register(mmp_read_sched_clock, 32, MMP_CLOCK_FREQ); + sched_clock_register(mmp_read_sched_clock, 32, rate); ckevt.cpumask = cpumask_of(0); setup_irq(irq, &timer_irq); - clocksource_register_hz(&cksrc, MMP_CLOCK_FREQ); - clockevents_config_and_register(&ckevt, MMP_CLOCK_FREQ, - MIN_DELTA, MAX_DELTA); + clocksource_register_hz(&cksrc, rate); + clockevents_config_and_register(&ckevt, rate, MIN_DELTA, MAX_DELTA); } #ifdef CONFIG_OF @@ -213,7 +207,9 @@ static const struct of_device_id mmp_timer_dt_ids[] = { void __init mmp_dt_init_timer(void) { struct device_node *np; + struct clk *clk; int irq, ret; + unsigned long rate; np = of_find_matching_node(NULL, mmp_timer_dt_ids); if (!np) { @@ -221,6 +217,18 @@ void __init mmp_dt_init_timer(void) goto out; } + clk = of_clk_get(np, 0); + if (!IS_ERR(clk)) { + ret = clk_prepare_enable(clk); + if (ret) + goto out; + rate = clk_get_rate(clk) / 2; + } else if (cpu_is_pj4()) { + rate = 6500000; + } else { + rate = 3250000; + } + irq = irq_of_parse_and_map(np, 0); if (!irq) { ret = -EINVAL; @@ -231,7 +239,7 @@ void __init mmp_dt_init_timer(void) ret = -ENOMEM; goto out; } - timer_init(irq); + timer_init(irq, rate); return; out: pr_err("Failed to get timer from device tree with error:%d\n", ret); -- 2.19.1