Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp2720786imj; Mon, 11 Feb 2019 07:29:40 -0800 (PST) X-Google-Smtp-Source: AHgI3IYEPq0KMMjHU+tOLxGuZDTq7B7LMezKj3JCySHMXBsMLu9oIebxjPUryAn87I3NtoOg71AQ X-Received: by 2002:a63:fb0a:: with SMTP id o10mr17975769pgh.259.1549898980695; Mon, 11 Feb 2019 07:29:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549898980; cv=none; d=google.com; s=arc-20160816; b=0ce/rZ1yU81J7OQT9t7fkcfsmTjbvG9VUGXYPcUx8eqSTU24avWxa1fGxvmvBXVJ+1 VQiaSpuaFN7mdWkRoTn+lqGQTuvuzk7YzhiXI8DCcIKVB9FHfT/ny5ZKF196wP8sUKiA Q8qH4X3grF55yq7vwTJCmJMjaY5OlcLgZbkK+IcfjTndNOIQB61f5FyzlYFOz6jrny6g c4NJjLOiy70i7MVA34lxM+yXIa4fKzE7KWPPAp7lHzeY5sW4G+T1WvX8YN2ZcsbI6Lyu qil8cpVtX77pMe7OQ7wID2v3+J+cRXPQDttx75sBuSPhxLqqm7oYlhhWMt6lgkKP15yK ZCYA== 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=BCo12gdteDN0BNldJP4sk+3AwnWH2duVyBfTtZUlYKg=; b=Dn0cBVgDudRxMIV4K5R36buU1ido/ai3gNOZjWtPH728jXpgjokxDfvFKQ75vleyuG W2vfizawNiJpMHIisPWVASflLsSAOKxyo+NIkGhGcGpAosFCgEf0fbSEbrAFVsG3xBSM Jj5NpS8YPSD/FFZ/G8Vq85ZsnJ4amHVGkcGLTxRbKyyHkwHhzsr8EEStH23GtrdJQF98 hiinPfgexyq/Aq+1KSopAIfm9j7xILYlAA6Qyke8o9TG5djF8MoQguRnbddzN71TFfSp oyYjPyUOO5XDvFVWraCmb6OdkT5SfMbc8hqHQU7/kTmnSZH2mMsvLp2ODn1GrEQBLaaG I7Xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="ayouS/wN"; 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 j127si9726530pgc.444.2019.02.11.07.29.23; Mon, 11 Feb 2019 07:29:40 -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="ayouS/wN"; 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 S2389548AbfBKO62 (ORCPT + 99 others); Mon, 11 Feb 2019 09:58:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:46070 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389137AbfBKO60 (ORCPT ); Mon, 11 Feb 2019 09:58:26 -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 0DEB3222A6; Mon, 11 Feb 2019 14:58:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549897105; bh=RLd6isiJ3v2hghgJ/c3Fwku8OmP+/HR8OlRXfTaukb8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ayouS/wNnSKFgqMb5c2Af4IEWBQBE8r8YnfZoJn/1EtDUTtYL/vuf+vnlq5vy2X1j VxHHYWlz4cdmooF1lslkzRej4/jlrt0hsa3QJfmJT8nYJ45zfIV3wA52Yrev6QFYK8 WKtvBKoc1BGqDW4P9Iu624qrgM59mryhCH8+gILY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Olof Johansson , Sasha Levin Subject: [PATCH 4.14 093/205] ARM: mmp: fix timer_init calls Date: Mon, 11 Feb 2019 15:18:11 +0100 Message-Id: <20190211141834.719689984@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 12d3a30db4a3b3df5fbadf5974b9cf50544a9950 ] The change to passing the timer frequency as a function argument was a good idea, but caused a build failure for one user that was missed in the update: arch/arm/mach-mmp/time.c: In function 'mmp_dt_init_timer': arch/arm/mach-mmp/time.c:242:2: error: implicit declaration of function 'timer_init'; did you mean 'hrtimer_init'? [-Werror=implicit-function-declaration] Change that as well to fix the build error, and rename the function to put it into a proper namespace and make it clearer what is actually going on. I saw that the high 6500000 HZ frequency was previously only set with CONFIG_MMP2, but is now also used with MMP (pxa910), so I'm changing that back here. Please make sure that the frequencies are all correct now. Fixes: f36797ee4380 ("ARM: mmp/mmp2: dt: enable the clock") Signed-off-by: Arnd Bergmann 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/pxa910.c | 2 +- arch/arm/mach-mmp/time.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-mmp/common.h b/arch/arm/mach-mmp/common.h index 5ac2851ef5d3..483b8b6d3005 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, unsigned long rate); +extern void mmp_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 fb3e7e32c882..726c1a642dea 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, 6500000); + mmp_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 77a358165a56..cdcf65ace3f9 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, 6500000); + mmp_timer_init(IRQ_PXA168_TIMER1, 3250000); } void pxa168_clear_keypad_wakeup(void) diff --git a/arch/arm/mach-mmp/pxa910.c b/arch/arm/mach-mmp/pxa910.c index 1ccbba9ac495..d30a7d12bc98 100644 --- a/arch/arm/mach-mmp/pxa910.c +++ b/arch/arm/mach-mmp/pxa910.c @@ -116,7 +116,7 @@ void __init pxa910_timer_init(void) __raw_writel(APBC_APBCLK | APBC_RST, APBC_TIMERS); __raw_writel(TIMER_CLK_RST, APBC_TIMERS); - timer_init(IRQ_PXA910_AP1_TIMER1); + mmp_timer_init(IRQ_PXA910_AP1_TIMER1, 3250000); } /* on-chip devices */ diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c index eab0fd8a7343..f9c295154b94 100644 --- a/arch/arm/mach-mmp/time.c +++ b/arch/arm/mach-mmp/time.c @@ -184,7 +184,7 @@ static struct irqaction timer_irq = { .dev_id = &ckevt, }; -void __init timer_init(int irq, unsigned long rate) +void __init mmp_timer_init(int irq, unsigned long rate) { timer_config(); @@ -239,7 +239,7 @@ void __init mmp_dt_init_timer(void) ret = -ENOMEM; goto out; } - timer_init(irq, rate); + mmp_timer_init(irq, rate); return; out: pr_err("Failed to get timer from device tree with error:%d\n", ret); -- 2.19.1