From patchwork Thu Oct 8 15:46:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11823413 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 496FB1580 for ; Thu, 8 Oct 2020 15:49:44 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0FE2720739 for ; Thu, 8 Oct 2020 15:49:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="UY0xdhJz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0FE2720739 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arndb.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=2R7oTfUAbGDAW/3dlrYBWTY+x+eamhi8+unttkbJ2k4=; b=UY0xdhJzp7KKjTh5ylshvOzFp GlgrTfBhC3eYGfE8GHk/RGshGptY3+aVFPsxVb4IfWli27jx9rDAxiTIUdcI/hUcdQe41/5DZajXN N5ds1YpN8hk1/STZvb3t0H+aljFOlEoNh7V/deEhb1znSypO0avkCgmIwODL9+Ny2ydNuh9QyWSvQ P8OnN5I9FoNoHvJuXKlK1LFcgwmVUZr2hRNugn9kgMJ8AyEEJLWMm4IB9QAed5KH5Wxej60ApAzFB Q5x0j6xtd/StWfhy0qypb0OlTBtU+EFEfg6H/91k3t0g6Io7gi2/2xkFPE3teqlW4kaiR5zXJR2PX LWzVITxlw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kQYAZ-00034k-Ad; Thu, 08 Oct 2020 15:49:27 +0000 Received: from mout.kundenserver.de ([217.72.192.73]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kQY9m-0002gE-Gd for linux-arm-kernel@lists.infradead.org; Thu, 08 Oct 2020 15:48:44 +0000 Received: from localhost.localdomain ([192.30.34.233]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1MFbmS-1k9SJ504kA-00H3b3; Thu, 08 Oct 2020 17:48:09 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org Subject: [PATCH 08/13] m68k: m68328: use legacy_timer_tick() Date: Thu, 8 Oct 2020 17:46:46 +0200 Message-Id: <20201008154651.1901126-9-arnd@arndb.de> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201008154651.1901126-1-arnd@arndb.de> References: <20201008154651.1901126-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:X94e4tE6h1ucE2ptsUxdCsFjY5Vt4Yxb8o2F6d+WCVsxW3/pMXg FSX762vrq4q7eZ/50hBxTz/TSg4JHk9WT8w2l5djQmOGWFTvkaMwMOKxbJHu0yBszQ/wLF9 w8OAHadLWVgTzZ4+T9le/sPTI6CdGiJMJZGRacnqSQDG8Mfh/Bo4RRtSxrQju/Gu1WgZrdO P81KGjziyKRQaHc8+bi7g== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:JZX3P9KuXIw=:RlCKXSHeShn4FJEVlMGuL8 K/aJCs3QddlZYJRHnyZ4t/Pa4oGfXCF79wf/KHA5fssa/SOnPhNw/rV69J0NefDyw1Z7XajrW Gigo1IAyBHWzwyH0ceCSFrMn4BiKZRVwrGGXsJEHP3YEoaNAX07MaYmBw9g+75ufMsowTrjR/ 4vfLnmXbv1+r4Za1/PrIPvrg71rPL7kh2PmNaXMGdj/WUhG+2+ykWCxoiRcfcY9jCmo9IOoGh qIxTfvFcKzwjRKpQCgLWxG+KYophSkeylusJML1y6ccJWUG+Qcrd5kLtfUFUStchrd4RVqATJ supGqhInRtECv2NX6R0CKNQboZ27f1b/7zbaC2LQtbnpvX2IIFd+guKZCwqEGtLXQlLXyLDZW 496wwMZRPCYihJkKon12c76/PXonZ7xcf6e1a0H/jnsTKW9UmFu93RdC13LVbXE01e17IVwFE K5r+mdqsknPcEFbHQd41irWcrVax4ScHJ7MOmDjPVowkodd5vNxspEbru5eh/E01uAy3z0BoB Fr17rxcpGpuFh1SipceLToKFWGdZ6nOFDkTi5As0RcSGGU5fGXPFrFSB8SRs3SnSjaxhuba/8 w5tQ3uNjA+FSjURhyDsPNUx2IF+w1wz+IZP0ifMgPUupPo+JPY4/uQmCw6NbAnJVg4KvieFJA n+yFNexWC3vi9gDo+TSHLqfpIY7ZbHOsXNRF/P4t63VYvfbIicSYwNQ6xnGYxkuZ+uomTZT70 hswbhza1vTpRnTNuy5u3NCSP+++jigRvTBIrTQsUB+cOnW+P34CBqAADz4orO9lnRndyibVqj P3A5NDBTaS6Qpj7orts+Y7ASc081u53+K3gPaHeltGUn2wTyyZtgUkb8LXQM+4JqM5/oHjV X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201008_114838_764760_C91C0395 X-CRM114-Status: GOOD ( 16.39 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [217.72.192.73 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [217.72.192.73 listed in wl.mailspike.net] 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Creasey , Fenghua Yu , Linus Walleij , Tony Luck , Thomas Gleixner , linux-parisc@vger.kernel.org, Arnd Bergmann , linux-ia64@vger.kernel.org, Stephen Boyd , Helge Deller , Daniel Lezcano , Russell King , Finn Thain , "James E.J. Bottomley" , linux-m68k@lists.linux-m68k.org, Geert Uytterhoeven , linux-arm-kernel@lists.infradead.org, John Stultz , Philip Blundell , Greg Ungerer , Joshua Thompson Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org A couple of machines share the m68328 timer code that is based on calling timer_interrupt(). Change these to the new and slightly more generic legacy_timer_tick() helper. Signed-off-by: Arnd Bergmann Reviewed-by: Geert Uytterhoeven --- arch/m68k/68000/timers.c | 5 ++--- arch/m68k/Kconfig.machine | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/m68k/68000/timers.c b/arch/m68k/68000/timers.c index e8dfdd2556a5..3aa006f8e7ea 100644 --- a/arch/m68k/68000/timers.c +++ b/arch/m68k/68000/timers.c @@ -52,7 +52,6 @@ #endif static u32 m68328_tick_cnt; -static irq_handler_t timer_interrupt; /***************************************************************************/ @@ -62,7 +61,8 @@ static irqreturn_t hw_tick(int irq, void *dummy) TSTAT &= 0; m68328_tick_cnt += TICKS_PER_JIFFY; - return timer_interrupt(irq, dummy); + legacy_timer_tick(1); + return IRQ_HANDLED; } /***************************************************************************/ @@ -113,7 +113,6 @@ void hw_timer_init(irq_handler_t handler) /* Enable timer 1 */ TCTL |= TCTL_TEN; clocksource_register_hz(&m68328_clk, TICKS_PER_JIFFY*HZ); - timer_interrupt = handler; } /***************************************************************************/ diff --git a/arch/m68k/Kconfig.machine b/arch/m68k/Kconfig.machine index e3c835440d9a..0ff9338b958e 100644 --- a/arch/m68k/Kconfig.machine +++ b/arch/m68k/Kconfig.machine @@ -146,6 +146,7 @@ config PILOT config PILOT3 bool "Pilot 1000/5000, PalmPilot Personal/Pro, or PalmIII support" depends on M68328 + select LEGACY_TIMER_TICK select PILOT help Support for the Palm Pilot 1000/5000, Personal/Pro and PalmIII. @@ -159,18 +160,21 @@ config XCOPILOT_BUGS config UCSIMM bool "uCsimm module support" depends on M68EZ328 + select LEGACY_TIMER_TICK help Support for the Arcturus Networks uCsimm module. config UCDIMM bool "uDsimm module support" depends on M68VZ328 + select LEGACY_TIMER_TICK help Support for the Arcturus Networks uDsimm module. config DRAGEN2 bool "DragenEngine II board support" depends on M68VZ328 + select LEGACY_TIMER_TICK help Support for the DragenEngine II board.